添加关联卡片按钮

调整布局和文字适应4个按钮

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java

@@ -74,7 +74,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
     private final CardLoader cardLoader;
     private final ImageView cardImage;
     private final TextView name;
-    private final TextView relatable;
+    private final TextView btn_related;
     private final TextView desc;
     private final TextView level;
     private final TextView type;
@@ -160,7 +160,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
         packName = findViewById(R.id.pack_name);
         toggleAnimation(packName);
         name = findViewById(R.id.text_name);
-        relatable = findViewById(R.id.relatable);
+        btn_related = findViewById(R.id.btn_related);
         desc = findViewById(R.id.text_desc);
         close = findViewById(R.id.btn_close);
         cardCode = findViewById(R.id.card_code);
@@ -218,7 +218,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
                 mListener.onOpenUrl(cardInfo);
             }
         });
-        name.setOnClickListener((v) -> {
+        btn_related.setOnClickListener((v) -> {
             if (mListener != null) {
                 Card cardInfo = getCardInfo();
                 if (cardInfo == null) {
@@ -499,7 +499,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
         packName.setText(packManager.findPackNameById((cardInfo.Alias != 0 && Math.abs(cardInfo.Alias - cardInfo.Code) <= 20) ? cardInfo.Alias : cardInfo.Code));
         name.setText(cardInfo.Name);
         setHighlightTextWithClickableSpans(cardInfo.Name.equals("Unknown") ? context.getString(R.string.tip_card_info_diff) : cardInfo.Desc);
-        relatable.setVisibility(relatable(mCardInfo) ? View.VISIBLE : View.GONE);
+        btn_related.setVisibility(relatable(cardInfo) ? View.VISIBLE : View.GONE);
         cardCode.setText(String.format("%08d", cardInfo.getCode()));
         if (cardInfo.isType(CardType.Token)) {
             faq.setVisibility(View.INVISIBLE);

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

@@ -30,15 +30,15 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/title_height_small"
+            android:layout_height="wrap_content"
             android:orientation="horizontal">
 
             <TextView
                 android:id="@+id/btn_faq"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginLeft="5dp"
-                android:background="@drawable/addto"
+                android:background="@drawable/button2_bg"
                 android:gravity="center"
                 android:paddingLeft="16dp"
                 android:paddingRight="16dp"
@@ -46,20 +46,37 @@
                 android:text="@string/card_faq"
                 android:textAppearance="@style/TextAppearance.AppCompat.Medium"
                 android:textColor="@color/colorAccentDark"
-                android:textSize="14sp"
+                android:textSize="10sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/btn_related"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="5dp"
+                android:background="@drawable/button2_bg"
+                android:gravity="center"
+                android:paddingLeft="16dp"
+                android:paddingRight="16dp"
+                android:shadowColor="@color/black"
+                android:text="@string/card_related"
+                android:textAppearance="@style/TextAppearance.AppCompat.Medium"
+                android:textColor="@color/holo_orange_bright"
+                android:textSize="10sp"
                 android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/btn_add_main"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginLeft="4dp"
-                android:background="@drawable/addto"
+                android:background="@drawable/button2_bg"
                 android:gravity="center"
                 android:text="@string/card_add_main"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="@color/item_title"
-                android:textSize="14sp"
+                android:textSize="10sp"
                 android:textStyle="bold"
                 android:visibility="invisible"
                 tools:visibility="visible" />
@@ -67,14 +84,14 @@
             <TextView
                 android:id="@+id/btn_add_side"
                 android:layout_width="wrap_content"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginLeft="4dp"
-                android:background="@drawable/addto"
+                android:background="@drawable/button2_bg"
                 android:gravity="center"
                 android:text="@string/card_add_side"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="@color/item_title"
-                android:textSize="14sp"
+                android:textSize="10sp"
                 android:textStyle="bold"
                 android:visibility="invisible"
                 tools:visibility="visible" />
@@ -86,45 +103,33 @@
 
             <ImageButton
                 android:id="@+id/btn_close"
-                android:layout_width="@dimen/button_width_small"
-                android:layout_height="@dimen/button_width_small"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="@android:color/transparent"
                 app:srcCompat="@drawable/ic_close_black_24dp" />
         </LinearLayout>
 
-        <LinearLayout
-            android:id="@+id/ll_name"
-            android:layout_width="match_parent"
+        <cn.garymb.ygomobile.ui.widget.AlwaysMarqueeTextView
+            android:id="@+id/text_name"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
-
-            <cn.garymb.ygomobile.ui.widget.AlwaysMarqueeTextView
-                android:id="@+id/text_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="5dp"
-                android:gravity="center_vertical"
-                android:maxLines="1"
-                android:minHeight="@dimen/label_height"
-                android:paddingLeft="4dp"
-                android:shadowColor="@color/black"
-                android:shadowDx="1"
-                android:shadowDy="2"
-                android:shadowRadius="2"
-                android:singleLine="true"
-                android:textAppearance="@style/TextAppearance.AppCompat.Title"
-                android:textColor="@color/item_title"
-                android:textIsSelectable="true"
-                tools:text="name" />
-
-            <TextView
-                android:id="@+id/relatable"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="☆"
-                android:visibility="gone" />
-
-        </LinearLayout>
+            android:layout_marginTop="5dp"
+            android:gravity="center_vertical"
+            android:maxLines="1"
+            android:minHeight="@dimen/label_height"
+            android:paddingLeft="4dp"
+            android:shadowColor="@color/black"
+            android:shadowDx="1"
+            android:shadowDy="2"
+            android:shadowRadius="2"
+            android:singleLine="true"
+            android:textAppearance="@style/TextAppearance.AppCompat.Title"
+            android:textColor="@color/item_title"
+            android:textIsSelectable="true"
+            tools:text="name" />
 
         <LinearLayout
             android:layout_width="match_parent"

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

@@ -142,6 +142,7 @@
     <string name="label_category">Categoría</string>
     <string name="searching">Buscar</string>
     <string name="card_faq">FAQ</string>
+    <string name="card_related">Relacionadas</string>
     <string name="no_webbrowser">Ningún navegador web instalado</string>
     <string name="load_game">Cargando juego</string>
     <string name="new_deck">Nuevo</string>

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

@@ -133,7 +133,8 @@
     <string name="label_category">効果分類</string>
     <string name="linkmarker">◀リンクマーカー▶</string>>
     <string name="searching">ロード中</string>
-    <string name="card_faq">オンラインで判定をチェック</string>
+    <string name="card_faq">Q&amp;A</string>
+    <string name="card_related">関連カード</string>
     <string name="no_webbrowser">ブラウザはインストールしていません</string>
     <string name="load_game">ゲーム起動中</string>
 

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

@@ -133,6 +133,7 @@
     <string name="linkmarker">◀링크 마커▶</string>>
     <string name="searching">검색 중</string>
     <string name="card_faq">FAQ</string>
+    <string name="card_related">관련 카드</string>
     <string name="no_webbrowser">웹 브라우저가 설치되지 않았습니다</string>
     <string name="load_game">게임 시작 중</string>
 

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

@@ -134,6 +134,7 @@
     <string name="linkmarker">◀连接标记▶</string>>
     <string name="searching">读取中</string>
     <string name="card_faq">裁定查询</string>
+    <string name="card_related">关联卡片</string>
     <string name="no_webbrowser">没有安装浏览器</string>
     <string name="load_game">启动游戏中</string>
 

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

@@ -376,4 +376,5 @@
     <string name="tip_download_failed">Save Failed!</string>
     <string name="tip_download_OK">Saved to</string>
     <string name="replay_list">Replay List</string>
+    <string name="card_related">Related</string>
 </resources>