From 2c3b8d2a3ca75b557e0375d6a4d34b000a2eda43 Mon Sep 17 00:00:00 2001
From: sh123 <sh123@users.noreply.github.com>
Date: Tue, 16 Aug 2022 11:32:07 +0300
Subject: [PATCH] Shuffle settings

---
 codec2talkie/src/main/res/values/strings.xml  | 10 +++++-----
 codec2talkie/src/main/res/xml/preferences.xml | 13 +++++++------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/codec2talkie/src/main/res/values/strings.xml b/codec2talkie/src/main/res/values/strings.xml
index aa13e8f..bbda9d4 100644
--- a/codec2talkie/src/main/res/values/strings.xml
+++ b/codec2talkie/src/main/res/values/strings.xml
@@ -127,11 +127,11 @@
     <string name="tcp_ip_basic_retry_delay_title">Connect retry delay</string>
     <string name="tcp_ip_basic_retry_delay_summary">How many milliseconds to wait before trying to connect again</string>
 
-    <string name="kiss_enable_scrambler_title">(Experimental) Enable KISS packet scrambling</string>
+    <string name="kiss_enable_scrambler_title">[Experimental] Enable KISS packet scrambling</string>
     <string name="kiss_enable_scrambler_summary">Enable experimental scrambling (NB! Only QRPP and only ISM bands where allowed by the band plan! Not allowed for Amateur Radio usage!)</string>
-    <string name="kiss_scrambler_key_title">(Experimental) Set key for speech scrambling</string>
+    <string name="kiss_scrambler_key_title">[Experimental] Set key for speech scrambling</string>
     <string name="kiss_scrambler_key_summary">Set key for scrambling, should be the same on all devices</string>
-    <string name="kiss_scrambler_iterations_title">(Experimental) Number of iterations performed</string>
+    <string name="kiss_scrambler_iterations_title">[Experimental] Number of iterations performed</string>
     <string name="kiss_scrambler_iterations_summary">Change to lower value on slow devices, >=1000 recommended, should match on all devices</string>
 
     <string name="permissions_granted">Permissions granted</string>
@@ -264,8 +264,8 @@
     <string name="aprs_digirepeater_enable_summary">Incoming APRS packets will received and digirepeated</string>
     <string name="digirepeater_label">&#128257;</string>
     <string name="main_status_data_received">PROCESSING</string>
-    <string name="app_no_cpu_sleep_title">Do not allow CPU sleep</string>
-    <string name="app_no_cpu_sleep_summary">Prevent CPU from sleeping, hold global wake lock</string>
+    <string name="app_no_cpu_sleep_title">[Advanced] Do not allow CPU sleep</string>
+    <string name="app_no_cpu_sleep_summary">Prevent CPU from sleeping, hold global wake lock, will drain battery!</string>
     <string name="message_groups_send_to_btn_title">Send message to…</string>
     <string name="messages_group_view_title">Groups</string>
     <string name="message_send_btn_title">Send</string>
diff --git a/codec2talkie/src/main/res/xml/preferences.xml b/codec2talkie/src/main/res/xml/preferences.xml
index d143d76..5f9a2ba 100644
--- a/codec2talkie/src/main/res/xml/preferences.xml
+++ b/codec2talkie/src/main/res/xml/preferences.xml
@@ -23,6 +23,13 @@
             app:summary="%s">
         </ListPreference>
 
+        <SwitchPreference
+            app:key="app_notifications_voice"
+            app:title="@string/app_notifications_voice_enable_title"
+            app:summary="@string/app_notifications_voice_enable_summary"
+            app:defaultValue="false">
+        </SwitchPreference>
+
         <SwitchPreference
             app:key="app_volume_ptt"
             app:title="@string/app_volume_ptt_title"
@@ -59,12 +66,6 @@
             app:defaultValue="false">
         </SwitchPreference>
 
-        <SwitchPreference
-            app:key="app_notifications_voice"
-            app:title="@string/app_notifications_voice_enable_title"
-            app:summary="@string/app_notifications_voice_enable_summary"
-            app:defaultValue="false">
-        </SwitchPreference>
     </PreferenceCategory>
 
     <PreferenceCategory