2022-12-08 23:24:51 +01:00
20 changed files with 219 additions and 63 deletions
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <bytecodeTargetLevel target="11" />
+  </component>
+</project>
--- a/.idea/deploymentTargetDropDown.xml
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="$USER_HOME$/.android/avd/Pixel_3a_API_29.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-06-26T09:26:31.554432Z" />
+  </component>
+</project>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,17 +4,16 @@
  <component name="GradleSettings">
    <option name="linkedExternalProjectsSettings">
      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
+        <option name="testRunner" value="GRADLE" />
        <option name="distributionType" value="DEFAULT_WRAPPED" />
        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="1.8" />
+        <option name="gradleJvm" value="Android Studio java home" />
        <option name="modules">
          <set>
            <option value="$PROJECT_DIR$" />
            <option value="$PROJECT_DIR$/app" />
          </set>
        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
      </GradleProjectSettings>
    </option>
  </component>
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -0,0 +1,8 @@
+<component name="InspectionProjectProfileManager">
+  <profile version="1.0">
+    <option name="myName" value="Project Default" />
+    <inspection_tool class="ClangTidy" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="clangTidyChecks" value="-*,bugprone-argument-comment,bugprone-assert-side-effect,bugprone-bad-signal-to-kill-thread,bugprone-branch-clone,bugprone-copy-constructor-init,bugprone-dangling-handle,bugprone-dynamic-static-initializers,bugprone-fold-init-type,bugprone-forward-declaration-namespace,bugprone-forwarding-reference-overload,bugprone-inaccurate-erase,bugprone-incorrect-roundings,bugprone-integer-division,bugprone-lambda-function-name,bugprone-macro-parentheses,bugprone-macro-repeated-side-effects,bugprone-misplaced-operator-in-strlen-in-alloc,bugprone-misplaced-pointer-arithmetic-in-alloc,bugprone-misplaced-widening-cast,bugprone-move-forwarding-reference,bugprone-multiple-statement-macro,bugprone-no-escape,bugprone-not-null-terminated-result,bugprone-parent-virtual-call,bugprone-posix-return,bugprone-reserved-identifier,bugprone-sizeof-container,bugprone-sizeof-expression,bugprone-spuriously-wake-up-functions,bugprone-string-constructor,bugprone-string-integer-assignment,bugprone-string-literal-with-embedded-nul,bugprone-suspicious-enum-usage,bugprone-suspicious-include,bugprone-suspicious-memset-usage,bugprone-suspicious-missing-comma,bugprone-suspicious-semicolon,bugprone-suspicious-string-compare,bugprone-swapped-arguments,bugprone-terminating-continue,bugprone-throw-keyword-missing,bugprone-too-small-loop-variable,bugprone-undefined-memory-manipulation,bugprone-undelegated-constructor,bugprone-unhandled-self-assignment,bugprone-unused-raii,bugprone-unused-return-value,bugprone-use-after-move,bugprone-virtual-near-miss,cert-dcl21-cpp,cert-dcl58-cpp,cert-err34-c,cert-err52-cpp,cert-err58-cpp,cert-err60-cpp,cert-flp30-c,cert-msc50-cpp,cert-msc51-cpp,cert-str34-c,cppcoreguidelines-interfaces-global-init,cppcoreguidelines-narrowing-conversions,cppcoreguidelines-pro-type-member-init,cppcoreguidelines-pro-type-static-cast-downcast,cppcoreguidelines-slicing,google-default-arguments,google-explicit-constructor,google-runtime-operator,hicpp-exception-baseclass,hicpp-multiway-paths-covered,misc-misplaced-const,misc-new-delete-overloads,misc-no-recursion,misc-non-copyable-objects,misc-throw-by-value-catch-by-reference,misc-unconventional-assign-operator,misc-uniqueptr-reset-release,modernize-avoid-bind,modernize-concat-nested-namespaces,modernize-deprecated-headers,modernize-deprecated-ios-base-aliases,modernize-loop-convert,modernize-make-shared,modernize-make-unique,modernize-pass-by-value,modernize-raw-string-literal,modernize-redundant-void-arg,modernize-replace-auto-ptr,modernize-replace-disallow-copy-and-assign-macro,modernize-replace-random-shuffle,modernize-return-braced-init-list,modernize-shrink-to-fit,modernize-unary-static-assert,modernize-use-auto,modernize-use-bool-literals,modernize-use-emplace,modernize-use-equals-default,modernize-use-equals-delete,modernize-use-nodiscard,modernize-use-noexcept,modernize-use-nullptr,modernize-use-override,modernize-use-transparent-functors,modernize-use-uncaught-exceptions,mpi-buffer-deref,mpi-type-mismatch,openmp-use-default-none,performance-faster-string-find,performance-for-range-copy,performance-implicit-conversion-in-loop,performance-inefficient-algorithm,performance-inefficient-string-concatenation,performance-inefficient-vector-operation,performance-move-const-arg,performance-move-constructor-init,performance-no-automatic-move,performance-noexcept-move-constructor,performance-trivially-destructible,performance-type-promotion-in-math-fn,performance-unnecessary-copy-initialization,performance-unnecessary-value-param,portability-simd-intrinsics,readability-avoid-const-params-in-decls,readability-const-return-type,readability-container-size-empty,readability-convert-member-functions-to-static,readability-delete-null-pointer,readability-deleted-default,readability-inconsistent-declaration-parameter-name,readability-make-member-function-const,readability-misleading-indentation,readability-misplaced-array-index,readability-non-const-parameter,readability-redundant-control-flow,readability-redundant-declaration,readability-redundant-function-ptr-dereference,readability-redundant-smartptr-get,readability-redundant-string-cstr,readability-redundant-string-init,readability-simplify-subscript-expr,readability-static-accessed-through-instance,readability-static-definition-in-anonymous-namespace,readability-string-compare,readability-uniqueptr-delete-release,readability-use-anyofallof,altera-id-dependent-backward-branch,altera-kernel-name-restriction,altera-single-work-item-barrier,altera-unroll-loops,bugprone-implicit-widening-of-multiplication-result,bugprone-signal-handler,bugprone-unhandled-exception-at-new,cert-pos47-c,cert-sig30-c,concurrency-mt-unsafe,concurrency-thread-canceltype-asynchronous,performance-no-int-to-ptr" />
+    </inspection_tool>
+  </profile>
+</component>
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
      <option name="name" value="Google" />
      <option name="url" value="https://dl.google.com/dl/android/maven2/" />
    </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
  </component>
 </project>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,11 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="DesignSurface">
+    <option name="filePathToZoomLevelMap">
+      <map>
+        <entry key="app/src/main/res/layout/activity_main.xml" value="0.1" />
+        <entry key="app/src/main/res/layout/content_main.xml" value="0.1" />
+        <entry key="app/src/main/res/menu/menu_main.xml" value="0.1390625" />
+      </map>
+    </option>
+  </component>
  <component name="NullableNotNullManager">
    <option name="myDefaultNullable" value="androidx.annotation.Nullable" />
    <option name="myDefaultNotNull" value="androidx.annotation.NonNull" />
    <option name="myNullables">
      <value>
-        <list size="12">
+        <list size="15">
          <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" />
@@ -18,12 +27,15 @@
          <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" />
+          <item index="12" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.Nullable" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.annotations.Nullable" />
+          <item index="14" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.Nullable" />
        </list>
      </value>
    </option>
    <option name="myNotNulls">
      <value>
-        <list size="11">
+        <list size="15">
          <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" />
@@ -35,11 +47,15 @@
          <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" />
+          <item index="11" class="java.lang.String" itemvalue="org.eclipse.jdt.annotation.NonNull" />
+          <item index="12" class="java.lang.String" itemvalue="io.reactivex.annotations.NonNull" />
+          <item index="13" class="java.lang.String" itemvalue="io.reactivex.rxjava3.annotations.NonNull" />
+          <item index="14" class="java.lang.String" itemvalue="lombok.NonNull" />
        </list>
      </value>
    </option>
  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    <output url="file://$PROJECT_DIR$/build/classes" />
  </component>
  <component name="ProjectType">
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -4,7 +4,6 @@ apply plugin: 'kotlin-android-extensions'

 android {
    compileSdkVersion 30
-    buildToolsVersion "30.0.2"

    defaultConfig {
        applicationId "me.zobrist.tichucounter"
--- a/app/release/app-release.aab
+++ b/app/release/app-release.aab
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,8 +13,8 @@
        <activity
            android:name=".MainActivity"
            android:windowSoftInputMode="adjustPan"
-            android:label="@string/app_name"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar"
+            android:exported="true">
            <intent-filter>
                <action android:name="android.intent.action.MAIN" />

--- a/app/src/main/java/me/zobrist/tichucounter/ContextUtils.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/ContextUtils.kt
@@ -0,0 +1,34 @@
+package me.zobrist.tichucounter
+
+import android.content.Context
+import android.content.ContextWrapper
+import android.content.res.Configuration
+import android.content.res.Resources
+import android.os.Build
+import android.os.LocaleList
+import java.util.*
+
+class ContextUtils(base: Context) : ContextWrapper(base) {
+
+    companion object {
+
+        fun updateLocale(c: Context, localeToSwitchTo: Locale): ContextWrapper {
+            var context = c
+            val resources: Resources = context.resources
+            val configuration: Configuration = resources.configuration
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                val localeList = LocaleList(localeToSwitchTo)
+                LocaleList.setDefault(localeList)
+                configuration.setLocales(localeList)
+            } else {
+                configuration.locale = localeToSwitchTo
+            }
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+                context = context.createConfigurationContext(configuration)
+            } else {
+                resources.updateConfiguration(configuration, resources.displayMetrics)
+            }
+            return ContextUtils(context)
+        }
+    }
+}
--- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
@@ -2,6 +2,8 @@ package me.zobrist.tichucounter

 import android.app.AlertDialog
 import android.content.Context
+import android.content.ContextWrapper
+import android.content.Intent
 import android.os.Bundle
 import android.text.InputType
 import android.view.Menu
@@ -14,6 +16,7 @@ import androidx.appcompat.app.AppCompatDelegate
 import androidx.core.widget.doOnTextChanged
 import com.google.gson.Gson
 import kotlinx.android.synthetic.main.content_main.*
+import java.util.*

 class MainActivity : AppCompatActivity() {

@@ -21,6 +24,15 @@ class MainActivity : AppCompatActivity() {

    private lateinit var history: History
    private var currentRound = Round()
+    private var systemLocale = Locale.getDefault()
+
+    override fun attachBaseContext(newBase: Context) {
+        // get chosen language from shread preference
+        val localeString = newBase.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("Language", systemLocale.toString())
+        val localeToSwitchTo = Locale(localeString)
+        val localeUpdatedContext: ContextWrapper = ContextUtils.updateLocale(newBase, localeToSwitchTo)
+        super.attachBaseContext(localeUpdatedContext)
+    }

    override fun onCreate(savedInstanceState: Bundle?) {
        super.onCreate(savedInstanceState)
@@ -36,26 +48,32 @@ class MainActivity : AppCompatActivity() {
                .getBoolean("Screen_On", false)
        )

+
        val json = this.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("history", "{\"scores\":[]}")
        history = Gson().fromJson(json, History::class.java)
        nameTeamA.setText(this.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("nameTeamA", "TeamA"))
        nameTeamB.setText(this.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("nameTeamB", "TeamB"))
        updateView()

+        this.setListenes()

-        inputTeamA.setOnFocusChangeListener { view, b ->
+    }
+
+    private fun setListenes()
+    {
+        inputTeamA.setOnFocusChangeListener { _, b ->
            if (b) {
                hideKeyboard()
            }
        }

-        inputTeamB.setOnFocusChangeListener { view, b ->
+        inputTeamB.setOnFocusChangeListener { _, b ->
            if (b) {
                hideKeyboard()
            }
        }

-        inputTeamA.doOnTextChanged { text, start, count, after ->
+        inputTeamA.doOnTextChanged { text, _, _, _ ->
            if (inputTeamA.isFocused) {
                if (inputTeamA.text.isNotEmpty()) {
                    if (updateOnChange) {
@@ -82,9 +100,7 @@ class MainActivity : AppCompatActivity() {
            }
        }

-
-
-        inputTeamB.doOnTextChanged { text, start, count, after ->
+        inputTeamB.doOnTextChanged { text, _, _, _ ->
            if (inputTeamB.isFocused) {
                if (inputTeamB.text.isNotEmpty()) {
                    if (updateOnChange) {
@@ -323,11 +339,11 @@ class MainActivity : AppCompatActivity() {
                builder.setMessage(getString(R.string.confirmClear))
                    .setTitle(R.string.clear)
                    .setCancelable(false)
-                    .setPositiveButton(getString(R.string.yes)) { dialog, id ->
+                    .setPositiveButton(getString(R.string.yes)) { dialog, _ ->
                        dialog.dismiss()
                        clearAll()
                    }
-                    .setNegativeButton(getString(R.string.no)) { dialog, id ->
+                    .setNegativeButton(getString(R.string.no)) { dialog, _ ->
                        dialog.cancel()
                    }

@@ -342,6 +358,10 @@ class MainActivity : AppCompatActivity() {
                chooseThemeDialog()
                true
            }
+            R.id.action_language -> {
+                chooseLanguageDialog()
+                true
+            }
            R.id.action_screenOn -> {
                item.isChecked = !item.isChecked
                keepScreenOn(item.isChecked)
@@ -409,7 +429,7 @@ class MainActivity : AppCompatActivity() {

        val builder = AlertDialog.Builder(this)
        builder.setTitle(getString(R.string.choose_theme_text))
-        val styles = arrayOf("Light", "Dark", "System default")
+        val styles = arrayOf(getString(R.string.light), getString(R.string.dark), getString(R.string.android_default_text))

        val checkedItem =
            this.getSharedPreferences("Settings", Context.MODE_PRIVATE).getInt("Theme", 2)
@@ -431,6 +451,42 @@ class MainActivity : AppCompatActivity() {
        dialog.show()
    }

+    private fun chooseLanguageDialog() {
+
+        val builder = AlertDialog.Builder(this)
+        builder.setTitle(getString(R.string.choose_language_text))
+
+        val languages_map = mapOf(
+            getString(R.string.android_default_text) to systemLocale.toString(),
+            getString(R.string.english) to "en",
+            getString(R.string.german) to "de")
+
+        val languages_display_keys = languages_map.keys.toTypedArray()
+        val languages_display_values = languages_map.values.toTypedArray()
+
+
+        val checkedItem = this.getSharedPreferences("Settings", Context.MODE_PRIVATE).getString("Language", R.string.android_default_text.toString())
+        val checkedItemIndex = languages_display_values.indexOf(checkedItem)
+
+        val prefs = this.getSharedPreferences("Settings", Context.MODE_PRIVATE).edit()
+
+
+        builder.setSingleChoiceItems(languages_display_keys, checkedItemIndex) { dialog, which ->
+
+            val temp = languages_map[languages_display_keys[which]]
+            prefs.putString("Language", temp)
+            prefs.apply()
+
+            startActivity(Intent(this, MainActivity::class.java))
+            finish()
+
+            dialog.dismiss()
+        }
+
+        val dialog = builder.create()
+        dialog.show()
+    }
+
    private fun updateTheme(which: Int) {
        when (which) {
            0 -> AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -59,7 +59,8 @@
            android:text="0"
            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
            android:textSize="18sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />

        <TextView
            android:id="@+id/scoreB"
@@ -70,7 +71,8 @@
            android:text="0"
            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
            android:textSize="18sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:ignore="HardcodedText" />

    </LinearLayout>

@@ -136,7 +138,8 @@
            android:gravity="center"
            android:hint="0"
            android:importantForAutofill="no"
-            android:inputType="numberSigned" />
+            android:inputType="numberSigned"
+            tools:ignore="HardcodedText" />

        <EditText
            android:id="@+id/inputTeamB"
@@ -147,7 +150,8 @@
            android:gravity="center"
            android:hint="0"
            android:importantForAutofill="no"
-            android:inputType="numberSigned" />
+            android:inputType="numberSigned"
+            tools:ignore="HardcodedText" />
    </LinearLayout>

    <LinearLayout
@@ -164,7 +168,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="1" />
+            android:text="1"
+            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/button2"
@@ -172,7 +177,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="2" />
+            android:text="2"
+            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/button3"
@@ -180,7 +186,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="3" />
+            android:text="3"
+            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/buttonAdd100"
@@ -188,7 +195,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="+100" />
+            android:text="+100"
+            tools:ignore="HardcodedText" />
    </LinearLayout>

    <LinearLayout
@@ -205,7 +213,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="4" />
+            android:text="4"
+            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/button5"
@@ -213,7 +222,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="5" />
+            android:text="5"
+            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/button6"
@@ -221,7 +231,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="6" />
+            android:text="6"
+            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/buttonSub100"
@@ -229,7 +240,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="-100" />
+            android:text="-100"
+            tools:ignore="HardcodedText" />
    </LinearLayout>

    <LinearLayout
@@ -246,7 +258,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="7" />
+            android:text="7"
+            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/button8"
@@ -254,7 +267,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="8" />
+            android:text="8"
+            tools:ignore="HardcodedText" />

        <Button
            android:id="@+id/button9"
@@ -262,7 +276,8 @@
            android:layout_width="0dp"
            android:layout_height="wrap_content"
            android:layout_weight="1"
-            android:text="9" />
+            android:text="9"
+            tools:ignore="HardcodedText" />

        <ImageButton
            android:id="@+id/buttonBack"
@@ -275,7 +290,7 @@
            android:paddingBottom="15dp"
            android:scaleType="fitCenter"
            app:srcCompat="@drawable/back"
-            android:contentDescription="TODO" />
+            android:contentDescription="@string/back" />

    </LinearLayout>

--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -17,6 +17,10 @@
        android:id="@+id/action_theme"
        android:orderInCategory="15"
        android:title="@string/choose_theme_text" />
+    <item
+        android:id="@+id/action_language"
+        android:orderInCategory="16"
+        android:title="@string/choose_language_text" />
    <item
        android:id="@+id/action_screenOn"
        android:checkable="true"
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -7,4 +7,11 @@
    <string name="confirmClear">Möchten Sie das laufende Spiel wirklich löschen?</string>
    <string name="yes">Ja</string>
    <string name="no">Nein</string>
+    <string name="back">Zurück</string>
+    <string name="choose_language_text">Sprache wählen</string>
+    <string name="android_default_text">Android Standard</string>
+    <string name="english">Englisch</string>
+    <string name="german">Detusch</string>
+    <string name="light">Hell</string>
+    <string name="dark">Dunkel</string>
 </resources>
--- a/app/src/main/res/values-gsw-rCH/strings.xml
+++ b/app/src/main/res/values-gsw-rCH/strings.xml
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="clear">Neus Spil starte</string>
-    <string name="undo">Letschti Rundi lösche</string>
-    <string name="choose_theme_text">Usgsehe ändere</string>
-    <string name="keep_screen_on">Bildschirm igschalted la</string>
-    <string name="confirmClear">Wosch ds loufende Spil würklech lösche?</string>
-    <string name="yes">Ja</string>
-    <string name="no">Nei</string>
-</resources>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,9 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
    <string name="app_name" translatable="false">Tichu Counter</string>
-    <!-- Strings used for fragments for navigation -->
-
    <string name="team_a" translatable="false">Team A</string>
    <string name="team_b" translatable="false">Team B</string>
+
    <string name="clear">Start new game</string>
    <string name="undo">Undo last round</string>
    <string name="choose_theme_text">Choose theme</string>
@@ -11,4 +11,11 @@
    <string name="confirmClear">Do you really want to delete the current game?</string>
    <string name="yes">Yes</string>
    <string name="no">No</string>
+    <string name="back">Back</string>
+    <string name="choose_language_text">Choose language</string>
+    <string name="android_default_text">Android Default</string>
+    <string name="english">English</string>
+    <string name="german">German</string>
+    <string name="light">Light</string>
+    <string name="dark">Dark</string>
 </resources>
--- a/app/src/main/res/xml/locales_config.xml
+++ b/app/src/main/res/xml/locales_config.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<locale-config xmlns:android="http://schemas.android.com/apk/res/android">
+    <locale android:name="en"/>
+    <locale android:name="de"/>
+</locale-config>
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.10"
+    ext.kotlin_version = "1.7.0"
    repositories {
        google()
-        jcenter()
+        mavenCentral()
    }
    dependencies {
-        classpath "com.android.tools.build:gradle:4.0.1"
+        classpath 'com.android.tools.build:gradle:7.2.1'
        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

        // NOTE: Do not place your application dependencies here; they belong
@@ -17,7 +17,7 @@ buildscript {
 allprojects {
    repositories {
        google()
-        jcenter()
+        mavenCentral()
    }
 }

--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip