From d310ddadd78fa3f460402b2f76e3b0b4dcf546f2 Mon Sep 17 00:00:00 2001
From: Erik Johansson <erik@ejohansson.se>
Date: Sun, 25 Mar 2018 00:33:27 +0100
Subject: [PATCH] Make theme name translatable

---
 android_app/app/src/main/res/values/arrays.xml     | 10 ++++++++++
 android_app/app/src/main/res/values/strings.xml    |  2 ++
 .../app/src/main/res/values/type_themes.xml        | 12 ------------
 .../app/src/main/res/xml/general_preferences.xml   | 14 ++++++++++++--
 4 files changed, 24 insertions(+), 14 deletions(-)
 delete mode 100644 android_app/app/src/main/res/values/type_themes.xml

diff --git a/android_app/app/src/main/res/values/arrays.xml b/android_app/app/src/main/res/values/arrays.xml
index 10bbc433..1114541c 100644
--- a/android_app/app/src/main/res/values/arrays.xml
+++ b/android_app/app/src/main/res/values/arrays.xml
@@ -33,4 +33,14 @@
         <item>sv</item>
         <item>tr</item>
     </string-array>
+
+    <string-array name="theme_entries">
+        <item>@string/theme_light</item>
+        <item>@string/theme_dark</item>
+    </string-array>
+
+    <string-array name="theme_values">
+        <item>Light</item>
+        <item>Dark</item>
+    </string-array>
 </resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/values/strings.xml b/android_app/app/src/main/res/values/strings.xml
index db993dc7..c55067b3 100644
--- a/android_app/app/src/main/res/values/strings.xml
+++ b/android_app/app/src/main/res/values/strings.xml
@@ -215,4 +215,6 @@
     <string name="language_spanish" translatable="false">Spanish (Español)</string>
     <string name="language_swedish" translatable="false">Swedish (Svenska)</string>
     <string name="language_turkish" translatable="false">Turkish (Türkçe)</string>
+    <string name="theme_light">Light</string>
+    <string name="theme_dark">Dark</string>
 </resources>
diff --git a/android_app/app/src/main/res/values/type_themes.xml b/android_app/app/src/main/res/values/type_themes.xml
deleted file mode 100644
index 7c8e4265..00000000
--- a/android_app/app/src/main/res/values/type_themes.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
-    <string-array name="themes_entries">
-        <item>Light</item>
-        <item>Dark</item>
-    </string-array>
-
-    <string-array name="themes_values">
-        <item>Light</item>
-        <item>Dark</item>
-    </string-array>
-</resources>
\ No newline at end of file
diff --git a/android_app/app/src/main/res/xml/general_preferences.xml b/android_app/app/src/main/res/xml/general_preferences.xml
index 95760210..1050599d 100644
--- a/android_app/app/src/main/res/xml/general_preferences.xml
+++ b/android_app/app/src/main/res/xml/general_preferences.xml
@@ -6,6 +6,16 @@
         android:entryValues="@array/language_values"
         android:key="language"
         android:title="@string/label_language" />
-    <ListPreference android:title="@string/label_theme" android:entries="@array/themes_entries" android:entryValues="@array/themes_values" android:key="app_theme" android:defaultValue="Light"/>
-    <CheckBoxPreference android:title="@string/label_delete_confirmation" android:summaryOn="@string/info_is_enable" android:summaryOff="@string/info_is_not_enable" android:key="deleteConfirmationEnable" android:defaultValue="true" />
+    <ListPreference
+        android:defaultValue="Light"
+        android:entries="@array/theme_entries"
+        android:entryValues="@array/theme_values"
+        android:key="app_theme"
+        android:title="@string/label_theme" />
+    <CheckBoxPreference
+        android:defaultValue="true"
+        android:key="deleteConfirmationEnable"
+        android:summaryOff="@string/info_is_not_enable"
+        android:summaryOn="@string/info_is_enable"
+        android:title="@string/label_delete_confirmation" />
 </PreferenceScreen>
\ No newline at end of file