From 27fdd6d0815be3a14f1b5d82ac8cadedd76df915 Mon Sep 17 00:00:00 2001
From: Helium314 <helium314@mailbox.org>
Date: Thu, 7 Sep 2023 14:56:50 +0200
Subject: [PATCH] address some warnings/errors

move some xml files to default xml from xml-land and xml-sw600dp
they are only used for land / sw600dp, but generate compiler warnings
having them available without qualifier is definitely safer, otherwise doesn't change anything

rename KeyboardIcons.LXX_Light.Parent to KeyboardIcons.LXX_Light_Parent to remove detected circular dependency
---
 app/src/main/res/values-v31/keyboard-icons-lxx-light.xml        | 2 +-
 app/src/main/res/values/keyboard-icons-lxx-light-parent.xml     | 2 +-
 app/src/main/res/values/keyboard-icons-lxx-light.xml            | 2 +-
 app/src/main/res/{xml-sw600dp => xml}/key_settings.xml          | 0
 app/src/main/res/{xml-land => xml}/key_space_3kw.xml            | 0
 app/src/main/res/{xml-sw600dp => xml}/key_space_7kw.xml         | 0
 .../main/res/{xml-sw600dp => xml}/keys_exclamation_question.xml | 0
 7 files changed, 3 insertions(+), 3 deletions(-)
 rename app/src/main/res/{xml-sw600dp => xml}/key_settings.xml (100%)
 rename app/src/main/res/{xml-land => xml}/key_space_3kw.xml (100%)
 rename app/src/main/res/{xml-sw600dp => xml}/key_space_7kw.xml (100%)
 rename app/src/main/res/{xml-sw600dp => xml}/keys_exclamation_question.xml (100%)

diff --git a/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml b/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml
index e362daa97..40d5b5c3b 100644
--- a/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml
+++ b/app/src/main/res/values-v31/keyboard-icons-lxx-light.xml
@@ -19,7 +19,7 @@
 -->
 
 <resources>
-    <style name="KeyboardIcons.LXX_Light" parent="KeyboardIcons.LXX_Light.Parent">
+    <style name="KeyboardIcons.LXX_Light" parent="KeyboardIcons.LXX_Light_Parent">
         <!-- Use system accent color for shifted shift key -->
         <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_light_system_accent</item>
     </style>
diff --git a/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml b/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml
index d2cbfe580..41ee053aa 100644
--- a/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml
+++ b/app/src/main/res/values/keyboard-icons-lxx-light-parent.xml
@@ -19,7 +19,7 @@
 -->
 
 <resources>
-    <style name="KeyboardIcons.LXX_Light.Parent">
+    <style name="KeyboardIcons.LXX_Light_Parent">
         <!-- Keyboard icons -->
         <item name="iconShiftKey">@drawable/sym_keyboard_shift_lxx_light</item>
         <item name="iconShiftKeyShifted">@drawable/sym_keyboard_shift_locked_lxx_light</item>
diff --git a/app/src/main/res/values/keyboard-icons-lxx-light.xml b/app/src/main/res/values/keyboard-icons-lxx-light.xml
index abbf73360..f5b9db6c6 100644
--- a/app/src/main/res/values/keyboard-icons-lxx-light.xml
+++ b/app/src/main/res/values/keyboard-icons-lxx-light.xml
@@ -19,5 +19,5 @@
 -->
 
 <resources>
-    <style name="KeyboardIcons.LXX_Light" parent="KeyboardIcons.LXX_Light.Parent" />
+    <style name="KeyboardIcons.LXX_Light" parent="KeyboardIcons.LXX_Light_Parent" />
 </resources>
diff --git a/app/src/main/res/xml-sw600dp/key_settings.xml b/app/src/main/res/xml/key_settings.xml
similarity index 100%
rename from app/src/main/res/xml-sw600dp/key_settings.xml
rename to app/src/main/res/xml/key_settings.xml
diff --git a/app/src/main/res/xml-land/key_space_3kw.xml b/app/src/main/res/xml/key_space_3kw.xml
similarity index 100%
rename from app/src/main/res/xml-land/key_space_3kw.xml
rename to app/src/main/res/xml/key_space_3kw.xml
diff --git a/app/src/main/res/xml-sw600dp/key_space_7kw.xml b/app/src/main/res/xml/key_space_7kw.xml
similarity index 100%
rename from app/src/main/res/xml-sw600dp/key_space_7kw.xml
rename to app/src/main/res/xml/key_space_7kw.xml
diff --git a/app/src/main/res/xml-sw600dp/keys_exclamation_question.xml b/app/src/main/res/xml/keys_exclamation_question.xml
similarity index 100%
rename from app/src/main/res/xml-sw600dp/keys_exclamation_question.xml
rename to app/src/main/res/xml/keys_exclamation_question.xml