From cd00dd45196479be819d859a3482319cd3dd15ee Mon Sep 17 00:00:00 2001
From: SVolf <a.zhiganov@mintmail.ru>
Date: Sun, 1 Oct 2023 12:38:36 +0700
Subject: [PATCH] Cleanup Styles

- Removed obsolete styles resources
- Dimens extracted into separate file
---
 .../app/src/extreme/res/values-v11/styles.xml |  4 -
 app/llx/app/src/extreme/res/values/styles.xml |  4 -
 .../app/src/main/res/values-v13/styles.xml    | 29 ------
 .../app/src/main/res/values-v14/styles.xml    |  6 --
 .../app/src/main/res/values-v21/styles.xml    | 23 -----
 .../values-w600dp/{styles.xml => dimens.xml}  |  0
 app/llx/app/src/main/res/values/colors.xml    | 11 +++
 app/llx/app/src/main/res/values/dimens.xml    | 20 ++++
 app/llx/app/src/main/res/values/styles.xml    | 96 +++++++++----------
 .../app/src/trial/res/values-v11/styles.xml   |  4 -
 .../app/src/trial/res/values-v21/styles.xml   |  8 --
 app/llx/app/src/trial/res/values/styles.xml   |  4 -
 12 files changed, 76 insertions(+), 133 deletions(-)
 delete mode 100644 app/llx/app/src/extreme/res/values-v11/styles.xml
 delete mode 100644 app/llx/app/src/extreme/res/values/styles.xml
 delete mode 100644 app/llx/app/src/main/res/values-v13/styles.xml
 delete mode 100644 app/llx/app/src/main/res/values-v14/styles.xml
 delete mode 100644 app/llx/app/src/main/res/values-v21/styles.xml
 rename app/llx/app/src/main/res/values-w600dp/{styles.xml => dimens.xml} (100%)
 create mode 100644 app/llx/app/src/main/res/values/colors.xml
 create mode 100644 app/llx/app/src/main/res/values/dimens.xml
 delete mode 100644 app/llx/app/src/trial/res/values-v11/styles.xml
 delete mode 100644 app/llx/app/src/trial/res/values-v21/styles.xml
 delete mode 100644 app/llx/app/src/trial/res/values/styles.xml

diff --git a/app/llx/app/src/extreme/res/values-v11/styles.xml b/app/llx/app/src/extreme/res/values-v11/styles.xml
deleted file mode 100644
index 6c5faa5..0000000
--- a/app/llx/app/src/extreme/res/values-v11/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppDialog" parent="android:Theme.Holo.Light.Dialog.NoActionBar" />
-</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/extreme/res/values/styles.xml b/app/llx/app/src/extreme/res/values/styles.xml
deleted file mode 100644
index b4e9352..0000000
--- a/app/llx/app/src/extreme/res/values/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppDialog" parent="android:Theme.Dialog" />
-</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/main/res/values-v13/styles.xml b/app/llx/app/src/main/res/values-v13/styles.xml
deleted file mode 100644
index 74632ea..0000000
--- a/app/llx/app/src/main/res/values-v13/styles.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<resources>
-    <style name="bubble_bg">
-        <item name="android:background">@drawable/bubble_v13</item>
-    </style>
-    <style name="bubble_arrow_up_bg">
-        <item name="android:src">@drawable/arrow_up_v13</item>
-    </style>
-    <style name="bubble_arrow_down_bg">
-        <item name="android:src">@drawable/arrow_down_v13</item>
-    </style>
-    <style name="bubble_item" parent="bubble_item_base">
-        <item name="android:background">@drawable/bubble_item_bg</item>
-    </style>
-    <style name="bbl_ttl" parent="bbl_ttl_base">
-        <item name="android:background">@drawable/bubble_item_bg</item>
-    </style>
-
-    <style name="ab_bg">
-        <item name="android:background">@drawable/ab_bg_v13</item>
-    </style>
-    <style name="ab_text" parent="@android:style/TextAppearance.Holo.Widget.ActionBar.Title"/>
-
-    <style name="sc_text" parent="sc_text_base">
-        <item name="android:background">@null</item>
-    </style>
-
-    <dimen name="pref_padding">0dp</dimen>
-    <dimen name="bubble_arrow_shift">10px</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/main/res/values-v14/styles.xml b/app/llx/app/src/main/res/values-v14/styles.xml
deleted file mode 100644
index af9e978..0000000
--- a/app/llx/app/src/main/res/values-v14/styles.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<resources>
-    <style name="list_item">
-        <item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
-        <item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/main/res/values-v21/styles.xml b/app/llx/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 762f771..0000000
--- a/app/llx/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="bubble_item" parent="bubble_item_base">
-        <item name="android:textSize">16dp</item>
-        <item name="android:background">@drawable/bubble_item_bg</item>
-        <item name="android:textAllCaps">false</item>
-        <item name="android:fontFamily">sans-serif-light</item>
-    </style>
-
-    <style name="bbl_ttl" parent="bbl_ttl_base">
-        <item name="android:fontFamily">sans-serif-light</item>
-        <item name="android:background">@drawable/bubble_item_bg</item>
-    </style>
-
-    <style name="ab_bg">
-        <item name="android:elevation">8dp</item>
-        <item name="android:background">@color/color_primary</item>
-    </style>
-
-    <style name="ab_text" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse" />
-
-    <dimen name="pref_padding">0dp</dimen>
-</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/main/res/values-w600dp/styles.xml b/app/llx/app/src/main/res/values-w600dp/dimens.xml
similarity index 100%
rename from app/llx/app/src/main/res/values-w600dp/styles.xml
rename to app/llx/app/src/main/res/values-w600dp/dimens.xml
diff --git a/app/llx/app/src/main/res/values/colors.xml b/app/llx/app/src/main/res/values/colors.xml
new file mode 100644
index 0000000..b59f95c
--- /dev/null
+++ b/app/llx/app/src/main/res/values/colors.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="bubble_item_bg_normal">#ffe6e6e6</color>
+    <color name="bubble_item_bg_pressed">#ffc0c0c0</color>
+    <color name="color_text">?android:attr/colorForeground</color>
+    <color name="color_text_pressed">?android:attr/colorPressedHighlight</color>
+    <color name="color_text_disabled">?android:attr/textColorPrimary</color>
+    <color name="eb_btn_pressed">#fff</color>
+    <color name="eb_btn_activated">#dfff</color>
+    <color name="eb_bar_bg">#8fff</color>
+</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/main/res/values/dimens.xml b/app/llx/app/src/main/res/values/dimens.xml
new file mode 100644
index 0000000..506f939
--- /dev/null
+++ b/app/llx/app/src/main/res/values/dimens.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="eb_bar_size">38dp</dimen>
+    <dimen name="eb_text_size">20dp</dimen>
+    <dimen name="icon_text_size">24dp</dimen>
+    <dimen name="large_icon_text_size">24dp</dimen>
+    <dimen name="max_box_editor_width">400dp</dimen>
+    <dimen name="ab_height">48dp</dimen>
+    <dimen name="pref_height">40dp</dimen>
+    <dimen name="pref_size_category">12dp</dimen>
+    <dimen name="pref_size_title">15dp</dimen>
+    <dimen name="pref_size_summary">11dp</dimen>
+    <dimen name="hierarchy_indent">20dp</dimen>
+
+    <dimen name="add_item_margin">4dp</dimen>
+    <dimen name="list_item_icon_size">48dp</dimen>
+
+    <dimen name="pref_padding">0dp</dimen>
+    <dimen name="bubble_arrow_shift">10px</dimen>
+</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/main/res/values/styles.xml b/app/llx/app/src/main/res/values/styles.xml
index 505f179..aca3902 100644
--- a/app/llx/app/src/main/res/values/styles.xml
+++ b/app/llx/app/src/main/res/values/styles.xml
@@ -1,15 +1,5 @@
 <resources>
 
-
-    <style name="bubble_bg">
-        <item name="android:background">@drawable/bubble_v9</item>
-    </style>
-    <style name="bubble_arrow_up_bg">
-        <item name="android:src">@drawable/arrow_up_v9</item>
-    </style>
-    <style name="bubble_arrow_down_bg">
-        <item name="android:src">@drawable/arrow_down_v9</item>
-    </style>
 	<style name="bubble_item_base">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">wrap_content</item>
@@ -21,10 +11,7 @@
 		<item name="android:gravity">left|center_vertical</item>
         <item name="android:textColor">#262626</item>
 	</style>
-    <style name="bubble_item" parent="bubble_item_base">
-        <item name="android:textColor">#fff</item>
-        <item name="android:background">@android:drawable/list_selector_background</item>
-    </style>
+
     <style name="bubble_item_icon" parent="bubble_item">
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">38dp</item>
@@ -40,9 +27,6 @@
         <item name="android:textSize">11dp</item>
         <item name="android:padding">3dp</item>
     </style>
-    <style name="bbl_ttl" parent="bbl_ttl_base">
-        <item name="android:textColor">#fff</item>
-    </style>
 
 	<style name="sm_button" parent="ab_text">
 		<item name="android:layout_width">0dp</item>
@@ -59,11 +43,6 @@
         <item name="android:textSize">@dimen/icon_text_size</item>
     </style>
 
-    <style name="ab_bg">
-        <item name="android:background">@drawable/ab_bg_v9</item>
-    </style>
-    <style name="ab_text" parent="android:TextAppearance.Medium"/>
-
     <style name="sc_text_base">
         <item name="android:inputType">textMultiLine|textNoSuggestions</item>
         <item name="android:typeface">monospace</item>
@@ -71,8 +50,6 @@
         <item name="android:gravity">top</item>
     </style>
 
-    <style name="sc_text" parent="sc_text_base"/>
-
     <style name="ab_btn_icon" parent="ab_text">
         <item name="android:layout_width">48dp</item>
         <item name="android:layout_height">match_parent</item>
@@ -81,8 +58,6 @@
         <item name="android:textSize">26dp</item>
     </style>
 
-    <dimen name="eb_bar_size">38dp</dimen>
-    <dimen name="eb_text_size">20dp</dimen>
     <style name="eb_bar">
         <item name="android:visibility">gone</item>
         <item name="android:background">@color/eb_bar_bg</item>
@@ -121,31 +96,9 @@
         <item name="android:clickable">true</item>
     </style>
 
-    <color name="bubble_item_bg_normal">#ffe6e6e6</color>
-    <color name="bubble_item_bg_pressed">#ffc0c0c0</color>
-    <color name="color_text">?android:attr/colorForeground</color>
-    <color name="color_text_pressed">?android:attr/colorPressedHighlight</color>
-    <color name="color_text_disabled">?android:attr/textColorPrimary</color>
-    <color name="eb_btn_pressed">#fff</color>
-    <color name="eb_btn_activated">#dfff</color>
-    <color name="eb_bar_bg">#8fff</color>
-
-    <dimen name="pref_padding">0dp</dimen>
-	<dimen name="bubble_arrow_shift">5px</dimen>
-    <dimen name="icon_text_size">24dp</dimen>
-    <dimen name="large_icon_text_size">24dp</dimen>
-    <dimen name="max_box_editor_width">400dp</dimen>
-    <dimen name="ab_height">48dp</dimen>
-    <dimen name="pref_height">40dp</dimen>
-    <dimen name="pref_size_category">12dp</dimen>
-    <dimen name="pref_size_title">15dp</dimen>
-    <dimen name="pref_size_summary">11dp</dimen>
-    <dimen name="hierarchy_indent">20dp</dimen>
-
-    <dimen name="add_item_margin">4dp</dimen>
     <style name="list_item">
-        <item name="android:paddingLeft">7dp</item>
-        <item name="android:paddingRight">7dp</item>
+        <item name="android:paddingLeft">?android:attr/listPreferredItemPaddingLeft</item>
+        <item name="android:paddingRight">?android:attr/listPreferredItemPaddingRight</item>
     </style>
 
     <style name="zorder_btn">
@@ -155,5 +108,46 @@
         <item name="android:scaleType">fitCenter</item>
         <item name="android:padding">6dp</item>
     </style>
-    <dimen name="list_item_icon_size">48dp</dimen>
+
+    <style name="bubble_item" parent="bubble_item_base">
+        <item name="android:textSize">16dp</item>
+        <item name="android:background">@drawable/bubble_item_bg</item>
+        <item name="android:textAllCaps">false</item>
+        <item name="android:fontFamily">sans-serif-light</item>
+    </style>
+
+    <style name="bbl_ttl" parent="bbl_ttl_base">
+        <item name="android:fontFamily">sans-serif-light</item>
+        <item name="android:background">@drawable/bubble_item_bg</item>
+    </style>
+
+    <style name="ab_bg">
+        <item name="android:elevation">8dp</item>
+        <item name="android:background">@color/color_primary</item>
+    </style>
+
+    <style name="ab_text" parent="@android:style/TextAppearance.Material.Widget.ActionBar.Title.Inverse" />
+
+    <style name="bubble_bg">
+        <item name="android:background">@drawable/bubble_v13</item>
+    </style>
+
+    <style name="bubble_arrow_up_bg">
+        <item name="android:src">@drawable/arrow_up_v13</item>
+    </style>
+
+    <style name="bubble_arrow_down_bg">
+        <item name="android:src">@drawable/arrow_down_v13</item>
+    </style>
+
+    <style name="sc_text" parent="sc_text_base">
+        <item name="android:background">@null</item>
+    </style>
+
+    <style name="AppDialog" parent="android:Theme.Material.Light.Dialog.NoActionBar">
+        <item name="android:colorPrimary">@color/color_primary</item>
+        <item name="android:colorPrimaryDark">@color/color_primary_dark</item>
+        <item name="android:colorAccent">@color/color_accent</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/app/llx/app/src/trial/res/values-v11/styles.xml b/app/llx/app/src/trial/res/values-v11/styles.xml
deleted file mode 100644
index 6c5faa5..0000000
--- a/app/llx/app/src/trial/res/values-v11/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppDialog" parent="android:Theme.Holo.Light.Dialog.NoActionBar" />
-</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/trial/res/values-v21/styles.xml b/app/llx/app/src/trial/res/values-v21/styles.xml
deleted file mode 100644
index 0cb543f..0000000
--- a/app/llx/app/src/trial/res/values-v21/styles.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppDialog" parent="android:Theme.Material.Light.Dialog.NoActionBar">
-        <item name="android:colorPrimary">@color/color_primary</item>
-        <item name="android:colorPrimaryDark">@color/color_primary_dark</item>
-        <item name="android:colorAccent">@color/color_accent</item>
-    </style>
-</resources>
\ No newline at end of file
diff --git a/app/llx/app/src/trial/res/values/styles.xml b/app/llx/app/src/trial/res/values/styles.xml
deleted file mode 100644
index b4e9352..0000000
--- a/app/llx/app/src/trial/res/values/styles.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <style name="AppDialog" parent="android:Theme.Dialog" />
-</resources>
\ No newline at end of file