From 5e666df24a956db55279063c427dff3bcd11f8dd Mon Sep 17 00:00:00 2001
From: vanous <petr@linuks.cz>
Date: Tue, 28 Dec 2021 21:28:05 +0100
Subject: [PATCH] Move items from strings.xml to values.xml and arrays.xml

---
 app/src/main/res/values/arrays.xml  | 35 -----------------------------
 app/src/main/res/values/strings.xml | 13 ++++++++++-
 app/src/main/res/values/values.xml  | 21 +++++++++++++++++
 3 files changed, 33 insertions(+), 36 deletions(-)

diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index d870dcfe4..a9a1b16f6 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -10,9 +10,6 @@
         <item>@string/pref_theme_value_light</item>
         <item>@string/pref_theme_value_dark</item>
     </string-array>
-    <string name="pref_theme_value_system" translatable="false">system</string>
-    <string name="pref_theme_value_light" translatable="false">light</string>
-    <string name="pref_theme_value_dark" translatable="false">dark</string>
 
     <string-array name="pref_language_options">
         <item name="default">System Default</item>
@@ -1657,19 +1654,6 @@
         <item>@string/pref_device_action_broadcast</item>
     </string-array>
 
-    <string name="pref_button_action_disabled">Disabled</string>
-    <string name="pref_media_play">Media Play</string>
-    <string name="pref_media_pause">Media Pause</string>
-    <string name="pref_media_playpause">Toggle playback</string>
-    <string name="pref_media_next">Next Track</string>
-    <string name="pref_media_previous">Previous Track</string>
-    <string name="pref_media_volumeup">Volume Up</string>
-    <string name="pref_media_volumedown">Volume Down</string>
-    <string name="pref_media_forward">Skip forward</string>
-    <string name="pref_media_rewind">Skip back</string>
-    <string name="pref_device_action_broadcast">Send Broadcast</string>
-
-
     <string-array name="button_action_values">
         <item>@string/pref_button_action_disabled_value</item>
         <item>@string/pref_media_play_value</item>
@@ -1682,27 +1666,8 @@
         <item>@string/pref_media_forward_value</item>
         <item>@string/pref_media_rewind_value</item>
         <item>@string/pref_device_action_broadcast_value</item>
-
-
     </string-array>
 
-    <string name="pref_button_action_disabled_value" translatable="false">UNKNOWN</string>
-    <string name="pref_media_play_value" translatable="false">PLAY</string>
-    <string name="pref_media_pause_value" translatable="false">PAUSE</string>
-    <string name="pref_media_playpause_value" translatable="false">PLAYPAUSE</string>
-    <string name="pref_media_next_value" translatable="false">NEXT</string>
-    <string name="pref_media_previous_value" translatable="false">PREVIOUS</string>
-    <string name="pref_media_volumeup_value" translatable="false">VOLUMEUP</string>
-    <string name="pref_media_volumedown_value" translatable="false">VOLUMEDOWN</string>
-    <string name="pref_media_forward_value" translatable="false">FORWARD</string>
-    <string name="pref_media_rewind_value" translatable="false">REWIND</string>
-    <string name="pref_device_action_broadcast_value" translatable="false">BROADCAST</string>
-    <string name="pref_title_touch_voice_assistant">Voice Assistant</string>
-    <string name="pref_title_touch_anc">Active Noise Cancelling</string>
-    <string name="pref_title_touch_quick_ambient">Quick Ambient Sound</string>
-    <string name="pref_title_touch_volume">Volume</string>
-    <string name="pref_title_touch_ambient">Ambient Sound</string>
-
     <string-array name="device_action_options">
         <item>@string/pref_button_action_disabled</item>
         <item>@string/pref_media_play</item>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4b77a91f5..bb0302def 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1448,4 +1448,15 @@
     <string name="qhybrid_summary_on_device_confirmation">On-device pairing confirmations can get annoying. Disabling them might lose you functionality.</string>
     <string name="devicetype_vesc">VESC</string>
     <string name="devicetype_bose_qc35">Bose QC35</string>
-</resources>
\ No newline at end of file
+    <string name="pref_button_action_disabled">Disabled</string>
+    <string name="pref_media_play">Media Play</string>
+    <string name="pref_media_pause">Media Pause</string>
+    <string name="pref_media_playpause">Toggle playback</string>
+    <string name="pref_media_next">Next Track</string>
+    <string name="pref_media_previous">Previous Track</string>
+    <string name="pref_media_volumeup">Volume Up</string>
+    <string name="pref_media_volumedown">Volume Down</string>
+    <string name="pref_media_forward">Skip forward</string>
+    <string name="pref_media_rewind">Skip back</string>
+    <string name="pref_device_action_broadcast">Send Broadcast</string>
+</resources>
diff --git a/app/src/main/res/values/values.xml b/app/src/main/res/values/values.xml
index 61a2161ed..d606a27a0 100644
--- a/app/src/main/res/values/values.xml
+++ b/app/src/main/res/values/values.xml
@@ -95,4 +95,25 @@
     <item name="p_message_privacy_mode_off" type="string">off</item>
     <item name="p_message_privacy_mode_complete" type="string">complete</item>
 
+    <item name="pref_button_action_disabled_value" translatable="false" type="string">UNKNOWN</item>
+    <item name="pref_media_play_value" translatable="false" type="string">PLAY</item>
+    <item name="pref_media_pause_value" translatable="false" type="string">PAUSE</item>
+    <item name="pref_media_playpause_value" translatable="false" type="string">PLAYPAUSE</item>
+    <item name="pref_media_next_value" translatable="false" type="string">NEXT</item>
+    <item name="pref_media_previous_value" translatable="false" type="string">PREVIOUS</item>
+    <item name="pref_media_volumeup_value" translatable="false" type="string">VOLUMEUP</item>
+    <item name="pref_media_volumedown_value" translatable="false" type="string">VOLUMEDOWN</item>
+    <item name="pref_media_forward_value" translatable="false" type="string">FORWARD</item>
+    <item name="pref_media_rewind_value" translatable="false" type="string">REWIND</item>
+    <item name="pref_device_action_broadcast_value" translatable="false" type="string">BROADCAST</item>
+    <item name="pref_title_touch_voice_assistant" type="string">Voice Assistant</item>
+    <item name="pref_title_touch_anc" type="string">Active Noise Cancelling</item>
+    <item name="pref_title_touch_quick_ambient" type="string">Quick Ambient Sound</item>
+    <item name="pref_title_touch_volume" type="string">Volume</item>
+    <item name="pref_title_touch_ambient" type="string">Ambient Sound</item>
+
+    <item name="pref_theme_value_system" translatable="false" type="string">system</item>
+    <item name="pref_theme_value_light" translatable="false" type="string">light</item>
+    <item name="pref_theme_value_dark" translatable="false" type="string">dark</item>
+
 </resources>