From 587b81e17f9c4659c13844124e2689f7a31c82f7 Mon Sep 17 00:00:00 2001
From: vinceh121 <vincent.hyvert@sfr.fr>
Date: Fri, 3 Jan 2020 17:32:57 +0100
Subject: [PATCH] Made themes changeable and some fixes

---
 app/src/main/AndroidManifest.xml              |   2 +-
 app/src/main/java/de/k3b/android/GuiUtil.java |  17 +++
 .../androFotoFinder/SettingsActivity.java     |   2 +
 .../widget/ActivityWithCallContext.java       |  17 ++-
 .../main/res/drawable/grid_color_selector.xml |   1 -
 app/src/main/res/layout/fragment_gallery.xml  |   2 +-
 app/src/main/res/layout/fragment_tags.xml     |   2 +-
 app/src/main/res/values/arrays.xml            |  10 ++
 app/src/main/res/values/colors.xml            |   2 +-
 app/src/main/res/values/strings.xml           |  11 +-
 app/src/main/res/values/styles.xml            |   6 +-
 app/src/main/res/xml/preferences.xml          | 143 ++++++++++--------
 12 files changed, 142 insertions(+), 73 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0a84ea3e..bcd1afc0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -77,7 +77,7 @@
         android:icon="@drawable/foto_gallery"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:theme="@style/AppTheme"
+        android:theme="@style/AppTheme.Light"
         >
         <activity android:name=".FotoGalleryActivity"
             android:icon="@drawable/foto_gallery"
diff --git a/app/src/main/java/de/k3b/android/GuiUtil.java b/app/src/main/java/de/k3b/android/GuiUtil.java
index 91415b19..c5ecc647 100644
--- a/app/src/main/java/de/k3b/android/GuiUtil.java
+++ b/app/src/main/java/de/k3b/android/GuiUtil.java
@@ -19,8 +19,12 @@
  
 package de.k3b.android;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.pm.PackageManager.NameNotFoundException;
+import android.preference.PreferenceManager;
+
+import de.k3b.android.androFotoFinder.R;
 
 /**
  * gui utils
@@ -36,4 +40,17 @@ public static String getAppVersionName(final Context context) {
         }
         return null;
     }
+    public static void setTheme(Activity act) {
+        final String theme = PreferenceManager.getDefaultSharedPreferences(act).getString("user_theme", "Light");
+        switch (theme) {
+            case "Light":
+                act.setTheme(R.style.AppTheme_Light);
+                break;
+            case "Dark":
+                act.setTheme(R.style.AppTheme_Dark);
+                break;
+            default:
+                throw new RuntimeException("Invalid theme selected");
+        }
+    }
 }
diff --git a/app/src/main/java/de/k3b/android/androFotoFinder/SettingsActivity.java b/app/src/main/java/de/k3b/android/androFotoFinder/SettingsActivity.java
index fb04cffa..499fa682 100644
--- a/app/src/main/java/de/k3b/android/androFotoFinder/SettingsActivity.java
+++ b/app/src/main/java/de/k3b/android/androFotoFinder/SettingsActivity.java
@@ -39,6 +39,7 @@
 import java.io.File;
 
 import de.k3b.LibGlobal;
+import de.k3b.android.GuiUtil;
 import de.k3b.android.androFotoFinder.imagedetail.HugeImageLoader;
 import de.k3b.android.util.PhotoPropertiesMediaFilesScanner;
 import de.k3b.android.util.PhotoPropertiesMediaFilesScannerExifInterface;
@@ -62,6 +63,7 @@ public class SettingsActivity extends PreferenceActivity {
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
+        GuiUtil.setTheme(this); // this activity doesn't extent ActivityWithCallContext
         LocalizedActivity.fixLocale(this);	// #21: Support to change locale at runtime
         super.onCreate(savedInstanceState);
 
diff --git a/app/src/main/java/de/k3b/android/widget/ActivityWithCallContext.java b/app/src/main/java/de/k3b/android/widget/ActivityWithCallContext.java
index 2e5f9f34..aab6b8ba 100644
--- a/app/src/main/java/de/k3b/android/widget/ActivityWithCallContext.java
+++ b/app/src/main/java/de/k3b/android/widget/ActivityWithCallContext.java
@@ -24,11 +24,12 @@
 import android.os.Bundle;
 import android.util.Log;
 
+import de.k3b.android.GuiUtil;
 import de.k3b.android.androFotoFinder.Global;
 
 /**
  * An activity that memorizes the activity call stack (parent Activities) for debugging purposes.
- *
+ * <p>
  * Created by k3b on 25.08.2018.
  */
 public class ActivityWithCallContext extends Activity {
@@ -42,7 +43,9 @@ public class ActivityWithCallContext extends Activity {
      */
     public static final Boolean isCallContextEnabled = true;
 
-    /** what the current activity is doing. This will become part of the callstack when a child activity is invoked */
+    /**
+     * what the current activity is doing. This will become part of the callstack when a child activity is invoked
+     */
     public static String additionalCallContext = "";
 
     /**
@@ -73,6 +76,7 @@ public static void addContext(String debugContext, Intent targetIntent, Activity
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        GuiUtil.setTheme(this); // Almost every activity extends this so use this to set theme
         super.onCreate(savedInstanceState);
 
         if (isCallContextEnabled) {
@@ -93,6 +97,7 @@ public static String readCallContext(Intent intent) {
     public boolean hasParentCallContext() {
         return this.parentCallContext.length() > 0;
     }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -110,7 +115,9 @@ public String getCallContext() {
         return parentCallContext + "\n=> " + getCallerDescription(this);
     }
 
-    /** called by all variants of startActivity(ForResult): add context to call.*/
+    /**
+     * called by all variants of startActivity(ForResult): add context to call.
+     */
     @Override
     public void startActivityForResult(Intent intent, int requestCode, Bundle options) {
         startActivityForResultImpl(intent, requestCode, options);
@@ -131,7 +138,9 @@ public void startActivity(Intent intent) {
         startActivityForResultImpl(intent, -1, null);
     }
 
-    /** called by all variants of startActivity(ForResult): add context to call.*/
+    /**
+     * called by all variants of startActivity(ForResult): add context to call.
+     */
     private void startActivityForResultImpl(Intent intent, int requestCode, Bundle options) {
         addContext(additionalCallContext, intent, this);
         additionalCallContext = "";
diff --git a/app/src/main/res/drawable/grid_color_selector.xml b/app/src/main/res/drawable/grid_color_selector.xml
index 90a0cde5..9aefe6ae 100644
--- a/app/src/main/res/drawable/grid_color_selector.xml
+++ b/app/src/main/res/drawable/grid_color_selector.xml
@@ -23,6 +23,5 @@
 
     <item android:drawable="@color/blue" android:state_pressed="true" />
     <item android:drawable="@color/blue" android:state_selected="true" />
-    <item android:drawable="@color/white" />
 
 </selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_gallery.xml b/app/src/main/res/layout/fragment_gallery.xml
index 56be740c..4c67b143 100644
--- a/app/src/main/res/layout/fragment_gallery.xml
+++ b/app/src/main/res/layout/fragment_gallery.xml
@@ -147,8 +147,8 @@
     <!--Removed ObsoleteLayoutParam: layout_alignParentTop-->
   </HorizontalScrollView>
 
+
   <GridView android:orientation="horizontal"
-    android:background="#f0f0f0"
     android:id="@+id/gridView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/fragment_tags.xml b/app/src/main/res/layout/fragment_tags.xml
index 22deb6be..ea778642 100644
--- a/app/src/main/res/layout/fragment_tags.xml
+++ b/app/src/main/res/layout/fragment_tags.xml
@@ -91,7 +91,7 @@
             android:layout_alignParentBottom="true"
             />
 
-        <TextView android:id="@id/android:empty"
+        <TextView android:id="@android:id/empty"
             android:layout_width="fill_parent" android:layout_height="fill_parent"
             android:text="@string/tags_search_no_matching_items_found"
             android:layout_below="@+id/myFilter"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 035b675e..b94b265b 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -80,4 +80,14 @@
         <item>00000</item>
     </string-array>
 
+    <string-array name="pref_available_themes" translatable="false">
+        <item>Light</item>
+        <item>Dark</item>
+    </string-array>
+
+    <string-array name="pref_themes_names" translatable="true">
+        <item>@string/theme_light</item>
+        <item>@string/theme_dark</item>
+    </string-array>
+
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 985a132a..e27e2fc6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -21,7 +21,7 @@
  -->
 <resources>
     <color name="blue">#00abea</color>
-    <color name="white">#ffffff</color>
+    <!--<color name="primary_background">@android:color/black</color>-->
     <color name="image_label_background">#70ffffff</color>
     <color name="drag_to">@android:color/black</color>
     <color name="search_layover_bg">#50000000</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 38ec4e98..ab341d15 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -275,9 +275,12 @@ You can undo hiding by calling the mediascanner from gallery-menu."</string>
 
     <!-- when should backup start ? -->
     <string name="lbl_when">When: </string>
-<!-- #108 Zip-file export/backup will be implemented later
-    < ! - - what type of data should be saven ? - - >
-    <string name="lbl_what">What: </string>
--->
+    <string name="settings_theme">Theme</string>
+    <string name="theme_light">Holo light</string>
+    <string name="theme_dark">Holo dark</string>
+    <!-- #108 Zip-file export/backup will be implemented later
+        < ! - - what type of data should be saven ? - - >
+        <string name="lbl_what">What: </string>
+    -->
 </resources>
 
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a7f42402..e1f688e3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -22,8 +22,12 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="android:Theme.Holo.Light.DarkActionBar">
+    <style name="AppTheme.Light" parent="android:Theme.Holo.Light.DarkActionBar">
         <!-- Customize your theme here. -->
+
+    </style>
+    <style name="AppTheme.Dark" parent="android:Theme.Holo">
+
     </style>
     <style name="MSV_ImageButton">
         <item name="android:layout_width">wrap_content</item>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 671db294..e326ddcd 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
+<?xml version="1.0" encoding="utf-8"?><!--
 Copyright (C) 2014-2019 k3b
 
 This file is part of "A Photo Manager" (https://github.com/k3b/AndroFotoFinder/)
@@ -19,33 +18,44 @@ this program. If not, see <http://www.gnu.org/licenses/>
 
 -->
 
-<PreferenceScreen android:key="preferences" xmlns:android="http://schemas.android.com/apk/res/android">
-	<PreferenceCategory 
-		android:title="@string/settings_title"
-		android:key="pref_category_first">
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    android:key="preferences">
+    <PreferenceCategory
+        android:key="pref_category_first"
+        android:title="@string/settings_title">
 
         <!-- #21: Support to change locale at runtime -->
         <ListPreference
-            android:key="user_locale"
-            android:title="@string/settings_locale_title"
             android:defaultValue=""
             android:entries="@array/pref_locale_names"
             android:entryValues="@array/pref_locale_values"
+            android:key="user_locale"
             android:negativeButtonText="@null"
-            android:positiveButtonText="@null" />
+            android:positiveButtonText="@null"
+            android:title="@string/settings_locale_title" />
+
+        <ListPreference
+            android:defaultValue="Light"
+            android:entries="@array/pref_themes_names"
+            android:entryValues="@array/pref_available_themes"
+            android:key="user_theme"
+            android:negativeButtonText="@null"
+            android:positiveButtonText="@null"
+            android:title="@string/settings_theme" />
 
         <Preference
             android:key="translate"
-            android:title="@string/settings_translate_title"
-            android:summary="@string/settings_translate_summary" />
+            android:summary="@string/settings_translate_summary"
+            android:title="@string/settings_translate_title" />
 
-		<de.k3b.android.widget.AboutDialogPreference
-			android:key="about"
-			android:title="@string/about_summary" />
+        <de.k3b.android.widget.AboutDialogPreference
+            android:key="about"
+            android:title="@string/about_summary" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/gallery_title"
-        android:key="pref_category_photo">
+    <PreferenceCategory
+        android:key="pref_category_photo"
+        android:title="@string/gallery_title">
         <de.k3b.android.widget.EditTextPreferenceWithSummary
             android:key="slideshowIntervallInMilliSecs"
             android:title="@string/settings_image_slideshow_intervall_title" />
@@ -56,8 +66,8 @@ this program. If not, see <http://www.gnu.org/licenses/>
 
         <EditTextPreference
             android:key="imageDetailThumbnailIfBiggerThan"
-            android:title="@string/settings_image_thumb_if_bigger_than_title"
-            android:summary="@string/settings_image_thumb_if_bigger_than_summary"/>
+            android:summary="@string/settings_image_thumb_if_bigger_than_summary"
+            android:title="@string/settings_image_thumb_if_bigger_than_title" />
 
         <de.k3b.android.widget.EditTextPreferenceWithSummary
             android:key="thumbCacheRoot"
@@ -66,19 +76,22 @@ this program. If not, see <http://www.gnu.org/licenses/>
         <de.k3b.android.widget.EditTextPreferenceWithSummary
             android:key="reportDir"
             android:title="@string/settings_bookmark_dir_title" />
-        <CheckBoxPreference android:key="datePickerUseDecade"
+        <CheckBoxPreference
             android:defaultValue="false"
-            android:title="@string/settings_pick_date_decade4year_title"
-            android:summary="@string/settings_pick_date_decade4year_summary" />
+            android:key="datePickerUseDecade"
+            android:summary="@string/settings_pick_date_decade4year_summary"
+            android:title="@string/settings_pick_date_decade4year_title" />
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/geo_show_menu_title"
-        android:key="pref_category_map">
-        <CheckBoxPreference android:key="mapsForgeEnabled"
+    <PreferenceCategory
+        android:key="pref_category_map"
+        android:title="@string/geo_show_menu_title">
+        <CheckBoxPreference
             android:defaultValue="false"
-            android:title="@string/settings_maps_forge_enable_tile"
-            android:summary="@string/settings_maps_forge_enable_summary" />
+            android:key="mapsForgeEnabled"
+            android:summary="@string/settings_maps_forge_enable_summary"
+            android:title="@string/settings_maps_forge_enable_tile" />
 
         <de.k3b.android.widget.EditTextPreferenceWithSummary
             android:key="mapsForgeDir"
@@ -90,31 +103,33 @@ this program. If not, see <http://www.gnu.org/licenses/>
 
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/edit_menu_title"
-        android:key="pref_category_processing">
+    <PreferenceCategory
+        android:key="pref_category_processing"
+        android:title="@string/edit_menu_title">
         <ListPreference
-            android:key="mediaUpdateStrategy"
-            android:title="@string/settings_media_update_strategy_title"
             android:entries="@array/pref_media_update_strategy_names"
             android:entryValues="@array/pref_media_update_strategy_values"
+            android:key="mediaUpdateStrategy"
             android:negativeButtonText="@null"
-            android:positiveButtonText="@null" />
-        <CheckBoxPreference android:key="xmp_file_schema_long"
+            android:positiveButtonText="@null"
+            android:title="@string/settings_media_update_strategy_title" />
+        <CheckBoxPreference
             android:defaultValue="false"
-            android:title="@string/settings_xmp_file_schema_title"
-            android:summary="@string/settings_xmp_file_schema_summary" />
+            android:key="xmp_file_schema_long"
+            android:summary="@string/settings_xmp_file_schema_summary"
+            android:title="@string/settings_xmp_file_schema_title" />
 
         <!-- private images get the extension ".jpg-p" which hides them from other gallery-apps and image pickers.  -->
-        <CheckBoxPreference android:key="renamePrivateJpg"
+        <CheckBoxPreference
             android:defaultValue="false"
-            android:title="@string/settings_rename_private_jpg_title"
-            />
+            android:key="renamePrivateJpg"
+            android:title="@string/settings_rename_private_jpg_title" />
 
         <!-- private images get the extension ".jpg-p" which hides them from other gallery-apps and image pickers.  -->
-        <CheckBoxPreference android:key="clearSelectionAfterCommand"
+        <CheckBoxPreference
             android:defaultValue="true"
-            android:title="@string/settings_multisel_clear_title"
-             />
+            android:key="clearSelectionAfterCommand"
+            android:title="@string/settings_multisel_clear_title" />
 
         <de.k3b.android.widget.EditTextPreferenceWithSummary
             android:key="pickHistoryMax"
@@ -124,41 +139,51 @@ this program. If not, see <http://www.gnu.org/licenses/>
             android:title="@string/settings_geo_history_file_title" />
     </PreferenceCategory>
 
-    <PreferenceCategory android:title="@string/settings_group_debug_title"
-		android:key="pref_category_debug">
-        <CheckBoxPreference android:key="debugEnabledSql"
+    <PreferenceCategory
+        android:key="pref_category_debug"
+        android:title="@string/settings_group_debug_title">
+        <CheckBoxPreference
             android:defaultValue="false"
-            android:title="@string/settings_debug_sql_title"
-            android:summary="@string/settings_debug_sql_summary" />
-        <CheckBoxPreference android:key="debugEnabledViewItem"
+            android:key="debugEnabledSql"
+            android:summary="@string/settings_debug_sql_summary"
+            android:title="@string/settings_debug_sql_title" />
+        <CheckBoxPreference
             android:defaultValue="false"
-            android:title="@string/settings_debug_view_item_title"
-            android:summary="@string/settings_debug_view_item_summary" />
-        <CheckBoxPreference android:key="debugEnabledMap"
+            android:key="debugEnabledViewItem"
+            android:summary="@string/settings_debug_view_item_summary"
+            android:title="@string/settings_debug_view_item_title" />
+        <CheckBoxPreference
             android:defaultValue="false"
+            android:key="debugEnabledMap"
             android:title="@string/settings_debug_map_title" />
 
-        <CheckBoxPreference android:key="debugEnabledMemory"
+        <CheckBoxPreference
             android:defaultValue="false"
+            android:key="debugEnabledMemory"
             android:title="@string/settings_debug_memory_title" />
-        <CheckBoxPreference android:key="debugEnabledJpg"
+        <CheckBoxPreference
             android:defaultValue="false"
+            android:key="debugEnabledJpg"
             android:title="@string/settings_debug_jpg_title" />
 
-        <CheckBoxPreference android:key="debugEnabledJpgMetaIo"
+        <CheckBoxPreference
             android:defaultValue="false"
+            android:key="debugEnabledJpgMetaIo"
             android:title="@string/settings_debug_meta_io" />
-        <CheckBoxPreference android:key="debugEnabledZip"
+        <CheckBoxPreference
             android:defaultValue="false"
+            android:key="debugEnabledZip"
             android:title="@string/settings_debug_zip" />
-        <CheckBoxPreference android:key="debugEnableLibs"
+        <CheckBoxPreference
             android:defaultValue="false"
-            android:title="@string/settings_debug_libs_title"
-            android:summary="@string/settings_debug_libs_summary" />
-        <CheckBoxPreference android:key="debugEnabled"
+            android:key="debugEnableLibs"
+            android:summary="@string/settings_debug_libs_summary"
+            android:title="@string/settings_debug_libs_title" />
+        <CheckBoxPreference
             android:defaultValue="false"
-            android:title="@string/settings_debug_title"
-            android:summary="@string/settings_debug_summary" />
+            android:key="debugEnabled"
+            android:summary="@string/settings_debug_summary"
+            android:title="@string/settings_debug_title" />
 
         <Preference
             android:key="debugClearLog"