From f32bfd747c6accd9073d735f940fee41b4bf61e8 Mon Sep 17 00:00:00 2001
From: yattoz <12408848+yattoz@users.noreply.github.com>
Date: Thu, 27 Feb 2020 23:20:16 +0100
Subject: [PATCH] Parameters set their name in the Action Bar

---
 .../fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt | 8 ++++++++
 .../tsumugi/preferences/CustomizeFragment.kt             | 7 +++++++
 .../tsumugi/preferences/MainPreferenceFragment.kt        | 5 +++++
 .../fr/forum_thalie/tsumugi/preferences/SleepFragment.kt | 7 +++++++
 app/src/main/res/values-fr/strings.xml                   | 9 +++++----
 app/src/main/res/values/strings.xml                      | 7 ++++---
 app/src/main/res/xml/preferences.xml                     | 2 +-
 7 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt
index d876246..4b07606 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/AlarmFragment.kt
@@ -1,8 +1,10 @@
 package fr.forum_thalie.tsumugi.preferences
 
 import android.app.TimePickerDialog
+import android.content.Context
 import android.os.Bundle
 import android.util.Log
+import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.edit
 import androidx.preference.*
 import fr.forum_thalie.tsumugi.*
@@ -11,6 +13,12 @@ import fr.forum_thalie.tsumugi.alarm.RadioAlarm
 import java.util.*
 
 class AlarmFragment : PreferenceFragmentCompat() {
+
+    override fun onAttach(context: Context) {
+        (activity as AppCompatActivity).supportActionBar?.title = context.getString(R.string.setupAlarmClock)
+        super.onAttach(context)
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.alarm_preferences, rootKey)
 
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 fe3a2cd..cedcec8 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,12 +1,19 @@
 package fr.forum_thalie.tsumugi.preferences
 
+import android.content.Context
 import android.os.Bundle
 import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.*
 import fr.forum_thalie.tsumugi.R
 import fr.forum_thalie.tsumugi.preferenceStore
 
 class CustomizeFragment : PreferenceFragmentCompat() {
+    override fun onAttach(context: Context) {
+        (activity as AppCompatActivity).supportActionBar?.title = context.getString(R.string.customizeAppBehavior)
+        super.onAttach(context)
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.customize_preferences, rootKey)
 
diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/MainPreferenceFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/MainPreferenceFragment.kt
index 61d30fd..4eb797f 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/MainPreferenceFragment.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/MainPreferenceFragment.kt
@@ -5,9 +5,14 @@ import android.net.Uri
 import android.os.Bundle
 import fr.forum_thalie.tsumugi.R
 import android.annotation.SuppressLint
+import androidx.appcompat.app.AppCompatActivity
 import androidx.preference.*
 
 class MainPreferenceFragment : PreferenceFragmentCompat() {
+    override fun onResume() {
+        super.onResume()
+        (activity as AppCompatActivity).supportActionBar?.title = context?.getString(R.string.settings)
+    }
 
     @SuppressLint("ApplySharedPref")
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/SleepFragment.kt b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/SleepFragment.kt
index 4c62ae3..9041a23 100644
--- a/app/src/main/java/fr/forum_thalie/tsumugi/preferences/SleepFragment.kt
+++ b/app/src/main/java/fr/forum_thalie/tsumugi/preferences/SleepFragment.kt
@@ -1,13 +1,20 @@
 package fr.forum_thalie.tsumugi.preferences
 
+import android.content.Context
 import android.os.Bundle
 import androidx.preference.*
 import fr.forum_thalie.tsumugi.R
 import android.text.InputType
+import androidx.appcompat.app.AppCompatActivity
 import fr.forum_thalie.tsumugi.alarm.RadioSleeper
 
 
 class SleepFragment : PreferenceFragmentCompat() {
+    override fun onAttach(context: Context) {
+        (activity as AppCompatActivity).supportActionBar?.title = context.getString(R.string.setSleepTimer)
+        super.onAttach(context)
+    }
+
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
         setPreferencesFromResource(R.xml.sleep_preference, rootKey)
 
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 865b547..c2e04af 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -37,16 +37,16 @@
     <string name="lp">Derniers titres</string>
     <string name="programme">Planning</string>
     <string name="regular_programme">Programme régulier</string>
-    <string name="useAlarmClock">Activer l\'alarme</string>
+    <string name="useAlarmClock">Activer le réveil</string>
     <string name="setTime">Choisir l\'heure</string>
     <string name="selectDaysOfWeek">Choisir les jours</string>
     <string name="SetSnoozeDuration">Choisir le délai de répétition d\'alarme (minutes)</string>
     <string name="volumeAtStartup">Volume au démarrage</string>
     <string name="useHorizontalSplitLayout">Utiliser une disposition horizontale adaptée</string>
     <string name="makeSnackbarsPersistent">Rendre les barres d\information persistantes</string>
-    <string name="setupAlarmClock">Configurer l\'alarme</string>
-    <string name="setSleepTimer">Configurer la minuterie avant extinction</string>
-    <string name="costumizeAppBehavior">Paramètres de l\'application</string>
+    <string name="setupAlarmClock">Réveil</string>
+    <string name="setSleepTimer">Minuterie avant extinction</string>
+    <string name="customizeAppBehavior">Comportement de l\'application</string>
     <string name="submitABug">Reporter un bug</string>
     <string name="sleepClosesApp">Minuterie avant fermeture de l\'application</string>
     <string name="setSleepDuration">Choisir une durée (en minutes)</string>
@@ -55,5 +55,6 @@
     <string name="refreshing">Actualisation…</string>
     <string name="action_refresh">Raffraîchir les données</string>
     <string name="autoPlay">\"Play\" au branchement de la prise casque</string>
+    <string name="settings">Paramètres</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 92e4587..3847fed 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -64,9 +64,9 @@
     <string name="volumeAtStartup">Volume at startup</string>
     <string name="useHorizontalSplitLayout">Use horizontal split layout</string>
     <string name="makeSnackbarsPersistent">Make Snackbars persistent</string>
-    <string name="setupAlarmClock">Set up alarm clock</string>
-    <string name="setSleepTimer">Set sleep timer</string>
-    <string name="costumizeAppBehavior">Customize app behavior</string>
+    <string name="setupAlarmClock">Alarm</string>
+    <string name="setSleepTimer">Sleep timer</string>
+    <string name="customizeAppBehavior">Customize app behavior</string>
     <string name="submitABug">Submit a bug (opens GitHub in a web browser)</string>
     <string name="sleepClosesApp">Sleep - close app after some time</string>
     <string name="setSleepDuration">Set duration (minutes)</string>
@@ -75,5 +75,6 @@
     <string name="refreshing">Refreshing data…</string>
     <string name="action_refresh">Refresh data</string>
     <string name="autoPlay">Auto play when plugging headphones</string>
+    <string name="settings">Settings</string>
 
 </resources>
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 4b1e943..8edd336 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -20,7 +20,7 @@
     <Preference
         app:icon="@drawable/ic_customize"
         app:key="CustomizeFragment"
-        app:title="@string/costumizeAppBehavior"
+        app:title="@string/customizeAppBehavior"
         app:fragment="fr.forum_thalie.tsumugi.preferences.CustomizeFragment"
         />