From f56b0bdfbcbb967aae827d9e556f4e74e4dcc4c1 Mon Sep 17 00:00:00 2001
From: Andrei <dan.andrei91@gmail.com>
Date: Wed, 20 Jul 2022 18:00:20 -0700
Subject: [PATCH] #1694 Top level folder updates

---
 .../black_folder_background_default.xml           |  8 ++------
 .../black_gradient_background_default.xml         |  9 +++------
 .../black_selector_folder_background.xml          |  4 ++--
 .../dark_folder_background_default.xml            |  8 ++------
 .../dark_folder_background_highlight.xml          |  8 ++------
 .../dark_gradient_background_default.xml          |  9 +++------
 .../dark_selector_folder_background.xml           |  4 ++--
 .../drawable-nodpi/folder_background_default.xml  |  8 ++------
 .../folder_background_highlight.xml               |  8 ++------
 .../gradient_background_default.xml               |  9 +++------
 .../drawable-nodpi/selector_feed_background.xml   |  4 ++--
 .../drawable-nodpi/selector_folder_background.xml |  4 ++--
 .../NewsBlur/res/layout/row_all_stories.xml       |  6 +++---
 clients/android/NewsBlur/res/values/colors.xml    | 15 +++++----------
 clients/android/NewsBlur/res/values/styles.xml    | 10 +++++++---
 .../src/com/newsblur/util/SpacingStyle.kt         |  6 ++----
 16 files changed, 44 insertions(+), 76 deletions(-)

diff --git a/clients/android/NewsBlur/res/drawable-nodpi/black_folder_background_default.xml b/clients/android/NewsBlur/res/drawable-nodpi/black_folder_background_default.xml
index a95eba272..f9f443a44 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/black_folder_background_default.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/black_folder_background_default.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-            android:angle="270"
-            android:type="linear"
-            android:startColor="@color/black_folder_background_start"
-            android:endColor="@color/black_folder_background_end"/>
+    android:shape="rectangle">
+    <solid android:color="@color/black_folder_background" />
 </shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/black_gradient_background_default.xml b/clients/android/NewsBlur/res/drawable-nodpi/black_gradient_background_default.xml
index d8f926ea7..f9f443a44 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/black_gradient_background_default.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/black_gradient_background_default.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <gradient
-        android:angle=     "90"
-        android:type=      "linear"
-        android:startColor="@color/black_folder_background_start"
-        android:endColor=  "@color/black_folder_background_end" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/black_folder_background" />
 </shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/black_selector_folder_background.xml b/clients/android/NewsBlur/res/drawable-nodpi/black_selector_folder_background.xml
index 726c95f36..9e5fc6da0 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/black_selector_folder_background.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/black_selector_folder_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/dark_folder_background_highlight" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/dark_folder_background_highlight" android:state_pressed="true" />
     <item android:drawable="@drawable/black_folder_background_default" />
 </selector>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_default.xml b/clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_default.xml
index ae5534164..59b8227d3 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_default.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_default.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-            android:angle="270"
-            android:type="linear"
-            android:startColor="@color/dark_folder_background_start"
-            android:endColor="@color/dark_folder_background_end"/>
+    android:shape="rectangle">
+    <solid android:color="@color/dark_folder_background" />
 </shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_highlight.xml b/clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_highlight.xml
index fccfd3ecb..8bda10f18 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_highlight.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/dark_folder_background_highlight.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-            android:angle="90"
-            android:type="linear"
-            android:startColor="@color/dark_folder_background_selected_start"
-            android:endColor="@color/dark_folder_background_selected_end"/>
+    android:shape="rectangle">
+    <solid android:color="@color/dark_folder_background_selected" />
 </shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/dark_gradient_background_default.xml b/clients/android/NewsBlur/res/drawable-nodpi/dark_gradient_background_default.xml
index b7f14f8be..59b8227d3 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/dark_gradient_background_default.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/dark_gradient_background_default.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <gradient
-        android:angle=     "90"
-        android:type=      "linear"
-        android:startColor="@color/dark_folder_background_start"
-        android:endColor=  "@color/dark_folder_background_end" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/dark_folder_background" />
 </shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/dark_selector_folder_background.xml b/clients/android/NewsBlur/res/drawable-nodpi/dark_selector_folder_background.xml
index 0796d19d6..e98332aa2 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/dark_selector_folder_background.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/dark_selector_folder_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/dark_folder_background_highlight" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/dark_folder_background_highlight" android:state_pressed="true" />
     <item android:drawable="@drawable/dark_folder_background_default" />
 </selector>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/folder_background_default.xml b/clients/android/NewsBlur/res/drawable-nodpi/folder_background_default.xml
index a5b80ba5a..07aac7bb6 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/folder_background_default.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/folder_background_default.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-            android:angle="90"
-            android:type="linear"
-            android:startColor="@color/folder_background_start"
-            android:endColor="@color/folder_background_end"/>
+    android:shape="rectangle">
+    <solid android:color="@color/folder_background" />
 </shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/folder_background_highlight.xml b/clients/android/NewsBlur/res/drawable-nodpi/folder_background_highlight.xml
index 7ffc2c396..6868e0cc9 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/folder_background_highlight.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/folder_background_highlight.xml
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <gradient
-            android:angle="90"
-            android:type="linear"
-            android:startColor="@color/folder_background_selected_start"
-            android:endColor="@color/folder_background_selected_end"/>
+    android:shape="rectangle">
+    <solid android:color="@color/folder_background_selected" />
 </shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/gradient_background_default.xml b/clients/android/NewsBlur/res/drawable-nodpi/gradient_background_default.xml
index b694d903d..07aac7bb6 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/gradient_background_default.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/gradient_background_default.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
-    <gradient
-        android:angle=     "90"
-        android:type=      "linear"
-        android:startColor="@color/folder_background_start"
-        android:endColor=  "@color/folder_background_end" />
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/folder_background" />
 </shape>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/selector_feed_background.xml b/clients/android/NewsBlur/res/drawable-nodpi/selector_feed_background.xml
index 9ef6ef52a..e2f9ed86d 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/selector_feed_background.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/selector_feed_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/feed_background_highlight" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/feed_background_highlight" android:state_pressed="true" />
     <item android:drawable="@drawable/feed_background_default" />
 </selector>
diff --git a/clients/android/NewsBlur/res/drawable-nodpi/selector_folder_background.xml b/clients/android/NewsBlur/res/drawable-nodpi/selector_folder_background.xml
index bd8ddc87b..2b9c88ec2 100644
--- a/clients/android/NewsBlur/res/drawable-nodpi/selector_folder_background.xml
+++ b/clients/android/NewsBlur/res/drawable-nodpi/selector_folder_background.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <item android:state_pressed="true" android:drawable="@drawable/folder_background_highlight" />
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/folder_background_highlight" android:state_pressed="true" />
     <item android:drawable="@drawable/folder_background_default" />
 </selector>
diff --git a/clients/android/NewsBlur/res/layout/row_all_stories.xml b/clients/android/NewsBlur/res/layout/row_all_stories.xml
index 55564060a..607d0b5fe 100644
--- a/clients/android/NewsBlur/res/layout/row_all_stories.xml
+++ b/clients/android/NewsBlur/res/layout/row_all_stories.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    style="?selectorFolderBackground" >
+    style="?selectorFolderBackground"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
 
     <ImageView
         android:id="@+id/row_everything_icon"
diff --git a/clients/android/NewsBlur/res/values/colors.xml b/clients/android/NewsBlur/res/values/colors.xml
index 5ad7acbfb..cb038c44b 100644
--- a/clients/android/NewsBlur/res/values/colors.xml
+++ b/clients/android/NewsBlur/res/values/colors.xml
@@ -45,16 +45,11 @@
     <color name="col_button_background_pressed">@color/gray65</color>
     <color name="col_button_background_pressed_dark">@color/gray30</color>
 
-    <color name="folder_background_end">#E9EBE4</color>
-    <color name="folder_background_start">#DDE0D7</color>
-    <color name="dark_folder_background_end">@color/gray07</color>
-    <color name="dark_folder_background_start">@color/gray13</color>
-    <color name="black_folder_background_end">@color/black</color>
-    <color name="black_folder_background_start">@color/gray07</color>
-    <color name="folder_background_selected_end">#D9DBD4</color>
-    <color name="folder_background_selected_start">#CDD0C7</color>
-    <color name="dark_folder_background_selected_end">#4C4C4C</color>
-    <color name="dark_folder_background_selected_start">#1A1A1A</color>
+    <color name="folder_background">#E9EBE4</color>
+    <color name="dark_folder_background">@color/gray13</color>
+    <color name="black_folder_background">@color/gray07</color>
+    <color name="folder_background_selected">#CDD0C7</color>
+    <color name="dark_folder_background_selected">#4C4C4C</color>
     <color name="row_border_top">@color/white</color>
     <color name="row_border_bottom">@color/gray80</color>
     <color name="dark_row_border_top">@color/gray20</color>
diff --git a/clients/android/NewsBlur/res/values/styles.xml b/clients/android/NewsBlur/res/values/styles.xml
index cd2779ba2..d25b298e5 100644
--- a/clients/android/NewsBlur/res/values/styles.xml
+++ b/clients/android/NewsBlur/res/values/styles.xml
@@ -32,13 +32,17 @@
         <item name="fontFamily">@font/whitney</item>
     </style>
 
-    <style name="selectorFolderBackground">
+    <style name="selectorFolderParent">
+        <item name="android:paddingTop">2dp</item>
+        <item name="android:paddingBottom">2dp</item>
+    </style>
+    <style name="selectorFolderBackground" parent="selectorFolderParent">
         <item name="android:background">@drawable/selector_folder_background</item>
     </style>
-    <style name="selectorFolderBackground.dark">
+    <style name="selectorFolderBackground.dark" parent="selectorFolderParent">
         <item name="android:background">@drawable/dark_selector_folder_background</item>
     </style>
-    <style name="selectorFolderBackground.black">
+    <style name="selectorFolderBackground.black" parent="selectorFolderParent">
         <item name="android:background">@drawable/black_selector_folder_background</item>
     </style>
 
diff --git a/clients/android/NewsBlur/src/com/newsblur/util/SpacingStyle.kt b/clients/android/NewsBlur/src/com/newsblur/util/SpacingStyle.kt
index 7e587b235..15de84d39 100644
--- a/clients/android/NewsBlur/src/com/newsblur/util/SpacingStyle.kt
+++ b/clients/android/NewsBlur/src/com/newsblur/util/SpacingStyle.kt
@@ -7,10 +7,8 @@ enum class SpacingStyle {
     COMPACT,
     ;
 
-    fun getGroupTitleVerticalPadding(context: Context): Int = when (this) {
-        COMFORTABLE -> UIUtils.dp2px(context, 9)
-        COMPACT -> UIUtils.dp2px(context, 4)
-    }
+    // same spacing on groups for both styles
+    fun getGroupTitleVerticalPadding(context: Context): Int = UIUtils.dp2px(context, 9)
 
     fun getChildTitleVerticalPadding(context: Context): Int = when (this) {
         COMFORTABLE -> UIUtils.dp2px(context, 7)