From b1f1a4484f9ff3741ffd24e5b7f47b4164c69807 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Mon, 10 Aug 2020 23:11:23 +0200 Subject: [PATCH 01/18] - Add clear entry in menu - clean string.xml file - --- .../me/zobrist/tichucounter/MainActivity.kt | 33 ++++++++++++------- app/src/main/res/layout/content_main.xml | 6 ++-- app/src/main/res/menu/menu_main.xml | 5 +-- app/src/main/res/values/strings.xml | 10 ++---- 4 files changed, 29 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt index bdcdcbf..48fd3f5 100644 --- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt +++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt @@ -3,6 +3,7 @@ package me.zobrist.tichucounter import android.os.Bundle import androidx.appcompat.app.AppCompatActivity import android.view.Menu +import android.view.MenuItem import androidx.core.widget.doOnTextChanged import kotlinx.android.synthetic.main.content_main.* import kotlinx.coroutines.sync.Mutex @@ -60,8 +61,6 @@ class MainActivity : AppCompatActivity() { } inputTeamB.setText(temp.toString()) } - - updateTemp() } sub100.setOnClickListener { @@ -85,8 +84,6 @@ class MainActivity : AppCompatActivity() { } inputTeamB.setText(temp.toString()) } - - updateTemp() } add.setOnClickListener { @@ -107,7 +104,6 @@ class MainActivity : AppCompatActivity() { inputTeamA.setText("") inputTeamB.setText("") } - } } @@ -117,6 +113,26 @@ class MainActivity : AppCompatActivity() { return true } + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + R.id.action_clear -> { + clearAll() + true + } + else -> super.onOptionsItemSelected(item) + } + } + + private fun clearAll() { + historyA.text = "" + historyB.text = "" + inputTeamA.setText("") + inputTeamB.setText("") + scoreA.text = "50" + scoreB.text = "" + } + + private fun updateNumber(inputText: CharSequence?, offset: Int): String { var toSet: Int = 0 @@ -131,11 +147,4 @@ class MainActivity : AppCompatActivity() { return "$toSet" } - - private fun updateTemp() { - nameTeamA.text = tempCounterTeamA.toString() - nameTeamB.text = tempCounterTeamB.toString() - } - - } \ No newline at end of file diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index cca2fe3..4512c2d 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -22,7 +22,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0.5" - android:text="@string/teama" + android:text="@string/team_a" android:textAppearance="@style/TextAppearance.AppCompat.Display1" /> @@ -70,7 +69,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0.5" - android:text="0" android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textSize="18sp" /> @@ -85,6 +83,7 @@ android:layout_height="wrap_content" android:layout_weight="0.5" android:ems="10" + android:hint="0" android:importantForAutofill="no" android:inputType="numberSigned" /> @@ -94,6 +93,7 @@ android:layout_height="wrap_content" android:layout_weight="0.5" android:ems="10" + android:hint="0" android:importantForAutofill="no" android:inputType="numberSigned" /> diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 9423d65..0d75b2b 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -3,8 +3,9 @@ xmlns:tools="http://schemas.android.com/tools" tools:context="me.zobrist.tichucounter.MainActivity"> \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8d72f14..85f646d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,15 +1,9 @@ Tichu Counter - Settings - First Fragment - Second Fragment - Next - Previous - Hello first fragment - Hello second fragment. Arg: %1$s - TeamA + Team A Team B Add + Clear \ No newline at end of file From 7bc9961a656a3091bc2c6bc92e0a4eace2f4aaf2 Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Mon, 10 Aug 2020 23:12:03 +0200 Subject: [PATCH 02/18] correct typo --- app/src/main/java/me/zobrist/tichucounter/MainActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt index 48fd3f5..71b5204 100644 --- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt +++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt @@ -128,7 +128,7 @@ class MainActivity : AppCompatActivity() { historyB.text = "" inputTeamA.setText("") inputTeamB.setText("") - scoreA.text = "50" + scoreA.text = "" scoreB.text = "" } From 6cda0a9d5eeaa0d7bf4aeb82b1930637a1eda32b Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Fri, 14 Aug 2020 19:10:43 +0200 Subject: [PATCH 03/18] Change layout, add onscreen keyboard --- app/src/main/res/layout/content_main.xml | 322 ++++++++++++++------ app/src/main/res/values-de/strings.xml | 7 + app/src/main/res/values-gsw-rCH/strings.xml | 7 + app/src/main/res/values/strings.xml | 2 +- 4 files changed, 239 insertions(+), 99 deletions(-) create mode 100644 app/src/main/res/values-de/strings.xml create mode 100644 app/src/main/res/values-gsw-rCH/strings.xml diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 4512c2d..e21b4ae 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -6,130 +6,256 @@ android:layout_height="match_parent" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - + android:layout_height="0dp" + android:orientation="horizontal" + app:layout_constraintTop_toTopOf="parent"> - + + + + + + + + + android:layout_height="wrap_content" + android:orientation="horizontal"> - - - - - + android:layout_weight="1" + android:text="123" /> + android:layout_weight="1" + android:text="123" /> - + + - + - + - + - - + - + - + - - + + - + -