From c87225cc5fcb44e62d796855a0ecec3c2ab74755 Mon Sep 17 00:00:00 2001
From: aminecmi <aminecmi@gmail.com>
Date: Wed, 30 Nov 2022 21:06:17 +0100
Subject: [PATCH] Settings for acra and analytics. Closes #98.

---
 .../android/settings/SettingsActivity.kt      |  5 ++++
 .../drawable/ic_baseline_bug_report_24.xml    |  5 ++++
 .../res/drawable/ic_baseline_insights_24.xml  |  7 ++++++
 .../src/main/res/values-ca-rES/strings.xml    |  1 +
 .../src/main/res/values-de-rDE/strings.xml    |  1 +
 .../src/main/res/values-es-rES/strings.xml    |  1 +
 .../src/main/res/values-fa-rIR/strings.xml    |  1 +
 .../src/main/res/values-fr-rFR/strings.xml    |  1 +
 .../src/main/res/values-gl-rES/strings.xml    |  1 +
 .../src/main/res/values-in-rID/strings.xml    |  1 +
 .../src/main/res/values-it-rIT/strings.xml    |  1 +
 .../src/main/res/values-ko-rKR/strings.xml    |  1 +
 .../src/main/res/values-night/strings.xml     |  1 +
 .../src/main/res/values-nl-rNL/strings.xml    |  1 +
 .../src/main/res/values-pt-rBR/strings.xml    |  1 +
 .../src/main/res/values-pt-rPT/strings.xml    |  1 +
 .../src/main/res/values-si-rLK/strings.xml    |  1 +
 .../src/main/res/values-tr-rTR/strings.xml    |  1 +
 .../src/main/res/values-zh-rCN/strings.xml    |  1 +
 .../src/main/res/values-zh-rTW/strings.xml    |  1 +
 androidApp/src/main/res/values/strings.xml    |  1 +
 .../src/main/res/xml/pref_experimental.xml    |  6 -----
 androidApp/src/main/res/xml/pref_main.xml     | 23 +++++++++++++++++--
 23 files changed, 56 insertions(+), 8 deletions(-)
 create mode 100644 androidApp/src/main/res/drawable/ic_baseline_bug_report_24.xml
 create mode 100644 androidApp/src/main/res/drawable/ic_baseline_insights_24.xml

diff --git a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
index 472ebe1..e3bbe13 100644
--- a/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
+++ b/androidApp/src/main/java/bou/amine/apps/readerforselfossv2/android/settings/SettingsActivity.kt
@@ -103,6 +103,11 @@ class SettingsActivity : AppCompatActivity(),
     class MainPreferenceFragment : PreferenceFragmentCompat() {
         override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
             setPreferencesFromResource(R.xml.pref_main, rootKey)
+
+            preferenceManager.findPreference<Preference>("currentMode")?.onPreferenceChangeListener = Preference.OnPreferenceChangeListener { _, newValue ->
+                AppCompatDelegate.setDefaultNightMode(newValue.toString().toInt()) // ListPreference Only takes string-arrays ¯\_(ツ)_/¯
+                true
+            }
         }
     }
 
diff --git a/androidApp/src/main/res/drawable/ic_baseline_bug_report_24.xml b/androidApp/src/main/res/drawable/ic_baseline_bug_report_24.xml
new file mode 100644
index 0000000..031730c
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_baseline_bug_report_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,8h-2.81c-0.45,-0.78 -1.07,-1.45 -1.82,-1.96L17,4.41 15.59,3l-2.17,2.17C12.96,5.06 12.49,5 12,5c-0.49,0 -0.96,0.06 -1.41,0.17L8.41,3 7,4.41l1.62,1.63C7.88,6.55 7.26,7.22 6.81,8L4,8v2h2.09c-0.05,0.33 -0.09,0.66 -0.09,1v1L4,12v2h2v1c0,0.34 0.04,0.67 0.09,1L4,16v2h2.81c1.04,1.79 2.97,3 5.19,3s4.15,-1.21 5.19,-3L20,18v-2h-2.09c0.05,-0.33 0.09,-0.66 0.09,-1v-1h2v-2h-2v-1c0,-0.34 -0.04,-0.67 -0.09,-1L20,10L20,8zM14,16h-4v-2h4v2zM14,12h-4v-2h4v2z"/>
+</vector>
diff --git a/androidApp/src/main/res/drawable/ic_baseline_insights_24.xml b/androidApp/src/main/res/drawable/ic_baseline_insights_24.xml
new file mode 100644
index 0000000..99440b9
--- /dev/null
+++ b/androidApp/src/main/res/drawable/ic_baseline_insights_24.xml
@@ -0,0 +1,7 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M21,8c-1.45,0 -2.26,1.44 -1.93,2.51l-3.55,3.56c-0.3,-0.09 -0.74,-0.09 -1.04,0l-2.55,-2.55C12.27,10.45 11.46,9 10,9c-1.45,0 -2.27,1.44 -1.93,2.52l-4.56,4.55C2.44,15.74 1,16.55 1,18c0,1.1 0.9,2 2,2c1.45,0 2.26,-1.44 1.93,-2.51l4.55,-4.56c0.3,0.09 0.74,0.09 1.04,0l2.55,2.55C12.73,16.55 13.54,18 15,18c1.45,0 2.27,-1.44 1.93,-2.52l3.56,-3.55C21.56,12.26 23,11.45 23,10C23,8.9 22.1,8 21,8z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M15,9l0.94,-2.07l2.06,-0.93l-2.06,-0.93l-0.94,-2.07l-0.92,2.07l-2.08,0.93l2.08,0.93z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M3.5,11l0.5,-2l2,-0.5l-2,-0.5l-0.5,-2l-0.5,2l-2,0.5l2,0.5z"/>
+</vector>
diff --git a/androidApp/src/main/res/values-ca-rES/strings.xml b/androidApp/src/main/res/values-ca-rES/strings.xml
index b09caad..31ddde3 100644
--- a/androidApp/src/main/res/values-ca-rES/strings.xml
+++ b/androidApp/src/main/res/values-ca-rES/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-de-rDE/strings.xml b/androidApp/src/main/res/values-de-rDE/strings.xml
index 1f46319..92335dc 100644
--- a/androidApp/src/main/res/values-de-rDE/strings.xml
+++ b/androidApp/src/main/res/values-de-rDE/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-es-rES/strings.xml b/androidApp/src/main/res/values-es-rES/strings.xml
index c8f6c2d..ebff045 100644
--- a/androidApp/src/main/res/values-es-rES/strings.xml
+++ b/androidApp/src/main/res/values-es-rES/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-fa-rIR/strings.xml b/androidApp/src/main/res/values-fa-rIR/strings.xml
index 5db2616..7938f45 100644
--- a/androidApp/src/main/res/values-fa-rIR/strings.xml
+++ b/androidApp/src/main/res/values-fa-rIR/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-fr-rFR/strings.xml b/androidApp/src/main/res/values-fr-rFR/strings.xml
index ebf715c..bf16dc7 100644
--- a/androidApp/src/main/res/values-fr-rFR/strings.xml
+++ b/androidApp/src/main/res/values-fr-rFR/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-gl-rES/strings.xml b/androidApp/src/main/res/values-gl-rES/strings.xml
index af411c2..194abb9 100644
--- a/androidApp/src/main/res/values-gl-rES/strings.xml
+++ b/androidApp/src/main/res/values-gl-rES/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-in-rID/strings.xml b/androidApp/src/main/res/values-in-rID/strings.xml
index 2901507..2e2299f 100644
--- a/androidApp/src/main/res/values-in-rID/strings.xml
+++ b/androidApp/src/main/res/values-in-rID/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-it-rIT/strings.xml b/androidApp/src/main/res/values-it-rIT/strings.xml
index 17166c9..7fcc627 100644
--- a/androidApp/src/main/res/values-it-rIT/strings.xml
+++ b/androidApp/src/main/res/values-it-rIT/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-ko-rKR/strings.xml b/androidApp/src/main/res/values-ko-rKR/strings.xml
index 79bc52a..e56a91f 100644
--- a/androidApp/src/main/res/values-ko-rKR/strings.xml
+++ b/androidApp/src/main/res/values-ko-rKR/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-night/strings.xml b/androidApp/src/main/res/values-night/strings.xml
index 6b3a563..ac99954 100644
--- a/androidApp/src/main/res/values-night/strings.xml
+++ b/androidApp/src/main/res/values-night/strings.xml
@@ -4,4 +4,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
\ No newline at end of file
diff --git a/androidApp/src/main/res/values-nl-rNL/strings.xml b/androidApp/src/main/res/values-nl-rNL/strings.xml
index 52fc7d4..cfc1138 100644
--- a/androidApp/src/main/res/values-nl-rNL/strings.xml
+++ b/androidApp/src/main/res/values-nl-rNL/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-pt-rBR/strings.xml b/androidApp/src/main/res/values-pt-rBR/strings.xml
index 3e61947..8cd902f 100644
--- a/androidApp/src/main/res/values-pt-rBR/strings.xml
+++ b/androidApp/src/main/res/values-pt-rBR/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-pt-rPT/strings.xml b/androidApp/src/main/res/values-pt-rPT/strings.xml
index c1e9315..3260238 100644
--- a/androidApp/src/main/res/values-pt-rPT/strings.xml
+++ b/androidApp/src/main/res/values-pt-rPT/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-si-rLK/strings.xml b/androidApp/src/main/res/values-si-rLK/strings.xml
index 06b89d9..03d439f 100644
--- a/androidApp/src/main/res/values-si-rLK/strings.xml
+++ b/androidApp/src/main/res/values-si-rLK/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-tr-rTR/strings.xml b/androidApp/src/main/res/values-tr-rTR/strings.xml
index 312e4ec..f98a8b4 100644
--- a/androidApp/src/main/res/values-tr-rTR/strings.xml
+++ b/androidApp/src/main/res/values-tr-rTR/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-zh-rCN/strings.xml b/androidApp/src/main/res/values-zh-rCN/strings.xml
index 4e839bb..a13def9 100644
--- a/androidApp/src/main/res/values-zh-rCN/strings.xml
+++ b/androidApp/src/main/res/values-zh-rCN/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values-zh-rTW/strings.xml b/androidApp/src/main/res/values-zh-rTW/strings.xml
index b07d077..ab6462f 100644
--- a/androidApp/src/main/res/values-zh-rTW/strings.xml
+++ b/androidApp/src/main/res/values-zh-rTW/strings.xml
@@ -137,4 +137,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml
index 9cf2606..eb086e6 100644
--- a/androidApp/src/main/res/values/strings.xml
+++ b/androidApp/src/main/res/values/strings.xml
@@ -140,4 +140,5 @@
     <string name="gdpr_dialog_title">The app does not share any personal data about you.</string>
     <string name="gdpr_dialog_message"><![CDATA[Crash reports sending is now enabled. It can be disabled from the settings page (Settings > Debug). Keep in mind that crash reports are essential for the app development.]]></string>
     <string name="crash_toast_text">A crash occured. Sending the details to the developper.</string>
+    <string name="pref_switch_disable_acra">"Disable automatic bug reporting. "</string>
 </resources>
diff --git a/androidApp/src/main/res/xml/pref_experimental.xml b/androidApp/src/main/res/xml/pref_experimental.xml
index 990de19..7fd7caa 100644
--- a/androidApp/src/main/res/xml/pref_experimental.xml
+++ b/androidApp/src/main/res/xml/pref_experimental.xml
@@ -1,12 +1,6 @@
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
-    <SwitchPreference
-        android:defaultValue="true"
-        app:iconSpaceReserved="false"
-        android:key="enable_analytics"
-        android:title="@string/pref_switch_enable_analytics" />
-
     <EditTextPreference
         android:inputType="number"
         android:key="api_timeout"
diff --git a/androidApp/src/main/res/xml/pref_main.xml b/androidApp/src/main/res/xml/pref_main.xml
index 9a24689..0e8088f 100644
--- a/androidApp/src/main/res/xml/pref_main.xml
+++ b/androidApp/src/main/res/xml/pref_main.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:title="@string/title_activity_settings">
 
     <Preference
@@ -17,9 +18,13 @@
         android:title="@string/pref_header_offline"
         android:icon="@drawable/ic_signal_wifi_off_black_24dp" />
 
-    <Preference
-        android:fragment="bou.amine.apps.readerforselfossv2.android.settings.SettingsActivity$ThemePreferenceFragment"
+    <ListPreference
+        android:defaultValue="0"
+        android:entries="@array/ModeTitles"
+        android:entryValues="@array/ModeValues"
+        android:key="currentMode"
         android:title="@string/pref_header_theme"
+        app:useSimpleSummaryProvider="false"
         android:icon="@drawable/ic_color_lens_black_24dp" />
 
     <Preference
@@ -32,4 +37,18 @@
         android:title="@string/pref_header_experimental"
         android:icon="@drawable/ic_widgets_black_24dp" />
 
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="enable_analytics"
+        android:title="@string/pref_switch_enable_analytics"
+        android:icon="@drawable/ic_baseline_insights_24"/>
+
+
+    <SwitchPreference
+        android:defaultValue="false"
+        android:key="acra.disable"
+        android:title="@string/pref_switch_disable_acra"
+        android:icon="@drawable/ic_baseline_bug_report_24"/>
+
 </PreferenceScreen>
\ No newline at end of file