修复专栏卡片背景颜色错误

luern0313 · Jul 7, 2021 · 0fe610b · 0fe610b
1 parent 0129524
commit 0fe610b
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 19 deletions.
diff --git a/app/src/main/res/layout/item_article_card_article.xml b/app/src/main/res/layout/item_article_card_article.xml
@@ -13,8 +13,7 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-
-        app:cardBackgroundColor="?attr/colorBackgroundColor"
+        app:cardBackgroundColor="?attr/colorCardViewBackground"
         app:cardCornerRadius="6dp"
         app:cardElevation="0dp">
 
@@ -108,10 +107,10 @@
                         android:layout_height="wrap_content"
                         android:background="@drawable/shape_bg_article_card_identity"
                         android:paddingStart="4dp"
-                        android:paddingEnd="4dp"
                         android:paddingTop="1dp"
+                        android:paddingEnd="4dp"
                         android:paddingBottom="1dp"
-                        android:text="专栏"
+                        android:text="@string/article_card_article_name"
                         android:textColor="?attr/colorAccent"
                         android:textSize="10sp" />
 

diff --git a/app/src/main/res/layout/item_article_card_bangumi.xml b/app/src/main/res/layout/item_article_card_bangumi.xml
@@ -13,7 +13,7 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="74dp"
-        app:cardBackgroundColor="?attr/colorBackgroundColor"
+        app:cardBackgroundColor="?attr/colorCardViewBackground"
         app:cardCornerRadius="6dp"
         app:cardElevation="0dp">
 
@@ -103,7 +103,7 @@
                     android:paddingTop="1dp"
                     android:paddingEnd="4dp"
                     android:paddingBottom="1dp"
-                    android:text="番剧"
+                    android:text="@string/article_card_bangumi_name"
                     android:textColor="?attr/colorAccent"
                     android:textSize="10sp" />
 

diff --git a/app/src/main/res/layout/item_article_card_container.xml b/app/src/main/res/layout/item_article_card_container.xml
@@ -13,7 +13,7 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="96dp"
-        app:cardBackgroundColor="?attr/colorBackgroundColor"
+        app:cardBackgroundColor="?attr/colorCardViewBackground"
         app:cardCornerRadius="6dp"
         app:cardElevation="0dp">
 
@@ -82,10 +82,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/shape_bg_article_card_identity"
                             android:paddingStart="4dp"
-                            android:paddingEnd="4dp"
                             android:paddingTop="1dp"
+                            android:paddingEnd="4dp"
                             android:paddingBottom="1dp"
-                            android:text="漫画"
+                            android:text="@string/article_card_container_name"
                             android:textColor="?attr/colorAccent"
                             android:textSize="10sp" />
 

diff --git a/app/src/main/res/layout/item_article_card_live.xml b/app/src/main/res/layout/item_article_card_live.xml
@@ -13,7 +13,7 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:cardBackgroundColor="?attr/colorBackgroundColor"
+        app:cardBackgroundColor="?attr/colorCardViewBackground"
         app:cardCornerRadius="6dp"
         app:cardElevation="0dp">
 
@@ -127,10 +127,10 @@
                         android:layout_height="wrap_content"
                         android:background="@drawable/shape_bg_article_card_identity"
                         android:paddingStart="4dp"
-                        android:paddingEnd="4dp"
                         android:paddingTop="1dp"
+                        android:paddingEnd="4dp"
                         android:paddingBottom="1dp"
-                        android:text="直播"
+                        android:text="@string/article_card_live_name"
                         android:textColor="?attr/colorAccent"
                         android:textSize="10sp" />
 

diff --git a/app/src/main/res/layout/item_article_card_music.xml b/app/src/main/res/layout/item_article_card_music.xml
@@ -13,7 +13,7 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="58dp"
-        app:cardBackgroundColor="?attr/colorBackgroundColor"
+        app:cardBackgroundColor="?attr/colorCardViewBackground"
         app:cardCornerRadius="6dp"
         app:cardElevation="0dp">
 
@@ -96,10 +96,10 @@
                             android:layout_height="wrap_content"
                             android:background="@drawable/shape_bg_article_card_identity"
                             android:paddingStart="4dp"
-                            android:paddingEnd="4dp"
                             android:paddingTop="1dp"
+                            android:paddingEnd="4dp"
                             android:paddingBottom="1dp"
-                            android:text="音乐"
+                            android:text="@string/article_card_music_name"
                             android:textColor="?attr/colorAccent"
                             android:textSize="10sp" />
 

diff --git a/app/src/main/res/layout/item_article_card_shop.xml b/app/src/main/res/layout/item_article_card_shop.xml
@@ -13,7 +13,7 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="96dp"
-        app:cardBackgroundColor="?attr/colorBackgroundColor"
+        app:cardBackgroundColor="?attr/colorCardViewBackground"
         app:cardCornerRadius="6dp"
         app:cardElevation="0dp">
 
@@ -85,7 +85,7 @@
                             android:paddingTop="1dp"
                             android:paddingEnd="4dp"
                             android:paddingBottom="1dp"
-                            android:text="商品"
+                            android:text="@string/article_card_shop_name"
                             android:textColor="?attr/colorAccent"
                             android:textSize="10sp" />
 

diff --git a/app/src/main/res/layout/item_article_card_ticket.xml b/app/src/main/res/layout/item_article_card_ticket.xml
@@ -13,7 +13,7 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="96dp"
-        app:cardBackgroundColor="?attr/colorBackgroundColor"
+        app:cardBackgroundColor="?attr/colorCardViewBackground"
         app:cardCornerRadius="6dp"
         app:cardElevation="0dp">
 
@@ -94,7 +94,7 @@
                             android:paddingTop="1dp"
                             android:paddingEnd="4dp"
                             android:paddingBottom="1dp"
-                            android:text="票务"
+                            android:text="@string/article_card_ticket_name"
                             android:textColor="?attr/colorAccent"
                             android:textSize="10sp" />