From e88871172e794511e5ba6989a1130b6aa90caaba Mon Sep 17 00:00:00 2001 From: Fabian Zobrist Date: Thu, 20 Aug 2020 00:16:19 +0200 Subject: [PATCH] clean up. --- .idea/dictionaries/fabian.xml | 8 ++ .../me/zobrist/tichucounter/MainActivity.kt | 24 ++---- .../res/{drawable => drawable-mdpi}/back.png | Bin .../{drawable => drawable-mdpi}/checkmark.png | Bin .../res/drawable/ic_launcher_background.xml | 74 ------------------ app/src/main/res/layout/content_main.xml | 2 +- app/src/main/res/navigation/nav_graph.xml | 5 -- app/src/main/res/values/dimens.xml | 3 - 8 files changed, 17 insertions(+), 99 deletions(-) create mode 100644 .idea/dictionaries/fabian.xml rename app/src/main/res/{drawable => drawable-mdpi}/back.png (100%) rename app/src/main/res/{drawable => drawable-mdpi}/checkmark.png (100%) delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml delete mode 100644 app/src/main/res/navigation/nav_graph.xml delete mode 100644 app/src/main/res/values/dimens.xml diff --git a/.idea/dictionaries/fabian.xml b/.idea/dictionaries/fabian.xml new file mode 100644 index 0000000..92342ab --- /dev/null +++ b/.idea/dictionaries/fabian.xml @@ -0,0 +1,8 @@ + + + + tichu + zobrist + + + \ No newline at end of file diff --git a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt index 89531ee..6180a22 100644 --- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt +++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt @@ -2,26 +2,18 @@ package me.zobrist.tichucounter import android.app.AlertDialog import android.content.Context -import android.content.SharedPreferences import android.os.Bundle +import android.text.InputType import android.view.Menu import android.view.MenuItem +import android.widget.ScrollView import androidx.appcompat.app.AppCompatActivity +import androidx.appcompat.app.AppCompatDelegate import androidx.core.widget.doOnTextChanged import kotlinx.android.synthetic.main.content_main.* -import android.text.InputType -import android.widget.ScrollView -import androidx.appcompat.app.AppCompatDelegate class MainActivity : AppCompatActivity() { - private var listA: List = emptyList() - private var listB: List = emptyList() - - - private var counterTeamA: Int = 0 - private var counterTeamB: Int = 0 - private var invertA: Boolean = false private var invertB: Boolean = false @@ -186,7 +178,7 @@ class MainActivity : AppCompatActivity() { } buttonInv.setOnClickListener { - var tempInt: Int + val tempInt: Int if(inputTeamA.isFocused ){ @@ -213,13 +205,13 @@ class MainActivity : AppCompatActivity() { buttonBack.setOnClickListener{ if(inputTeamA.isFocused ){ if(inputTeamA.text.isNotEmpty()){ - var string = inputTeamA.text.toString() + val string = inputTeamA.text.toString() inputTeamA.setText(string.substring(0, string.length -1)) } }else if(inputTeamB.isFocused) { if(inputTeamB.text.isNotEmpty()) { - var string = inputTeamB.text.toString() + val string = inputTeamB.text.toString() inputTeamB.setText(string.substring(0, string.length - 1)) } } @@ -332,9 +324,9 @@ class MainActivity : AppCompatActivity() { builder.setTitle(getString(R.string.choose_theme_text)) val styles = arrayOf("Light","Dark","System default") - var checkedItem = this.getSharedPreferences("", Context.MODE_PRIVATE).getInt("Theme", 2) + val checkedItem = this.getSharedPreferences("", Context.MODE_PRIVATE).getInt("Theme", 2) - var prefs = this.getSharedPreferences("Settings", Context.MODE_PRIVATE).edit() + val prefs = this.getSharedPreferences("Settings", Context.MODE_PRIVATE).edit() builder.setSingleChoiceItems(styles, checkedItem) { dialog, which -> diff --git a/app/src/main/res/drawable/back.png b/app/src/main/res/drawable-mdpi/back.png similarity index 100% rename from app/src/main/res/drawable/back.png rename to app/src/main/res/drawable-mdpi/back.png diff --git a/app/src/main/res/drawable/checkmark.png b/app/src/main/res/drawable-mdpi/checkmark.png similarity index 100% rename from app/src/main/res/drawable/checkmark.png rename to app/src/main/res/drawable-mdpi/checkmark.png diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index ca3826a..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index b4629c7..fe8b5db 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -79,7 +79,7 @@ - \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml deleted file mode 100644 index 125df87..0000000 --- a/app/src/main/res/values/dimens.xml +++ /dev/null @@ -1,3 +0,0 @@ - - 16dp - \ No newline at end of file