From 912857c9cdbe9b85f89da2dd9a33d1a8156ed5b1 Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Sat, 11 Jan 2020 23:31:38 +0100
Subject: [PATCH] added customization preference

---
 .../tsumugi/ParametersActivity.kt             | 12 +++++++
 .../tsumugi/preferences/CustomizeFragment.kt  | 23 ++++++++++++--
 app/src/main/res/values-fr/arrays.xml         | 31 +++++++++++++++++++
 app/src/main/res/values-fr/strings.xml        |  1 +
 app/src/main/res/values/arrays.xml            | 15 +++++++++
 app/src/main/res/values/strings.xml           |  1 +
 .../main/res/xml/customize_preferences.xml    | 10 ++++++
 7 files changed, 90 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/res/values-fr/arrays.xml

diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ParametersActivity.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ParametersActivity.kt
index d8294da..2fda3ea 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/ParametersActivity.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/ParametersActivity.kt
@@ -1,6 +1,7 @@
 package fr.forum_thalie.tsumugi
 
 import android.os.Bundle
+import android.view.MenuItem
 import fr.forum_thalie.tsumugi.preferences.*
 
 
@@ -38,4 +39,15 @@ class ParametersActivity : BaseActivity() {
             .replace(R.id.parameters_host_container, fragmentToLoad)
             .commit()
     }
+
+    // Make the Up button function as back instead of always bringing us to the main activity
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        return when (item.itemId) {
+            android.R.id.home -> {
+                onBackPressed()
+                true
+            }
+            else -> super.onOptionsItemSelected(item)
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt
index a41b394..ce078ea 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/CustomizeFragment.kt
@@ -1,9 +1,6 @@
 package fr.forum_thalie.tsumugi.preferences
 
-import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import androidx.appcompat.app.AlertDialog
 import androidx.preference.*
 import fr.forum_thalie.tsumugi.R
@@ -40,5 +37,25 @@ class CustomizeFragment : PreferenceFragmentCompat() {
             true
         }
 
+
+        val fetchPeriod = preferenceScreen.findPreference<ListPreference>("fetchPeriod")
+        fetchPeriod?.summaryProvider = ListPreference.SimpleSummaryProvider.getInstance()
+        fetchPeriod?.setOnPreferenceChangeListener { _, newValue ->
+            val builder1 = AlertDialog.Builder(context!!)
+            if (Integer.parseInt(newValue as String) == 0)
+                builder1.setMessage(R.string.restart_the_app)
+            else
+                builder1.setMessage(R.string.restart_the_app)
+            builder1.setCancelable(true)
+
+            builder1.setPositiveButton("Close" ) { dialog, _ ->
+                dialog.cancel()
+            }
+
+            val alert11 = builder1.create()
+            alert11.show()
+            true
+        }
+
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/arrays.xml b/app/src/main/res/values-fr/arrays.xml
new file mode 100644
index 0000000..95848d4
--- /dev/null
+++ b/app/src/main/res/values-fr/arrays.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="snoozeValues">
+        <item name="0">@string/disable</item>
+        <item name="1">1</item>
+        <item name="2">2</item>
+        <item name="5">5</item>
+        <item name="10">10</item>
+        <item name="15">15</item>
+        <item name="20">20</item>
+        <item name="25">25</item>
+        <item name="30">30</item>
+    </string-array>
+
+    <string-array name="fetchPeriodString">
+        <item name="5">Toutes les 5 secondes (mise à jour rapide)</item>
+        <item name="10">Toutes les 10 secondes</item>
+        <item name="15">Toutes les 15 secondes</item>
+        <item name="20">Toutes les 20 secondes</item>
+        <item name="30">Toutes les 30 secondes (moins d\'utilisation de batterie)</item>
+    </string-array>
+    <string-array name="fetchPeriodValues">
+        <item name="5">5</item>
+        <item name="10">10</item>
+        <item name="15">15</item>
+        <item name="20">20</item>
+        <item name="30">30</item>
+    </string-array>
+
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 7646d70..59e9378 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -50,5 +50,6 @@
     <string name="sleepClosesApp">Minuterie avant fermeture de l\'application</string>
     <string name="setSleepDuration">Choisir une durée (en minutes)</string>
     <string name="willCloseIn">Extinction dans %1$d minutes</string>
+    <string name="fetchPeriod">Choisir la fréquence de mise à jour quand la radio est stoppée</string>
 
 </resources>
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 22874e6..24a0996 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -13,4 +13,19 @@
         <item name="30">30</item>
     </string-array>
 
+    <string-array name="fetchPeriodString">
+        <item name="5">Every 5 seconds (faster update)</item>
+        <item name="10">Every 10 seconds</item>
+        <item name="15">Every 15 seconds</item>
+        <item name="20">Every 20 seconds</item>
+        <item name="30">Every 30 seconds (less battery-intensive)</item>
+    </string-array>
+    <string-array name="fetchPeriodValues">
+        <item name="5">5</item>
+        <item name="10">10</item>
+        <item name="15">15</item>
+        <item name="20">20</item>
+        <item name="30">30</item>
+    </string-array>
+
 </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 a132784..cc293e3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -70,5 +70,6 @@
     <string name="sleepClosesApp">Sleep - close app after some time</string>
     <string name="setSleepDuration">Set duration (minutes)</string>
     <string name="willCloseIn">Will close in %1$d minutes</string>
+    <string name="fetchPeriod">Set update period when stopped</string>
 
 </resources>
diff --git a/app/src/main/res/xml/customize_preferences.xml b/app/src/main/res/xml/customize_preferences.xml
index b25496b..6331d4a 100644
--- a/app/src/main/res/xml/customize_preferences.xml
+++ b/app/src/main/res/xml/customize_preferences.xml
@@ -29,4 +29,14 @@
         app:defaultValue="false"
         />
 
+    <ListPreference
+        app:key="fetchPeriod"
+        app:iconSpaceReserved="false"
+        android:title="@string/fetchPeriod"
+        app:singleLineTitle="false"
+        android:entries="@array/fetchPeriodString"
+        android:entryValues="@array/fetchPeriodValues"
+        android:defaultValue="10"
+        />
+
 </PreferenceScreen>
\ No newline at end of file