Merge tag '1.0.0' into develop

no message

.idea/codeStyles/Project.xml

@@ -1,6 +1,22 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
     <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
       <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="XML">

.idea/dictionaries/fabian.xml

@@ -1,7 +1,9 @@
 <component name="ProjectDictionaryState">
   <dictionary name="fabian">
     <words>
+      <w>checkmark</w>
       <w>tichu</w>
+      <w>tichucounter</w>
       <w>zobrist</w>
     </words>
   </dictionary>

.idea/misc.xml

@@ -1,5 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="NullableNotNullManager">
+    <option name="myDefaultNullable" value="androidx.annotation.Nullable" />
+    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
+    <option name="myNullables">
+      <value>
+        <list size="12">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
+          <item index="2" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="3" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
+        </list>
+      </value>
+    </option>
+    <option name="myNotNulls">
+      <value>
+        <list size="11">
+          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
+          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
+          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
+          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
+        </list>
+      </value>
+    </option>
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>

app/build.gradle

@@ -34,12 +34,12 @@ android {
 dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.1.0'
+    implementation 'androidx.core:core-ktx:1.3.1'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.2.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'androidx.navigation:navigation-fragment-ktx:2.1.0'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.0'
-    implementation 'androidx.navigation:navigation-ui-ktx:2.1.0'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.0'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'

app/src/main/AndroidManifest.xml

@@ -11,6 +11,7 @@
         android:theme="@style/AppTheme">
         <activity
             android:name=".MainActivity"
+            android:windowSoftInputMode="adjustPan"
             android:label="@string/app_name"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>

app/src/main/java/me/zobrist/tichucounter/History.kt

@@ -1,3 +1,5 @@
+@file:Suppress("unused")
+
 package me.zobrist.tichucounter
 
 import android.os.Parcel
@@ -6,7 +8,7 @@ import android.os.Parcelable
 class History() : Parcelable {
     private var scores: ArrayList<Round> = ArrayList()
 
-    constructor(parcel: Parcel) : this(){
+    constructor(parcel: Parcel) : this() {
         scores = parcel.readSerializable() as ArrayList<Round>
     }
 

app/src/main/java/me/zobrist/tichucounter/MainActivity.kt

@@ -145,48 +145,59 @@ class MainActivity : AppCompatActivity() {
         }
 
         button0.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('0')
         }
 
         button1.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('1')
         }
 
         button2.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('2')
         }
 
         button3.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('3')
         }
 
         button4.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('4')
         }
 
         button5.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('5')
         }
 
         button6.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('6')
         }
 
         button7.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('7')
         }
 
         button8.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('8')
         }
 
         button9.setOnClickListener {
+            giveFocusToAIfNone()
             appendToFocusedInput('9')
         }
 
         buttonInv.setOnClickListener {
             val tempInt: Int
 
+            giveFocusToAIfNone()
 
             if(inputTeamA.isFocused ){
                 if (inputTeamA.text.isNotEmpty()){
@@ -209,15 +220,17 @@ class MainActivity : AppCompatActivity() {
             }
         }
 
-        buttonBack.setOnClickListener{
+        buttonBack.setOnClickListener {
-            if(inputTeamA.isFocused ){
+            giveFocusToAIfNone()
-                if(inputTeamA.text.isNotEmpty()){
+
+            if (inputTeamA.isFocused) {
+                if (inputTeamA.text.isNotEmpty()) {
                     val string = inputTeamA.text.toString()
-                    inputTeamA.setText(string.substring(0, string.length -1))
+                    inputTeamA.setText(string.substring(0, string.length - 1))
                 }
 
-            }else if(inputTeamB.isFocused) {
+            } else if (inputTeamB.isFocused) {
-                if(inputTeamB.text.isNotEmpty()) {
+                if (inputTeamB.text.isNotEmpty()) {
                     val string = inputTeamB.text.toString()
                     inputTeamB.setText(string.substring(0, string.length - 1))
                 }
@@ -225,6 +238,7 @@ class MainActivity : AppCompatActivity() {
         }
 
         submit.setOnClickListener {
+            giveFocusToAIfNone()
 
             if (inputTeamA.text.isNotEmpty() && inputTeamB.text.isNotEmpty()) {
 
@@ -237,7 +251,7 @@ class MainActivity : AppCompatActivity() {
                 inputTeamA.text.clear()
                 inputTeamB.text.clear()
 
-                scrolViewHistory.fullScroll(ScrollView.FOCUS_DOWN)
+                scrollViewHistory.fullScroll(ScrollView.FOCUS_DOWN)
 
             }
         }
@@ -260,7 +274,7 @@ class MainActivity : AppCompatActivity() {
                 clearAll()
                 true
             }
-            R.id.action_undo  -> {
+            R.id.action_undo -> {
                 undoLastRound()
                 true
             }
@@ -272,7 +286,13 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
-    private fun undoLastRound(){
+    private fun giveFocusToAIfNone() {
+        if (!inputTeamA.isFocused && !inputTeamB.isFocused) {
+            inputTeamA.requestFocus()
+        }
+    }
+
+    private fun undoLastRound() {
 
         history.revertLastRound()
         updateView()

app/src/main/java/me/zobrist/tichucounter/Round.kt

@@ -14,8 +14,6 @@ class Round() {
         }
     }
 
-    constructor(score: String, isScoreA: Boolean): this(score.toInt(), isScoreA)
-
     constructor(scoreA: Int, scoreB: Int) : this() {
         this.scoreA = scoreA
         this.scoreB = scoreB

app/src/main/res/layout-land/content_main.xml

@@ -29,7 +29,10 @@
                 android:layout_weight="1"
                 android:autofillHints=""
                 android:gravity="center"
+                android:imeOptions="actionDone"
                 android:inputType="text"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
                 android:text="@string/team_a"
                 android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
@@ -40,7 +43,10 @@
                 android:layout_weight="1"
                 android:autofillHints=""
                 android:gravity="center"
+                android:imeOptions="actionDone"
                 android:inputType="text"
+                android:selectAllOnFocus="true"
+                android:singleLine="true"
                 android:text="@string/team_b"
                 android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
@@ -75,7 +81,7 @@
         </LinearLayout>
 
         <ScrollView
-            android:id="@+id/scrolViewHistory"
+            android:id="@+id/scrollViewHistory"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_marginTop="16dp">
@@ -145,12 +151,14 @@
 
         <LinearLayout
             android:id="@+id/ButtonRow1"
+            style="?android:attr/buttonBarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
             <Button
                 android:id="@+id/button1"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -158,6 +166,7 @@
 
             <Button
                 android:id="@+id/button2"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -165,6 +174,7 @@
 
             <Button
                 android:id="@+id/button3"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -172,6 +182,7 @@
 
             <Button
                 android:id="@+id/buttonAdd100"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -180,12 +191,14 @@
 
         <LinearLayout
             android:id="@+id/ButtonRow2"
+            style="?android:attr/buttonBarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
             <Button
                 android:id="@+id/button4"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -193,6 +206,7 @@
 
             <Button
                 android:id="@+id/button5"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -200,6 +214,7 @@
 
             <Button
                 android:id="@+id/button6"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -207,6 +222,7 @@
 
             <Button
                 android:id="@+id/buttonSub100"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -215,12 +231,14 @@
 
         <LinearLayout
             android:id="@+id/ButtonRow3"
+            style="?android:attr/buttonBarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
             <Button
                 android:id="@+id/button7"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -228,6 +246,7 @@
 
             <Button
                 android:id="@+id/button8"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -235,6 +254,7 @@
 
             <Button
                 android:id="@+id/button9"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -242,6 +262,7 @@
 
             <ImageButton
                 android:id="@+id/buttonBack"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
@@ -255,12 +276,14 @@
 
         <LinearLayout
             android:id="@+id/ButtonRow4"
+            style="?android:attr/buttonBarStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
             <Button
                 android:id="@+id/buttonInv"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1.0"
@@ -268,6 +291,7 @@
 
             <Button
                 android:id="@+id/button0"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1.0"
@@ -280,6 +304,7 @@
 
             <ImageButton
                 android:id="@+id/submit"
+                style='style="?android:attr/buttonBarButtonStyle'
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_weight="1.0"

app/src/main/res/layout/content_main.xml

@@ -20,18 +20,24 @@
             android:layout_weight="1"
             android:autofillHints=""
             android:gravity="center"
+            android:imeOptions="actionDone"
             android:inputType="text"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
             android:text="@string/team_a"
             android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
         <EditText
             android:id="@+id/NameTeamB"
+            android:imeOptions="actionDone"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_weight="1"
             android:autofillHints=""
             android:gravity="center"
             android:inputType="text"
+            android:selectAllOnFocus="true"
+            android:singleLine="true"
             android:text="@string/team_b"
             android:textAppearance="@style/TextAppearance.AppCompat.Display1" />
 
@@ -71,10 +77,10 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:background="?android:attr/listDivider"
-        app:layout_constraintBottom_toBottomOf="@+id/scrolViewHistory" />
+        app:layout_constraintBottom_toBottomOf="@+id/scrollViewHistory" />
 
     <ScrollView
-        android:id="@+id/scrolViewHistory"
+        android:id="@+id/scrollViewHistory"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_marginTop="16dp"
@@ -144,6 +150,7 @@
 
     <LinearLayout
         android:id="@+id/ButtonRow1"
+        style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="horizontal"
@@ -151,6 +158,7 @@
 
         <Button
             android:id="@+id/button1"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -158,6 +166,7 @@
 
         <Button
             android:id="@+id/button2"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -165,6 +174,7 @@
 
         <Button
             android:id="@+id/button3"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -172,6 +182,7 @@
 
         <Button
             android:id="@+id/buttonAdd100"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -180,6 +191,7 @@
 
     <LinearLayout
         android:id="@+id/ButtonRow2"
+        style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="horizontal"
@@ -187,6 +199,7 @@
 
         <Button
             android:id="@+id/button4"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -194,6 +207,7 @@
 
         <Button
             android:id="@+id/button5"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -201,6 +215,7 @@
 
         <Button
             android:id="@+id/button6"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -208,6 +223,7 @@
 
         <Button
             android:id="@+id/buttonSub100"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -216,6 +232,7 @@
 
     <LinearLayout
         android:id="@+id/ButtonRow3"
+        style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="horizontal"
@@ -223,6 +240,7 @@
 
         <Button
             android:id="@+id/button7"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -230,6 +248,7 @@
 
         <Button
             android:id="@+id/button8"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -237,6 +256,7 @@
 
         <Button
             android:id="@+id/button9"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -244,6 +264,7 @@
 
         <ImageButton
             android:id="@+id/buttonBack"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1"
@@ -257,6 +278,7 @@
 
     <LinearLayout
         android:id="@+id/ButtonRow4"
+        style="?android:attr/buttonBarStyle"
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:orientation="horizontal"
@@ -266,6 +288,7 @@
 
         <Button
             android:id="@+id/buttonInv"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1.0"
@@ -273,6 +296,7 @@
 
         <Button
             android:id="@+id/button0"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1.0"
@@ -285,6 +309,7 @@
 
         <ImageButton
             android:id="@+id/submit"
+            style='style="?android:attr/buttonBarButtonStyle'
             android:layout_width="0dp"
             android:layout_height="match_parent"
             android:layout_weight="1.0"