From 381ba86e3c84b5478a400bb492ba5b5d1306eb8d Mon Sep 17 00:00:00 2001
From: arkon <eugcheung94@gmail.com>
Date: Wed, 17 Jun 2020 22:00:58 -0400
Subject: [PATCH] Adopt download/local badge colors from J2K

---
 .../layout/source_comfortable_grid_item.xml   | 34 +++++++++---------
 .../res/layout/source_compact_grid_item.xml   | 34 +++++++++---------
 app/src/main/res/layout/source_list_item.xml  | 36 +++++++++----------
 app/src/main/res/values/colors.xml            |  4 +--
 4 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/app/src/main/res/layout/source_comfortable_grid_item.xml b/app/src/main/res/layout/source_comfortable_grid_item.xml
index 9547046f74..aa07e4208f 100644
--- a/app/src/main/res/layout/source_comfortable_grid_item.xml
+++ b/app/src/main/res/layout/source_comfortable_grid_item.xml
@@ -41,16 +41,31 @@
                     style="@style/TextAppearance.Regular.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/md_teal_500"
+                    android:background="@color/pale_green"
                     android:paddingStart="3dp"
                     android:paddingTop="1dp"
                     android:paddingEnd="3dp"
                     android:paddingBottom="1dp"
                     android:text="@string/local_source_badge"
-                    android:textColor="@color/md_white_1000"
+                    android:textColor="@color/md_black_1000"
                     android:visibility="gone"
                     tools:visibility="visible" />
 
+                <TextView
+                    android:id="@+id/download_text"
+                    style="@style/TextAppearance.Regular.Caption"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:background="@color/pale_green"
+                    android:paddingStart="3dp"
+                    android:paddingTop="1dp"
+                    android:paddingEnd="3dp"
+                    android:paddingBottom="1dp"
+                    android:textColor="@color/md_black_1000"
+                    android:visibility="gone"
+                    tools:text="120"
+                    tools:visibility="visible" />
+
                 <TextView
                     android:id="@+id/unread_text"
                     style="@style/TextAppearance.Regular.Caption"
@@ -66,21 +81,6 @@
                     tools:text="120"
                     tools:visibility="visible" />
 
-                <TextView
-                    android:id="@+id/download_text"
-                    style="@style/TextAppearance.Regular.Caption"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:background="@color/md_red_500"
-                    android:paddingStart="3dp"
-                    android:paddingTop="1dp"
-                    android:paddingEnd="3dp"
-                    android:paddingBottom="1dp"
-                    android:textColor="@color/md_white_1000"
-                    android:visibility="gone"
-                    tools:text="120"
-                    tools:visibility="visible" />
-
             </LinearLayout>
 
             <ProgressBar
diff --git a/app/src/main/res/layout/source_compact_grid_item.xml b/app/src/main/res/layout/source_compact_grid_item.xml
index 7c80508829..4a286121e1 100644
--- a/app/src/main/res/layout/source_compact_grid_item.xml
+++ b/app/src/main/res/layout/source_compact_grid_item.xml
@@ -41,16 +41,31 @@
                 style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/md_teal_500"
+                android:background="@color/pale_green"
                 android:paddingStart="3dp"
                 android:paddingTop="1dp"
                 android:paddingEnd="3dp"
                 android:paddingBottom="1dp"
                 android:text="@string/local_source_badge"
-                android:textColor="@color/md_white_1000"
+                android:textColor="@color/md_black_1000"
                 android:visibility="gone"
                 tools:visibility="visible" />
 
+            <TextView
+                android:id="@+id/download_text"
+                style="@style/TextAppearance.Regular.Caption"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:background="@color/pale_green"
+                android:paddingStart="3dp"
+                android:paddingTop="1dp"
+                android:paddingEnd="3dp"
+                android:paddingBottom="1dp"
+                android:textColor="@color/md_black_1000"
+                android:visibility="gone"
+                tools:text="120"
+                tools:visibility="visible" />
+
             <TextView
                 android:id="@+id/unread_text"
                 style="@style/TextAppearance.Regular.Caption"
@@ -66,21 +81,6 @@
                 tools:text="120"
                 tools:visibility="visible" />
 
-            <TextView
-                android:id="@+id/download_text"
-                style="@style/TextAppearance.Regular.Caption"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:background="@color/md_red_500"
-                android:paddingStart="3dp"
-                android:paddingTop="1dp"
-                android:paddingEnd="3dp"
-                android:paddingBottom="1dp"
-                android:textColor="@color/md_white_1000"
-                android:visibility="gone"
-                tools:text="120"
-                tools:visibility="visible" />
-
         </LinearLayout>
 
         <TextView
diff --git a/app/src/main/res/layout/source_list_item.xml b/app/src/main/res/layout/source_list_item.xml
index 53bac0e46f..5be6c310a3 100644
--- a/app/src/main/res/layout/source_list_item.xml
+++ b/app/src/main/res/layout/source_list_item.xml
@@ -52,17 +52,33 @@
             style="@style/TextAppearance.Regular.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/md_teal_500"
+            android:background="@color/pale_green"
             android:maxLines="1"
             android:paddingStart="3dp"
             android:paddingTop="1dp"
             android:paddingEnd="3dp"
             android:paddingBottom="1dp"
             android:text="@string/local_source_badge"
-            android:textColor="@color/md_white_1000"
+            android:textColor="@color/md_black_1000"
             android:visibility="gone"
             tools:visibility="visible" />
 
+        <TextView
+            android:id="@+id/download_text"
+            style="@style/TextAppearance.Regular.Caption"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/pale_green"
+            android:maxLines="1"
+            android:paddingStart="3dp"
+            android:paddingTop="1dp"
+            android:paddingEnd="3dp"
+            android:paddingBottom="1dp"
+            android:textColor="@color/md_black_1000"
+            android:visibility="gone"
+            tools:text="122"
+            tools:visibility="visible" />
+
         <TextView
             android:id="@+id/unread_text"
             style="@style/TextAppearance.Regular.Caption"
@@ -79,22 +95,6 @@
             tools:text="130"
             tools:visibility="visible" />
 
-        <TextView
-            android:id="@+id/download_text"
-            style="@style/TextAppearance.Regular.Caption"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:background="@color/md_red_500"
-            android:maxLines="1"
-            android:paddingStart="3dp"
-            android:paddingTop="1dp"
-            android:paddingEnd="3dp"
-            android:paddingBottom="1dp"
-            android:textColor="@color/md_white_1000"
-            android:visibility="gone"
-            tools:text="122"
-            tools:visibility="visible" />
-
     </LinearLayout>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 5199b30d23..dde0450f46 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -74,8 +74,6 @@
     <color name="md_blue_grey_900">#263238</color>
     <color name="md_blue_grey_800">#37474F</color>
 
-    <color name="md_red_500">#F44336</color>
-
-    <color name="md_teal_500">#009688</color>
+    <color name="pale_green">#99CC99</color>
 
 </resources>