color % string

mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/TextSelectAdapter.java

 package cn.garymb.ygomobile.ui.adapters;
 
+import android.annotation.SuppressLint;
+import android.graphics.Color;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
@@ -42,6 +44,7 @@ public class TextSelectAdapter<T extends TextSelect> extends BaseQuickAdapter<T,
         });
     }
 
+    @SuppressLint("ResourceType")
     @Override
     protected void convert(BaseViewHolder helper, T item) {
         int position = helper.getAdapterPosition();
@@ -49,17 +52,17 @@ public class TextSelectAdapter<T extends TextSelect> extends BaseQuickAdapter<T,
         helper.setText(R.id.tv_name, item.getName());
         if (isManySelect) {
             if (selectList.contains(item))
-                helper.setBackgroundColor(R.id.ll_layout, YGOUtil.c(R.color.gray));
+                helper.setBackgroundColor(R.id.ll_layout, YGOUtil.c(R.color.colorMain));
             else
-                helper.setBackgroundRes(R.id.ll_layout, R.drawable.click_background);
+                helper.setBackgroundRes(R.id.ll_layout, Color.TRANSPARENT);
         } else if (isSelect) {
             if (position == selectPosition) {
-                helper.setBackgroundColor(R.id.ll_layout, YGOUtil.c(R.color.gray));
+                helper.setBackgroundColor(R.id.ll_layout, YGOUtil.c(R.color.colorMain));
             } else {
-                helper.setBackgroundRes(R.id.ll_layout, R.drawable.click_background);
+                helper.setBackgroundRes(R.id.ll_layout, Color.TRANSPARENT);
             }
         }else {
-            helper.setBackgroundRes(R.id.ll_layout, R.drawable.click_background);
+            helper.setBackgroundRes(R.id.ll_layout, Color.TRANSPARENT);
         }
 
     }

mobile/src/main/java/cn/garymb/ygomobile/utils/YGODialogUtil.java

@@ -371,9 +371,9 @@ public class YGODialogUtil {
         ImageUtil.reImageColor(IMAGE_MOVE, iv_move);
         ImageUtil.reImageColor(IMAGE_DEL, iv_del);
         ImageUtil.reImageColor(IMAGE_COPY, iv_copy);
-        tv_del.setTextColor(YGOUtil.c(R.color.black));
-        tv_copy.setTextColor(YGOUtil.c(R.color.black));
-        tv_move.setTextColor(YGOUtil.c(R.color.black));
+        tv_del.setTextColor(YGOUtil.c(R.color.holo_blue_bright));
+        tv_copy.setTextColor(YGOUtil.c(R.color.holo_blue_bright));
+        tv_move.setTextColor(YGOUtil.c(R.color.holo_blue_bright));
         ll_del.setEnabled(true);
         ll_copy.setEnabled(true);
         ll_move.setEnabled(true);
@@ -383,9 +383,9 @@ public class YGODialogUtil {
         ImageUtil.setGrayImage(IMAGE_MOVE, iv_move);
         ImageUtil.setGrayImage(IMAGE_DEL, iv_del);
         ImageUtil.setGrayImage(IMAGE_COPY, iv_copy);
-        tv_del.setTextColor(YGOUtil.c(R.color.gray));
-        tv_copy.setTextColor(YGOUtil.c(R.color.gray));
-        tv_move.setTextColor(YGOUtil.c(R.color.gray));
+        tv_del.setTextColor(YGOUtil.c(R.color.star_rank));
+        tv_copy.setTextColor(YGOUtil.c(R.color.star_rank));
+        tv_move.setTextColor(YGOUtil.c(R.color.star_rank));
         ll_del.setEnabled(false);
         ll_copy.setEnabled(false);
         ll_move.setEnabled(false);
@@ -395,9 +395,9 @@ public class YGODialogUtil {
         ImageUtil.setGrayImage(IMAGE_MOVE, iv_move);
         ImageUtil.setGrayImage(IMAGE_DEL, iv_del);
         ImageUtil.reImageColor(IMAGE_COPY, iv_copy);
-        tv_del.setTextColor(YGOUtil.c(R.color.gray));
-        tv_copy.setTextColor(YGOUtil.c(R.color.black));
-        tv_move.setTextColor(YGOUtil.c(R.color.gray));
+        tv_del.setTextColor(YGOUtil.c(R.color.star_rank));
+        tv_copy.setTextColor(YGOUtil.c(R.color.holo_blue_bright));
+        tv_move.setTextColor(YGOUtil.c(R.color.star_rank));
         ll_del.setEnabled(false);
         ll_copy.setEnabled(true);
         ll_move.setEnabled(false);

mobile/src/main/res/layout/dialog_deck_select.xml

@@ -3,6 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@drawable/blue"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -11,8 +12,8 @@
         android:layout_gravity="center_horizontal"
         android:gravity="center"
         android:padding="10dp"
-        android:text="卡组管理"
-        android:textColor="@color/black"
+        android:text="@string/category_manager"
+        android:textColor="@color/holo_blue_bright"
         android:textSize="15sp"
         android:textStyle="bold" />
 
@@ -28,7 +29,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/click_background"
+            android:background="@android:color/transparent"
             android:gravity="center"
             android:orientation="vertical">
 
@@ -43,8 +44,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
-                android:text="新建"
-                android:textColor="@color/black"
+                android:text="@string/new_deck"
+                android:textColor="@color/holo_blue_bright"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -53,7 +54,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/click_background"
+            android:background="@android:color/transparent"
             android:gravity="center"
             android:orientation="vertical">
 
@@ -68,8 +69,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
-                android:text="移动"
-                android:textColor="@color/black"
+                android:text="@string/move_deck"
+                android:textColor="@color/holo_blue_bright"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -78,7 +79,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/click_background"
+            android:background="@android:color/transparent"
             android:gravity="center"
             android:orientation="vertical">
 
@@ -93,8 +94,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
-                android:text="复制"
-                android:textColor="@color/black"
+                android:text="@string/copy_deck"
+                android:textColor="@color/holo_blue_bright"
                 android:textSize="12sp" />
         </LinearLayout>
 
@@ -103,7 +104,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:background="@drawable/click_background"
+            android:background="@android:color/transparent"
             android:gravity="center"
             android:orientation="vertical">
 
@@ -118,8 +119,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="3dp"
-                android:text="删除"
-                android:textColor="@color/black"
+                android:text="@string/delete_deck"
+                android:textColor="@color/holo_blue_bright"
                 android:textSize="12sp" />
         </LinearLayout>
     </LinearLayout>
@@ -139,7 +140,7 @@
         <View
             android:layout_width="1dp"
             android:layout_height="match_parent"
-            android:background="@color/gray" />
+            android:background="@color/holo_blue_light" />
 
         <LinearLayout
             android:layout_width="0dp"
@@ -153,6 +154,5 @@
                 android:layout_height="match_parent"
                 android:nestedScrollingEnabled="true" />
         </LinearLayout>
-
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file

mobile/src/main/res/layout/text_select_item.xml

@@ -5,12 +5,12 @@
     android:layout_height="wrap_content"
     android:padding="10dp"
     android:gravity="center"
-    android:background="@drawable/click_background"
+    android:background="@android:color/transparent"
     android:orientation="vertical">
 
     <androidx.appcompat.widget.AppCompatTextView
         android:gravity="center"
-        android:textColor="@color/black"
+        android:textColor="@color/white"
         android:id="@+id/tv_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />

mobile/src/main/res/values-zh/strings.xml

@@ -87,6 +87,7 @@
     <string name="server_info_error">服务器信息填写错误</string>
     <string name="card_search">卡片搜索</string>
     <string name="deck_manager">卡组编辑</string>
+    <string name="category_manager">卡组分类选择</string>
     <string name="search">搜索</string>
     <string name="search_open">过滤</string>
     <string name="search_close">关闭</string>
@@ -126,6 +127,8 @@
     <string name="card_add_main">+主卡组</string>
     <string name="card_add_side">+副卡组</string>
     <string name="new_deck">新建</string>
+    <string name="move_deck">移动</string>
+    <string name="copy_deck">复制</string>
     <string name="rename_deck">重命名</string>
     <string name="delete_deck">删除</string>
     <string name="save_deck">保存</string>

mobile/src/main/res/values/strings.xml

@@ -98,6 +98,7 @@
     <string name="server_info_error">server info is bad.</string>
     <string name="card_search">Card Search</string>
     <string name="deck_manager">Deck Manager</string>
+    <string name="category_manager"> Categorized Deck Select</string>
     <string name="search">Search</string>
     <string name="search_open">Select</string>
     <string name="search_close">Close</string>
@@ -121,6 +122,8 @@
     <string name="no_webbrowser">No web browser</string>
     <string name="load_game">loading game</string>
     <string name="new_deck">New</string>
+    <string name="move_deck">move Deck</string>
+    <string name="copy_deck">copy Deck</string>
     <string name="rename_deck">Rename</string>
     <string name="delete_deck">Delete</string>
     <string name="save_deck">Save Deck</string>