From 26495f11a364940c53dc719d963f8097cad5d21d Mon Sep 17 00:00:00 2001
From: Fabian Zobrist <fabian@zobrist.me>
Date: Wed, 19 Aug 2020 23:38:53 +0200
Subject: [PATCH] Add Dialog to change theme.

---
 .../me/zobrist/tichucounter/MainActivity.kt   |  46 ++++++++++++++++++
 app/src/main/res/drawable-night/back.png      | Bin 0 -> 3879 bytes
 app/src/main/res/menu/menu_main.xml           |  13 +++--
 app/src/main/res/values-de/strings.xml        |   1 +
 app/src/main/res/values-gsw-rCH/strings.xml   |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |   3 +-
 7 files changed, 60 insertions(+), 5 deletions(-)
 create mode 100644 app/src/main/res/drawable-night/back.png

diff --git a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
index ed95624..2d420fb 100644
--- a/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
+++ b/app/src/main/java/me/zobrist/tichucounter/MainActivity.kt
@@ -1,5 +1,6 @@
 package me.zobrist.tichucounter
 
+import android.app.AlertDialog
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
@@ -8,6 +9,7 @@ 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() {
 
@@ -256,6 +258,10 @@ class MainActivity : AppCompatActivity() {
                 undoLastRound()
                 true
             }
+            R.id.action_theme -> {
+                chooseThemeDialog()
+                true
+            }
             else -> super.onOptionsItemSelected(item)
         }
     }
@@ -317,4 +323,44 @@ class MainActivity : AppCompatActivity() {
         submit.isEnabled = false
     }
 
+
+    private fun chooseThemeDialog() {
+
+        val builder = AlertDialog.Builder(this)
+        builder.setTitle(getString(R.string.choose_theme_text))
+        val styles = arrayOf("Light","Dark","System default")
+
+        var checkedItem = when(AppCompatDelegate.getDefaultNightMode()) {
+            AppCompatDelegate.MODE_NIGHT_NO -> 0
+            AppCompatDelegate.MODE_NIGHT_YES -> 1
+            AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM -> 2
+            else -> -1
+        }
+
+
+        builder.setSingleChoiceItems(styles, checkedItem) { dialog, which ->
+
+            when (which) {
+                0 -> {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
+                    delegate.applyDayNight()
+                    dialog.dismiss()
+                }
+                1 -> {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES)
+                    delegate.applyDayNight()
+
+                    dialog.dismiss()
+                }
+                2 -> {
+                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
+                    delegate.applyDayNight()
+                    dialog.dismiss()
+                }
+            }
+        }
+
+        val dialog = builder.create()
+        dialog.show()
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/back.png b/app/src/main/res/drawable-night/back.png
new file mode 100644
index 0000000000000000000000000000000000000000..770c83c8448ebc655e6903b64418ac26a623cbea
GIT binary patch
literal 3879
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 032b427..779bead 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -2,14 +2,19 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:context="me.zobrist.tichucounter.MainActivity">
+    <item
+        android:id="@+id/action_undo"
+        android:icon="@android:drawable/ic_menu_revert"
+        android:orderInCategory="5"
+        android:title="@string/undo" />
     <item
         android:id="@+id/action_clear"
         android:checkable="false"
-        android:orderInCategory="100"
+        android:orderInCategory="10"
         android:title="@string/clear"
         app:showAsAction="never" />
     <item
-        android:id="@+id/action_undo"
-        android:icon="@android:drawable/ic_menu_revert"
-        android:title="@string/undo" />
+        android:id="@+id/action_theme"
+        android:orderInCategory="15"
+        android:title="@string/choose_theme_text" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 592e5e4..560610f 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="clear">Neues Spiel Starten</string>
     <string name="undo">Letzte Runde Löschen</string>
+    <string name="choose_theme_text">Theme auswählen</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-gsw-rCH/strings.xml b/app/src/main/res/values-gsw-rCH/strings.xml
index caefbaa..c8d4afd 100644
--- a/app/src/main/res/values-gsw-rCH/strings.xml
+++ b/app/src/main/res/values-gsw-rCH/strings.xml
@@ -2,4 +2,5 @@
 <resources>
     <string name="clear">Neus Spil Starte</string>
     <string name="undo">Letschti Rundi Lösche</string>
+    <string name="choose_theme_text">Usgsehe ändere</string>
 </resources>
\ 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 dfdfdb2..0e770fb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,4 +6,5 @@
     <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>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 21d9ced..752e91f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,10 +1,11 @@
 <resources>
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="AppTheme" parent="Theme.AppCompat.DayNight">
         <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
+
     </style>
 
     <style name="AppTheme.NoActionBar">