Browse Source

Adopt download/local badge colors from J2K

arkon 4 years ago
parent
commit
381ba86e3c

+ 7 - 7
app/src/main/res/layout/source_comfortable_grid_item.xml

@@ -41,37 +41,37 @@
                     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/unread_text"
+                    android:id="@+id/download_text"
                     style="@style/TextAppearance.Regular.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/colorAccentDark"
+                    android:background="@color/pale_green"
                     android:paddingStart="3dp"
                     android:paddingTop="1dp"
                     android:paddingEnd="3dp"
                     android:paddingBottom="1dp"
-                    android:textColor="@color/md_white_1000"
+                    android:textColor="@color/md_black_1000"
                     android:visibility="gone"
                     tools:text="120"
                     tools:visibility="visible" />
 
                 <TextView
-                    android:id="@+id/download_text"
+                    android:id="@+id/unread_text"
                     style="@style/TextAppearance.Regular.Caption"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:background="@color/md_red_500"
+                    android:background="@color/colorAccentDark"
                     android:paddingStart="3dp"
                     android:paddingTop="1dp"
                     android:paddingEnd="3dp"

+ 7 - 7
app/src/main/res/layout/source_compact_grid_item.xml

@@ -41,37 +41,37 @@
                 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/unread_text"
+                android:id="@+id/download_text"
                 style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/colorAccentDark"
+                android:background="@color/pale_green"
                 android:paddingStart="3dp"
                 android:paddingTop="1dp"
                 android:paddingEnd="3dp"
                 android:paddingBottom="1dp"
-                android:textColor="@color/md_white_1000"
+                android:textColor="@color/md_black_1000"
                 android:visibility="gone"
                 tools:text="120"
                 tools:visibility="visible" />
 
             <TextView
-                android:id="@+id/download_text"
+                android:id="@+id/unread_text"
                 style="@style/TextAppearance.Regular.Caption"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:background="@color/md_red_500"
+                android:background="@color/colorAccentDark"
                 android:paddingStart="3dp"
                 android:paddingTop="1dp"
                 android:paddingEnd="3dp"

+ 9 - 9
app/src/main/res/layout/source_list_item.xml

@@ -52,39 +52,39 @@
             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/unread_text"
+            android:id="@+id/download_text"
             style="@style/TextAppearance.Regular.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/colorAccentLight"
+            android:background="@color/pale_green"
             android:maxLines="1"
             android:paddingStart="3dp"
             android:paddingTop="1dp"
             android:paddingEnd="3dp"
             android:paddingBottom="1dp"
-            android:textColor="@color/md_white_1000"
+            android:textColor="@color/md_black_1000"
             android:visibility="gone"
-            tools:text="130"
+            tools:text="122"
             tools:visibility="visible" />
 
         <TextView
-            android:id="@+id/download_text"
+            android:id="@+id/unread_text"
             style="@style/TextAppearance.Regular.Caption"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@color/md_red_500"
+            android:background="@color/colorAccentLight"
             android:maxLines="1"
             android:paddingStart="3dp"
             android:paddingTop="1dp"
@@ -92,7 +92,7 @@
             android:paddingBottom="1dp"
             android:textColor="@color/md_white_1000"
             android:visibility="gone"
-            tools:text="122"
+            tools:text="130"
             tools:visibility="visible" />
 
     </LinearLayout>

+ 1 - 3
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>