更改卡牌列表布局

fix 显示LINK-后未恢复显示DEF/

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

@@ -128,6 +128,7 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
                 holder.TextDef.setText("");
             } else {
                 holder.cardDef.setText((item.Defense < 0 ? "?" : String.valueOf(item.Defense)));
+                holder.TextDef.setText("DEF/");
 /*            }
                 if(item.isType(CardType.Link)) {
                     holder.TextDef.setText(" ");

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

@@ -36,7 +36,6 @@
             android:text="@string/card_add_side"
             android:textAppearance="@style/TextAppearance.AppCompat.Body1"
             android:textColor="@color/white" />
-
     </LinearLayout>
 
     <LinearLayout
@@ -90,6 +89,10 @@
                 android:textSize="18sp"
                 tools:text="Card Name" />
 
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent">
+
                 <TextView
                     android:id="@+id/card_level"
                     android:layout_width="match_parent"
@@ -102,11 +105,18 @@
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                     android:textColor="@color/star"
-                tools:text="★★★★" />
+                    tools:text="★4" />
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/card_type"
-                android:layout_width="match_parent"
+                    android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:maxLines="1"
                     android:singleLine="true"
@@ -116,41 +126,35 @@
                     tools:text="[A/XYZ]" />
 
                 <View
-                android:id="@+id/view_bar"
-                android:layout_width="match_parent"
+                    android:layout_width="0dp"
                     android:layout_height="1dp"
-                android:layout_marginTop="3dp"
-                android:background="@color/gray" />
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="3dp"
-                android:orientation="horizontal">
+                    android:layout_weight="1" />
 
                 <TextView
                     android:id="@+id/card_code"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
+                    android:layout_gravity="right"
                     android:gravity="center_vertical"
                     android:maxLines="1"
                     android:singleLine="true"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                     android:textColor="@color/holo_blue_bright"
                     tools:text="123456789" />
-
-                <TextView
-                    android:layout_width="1px"
-                    android:layout_height="wrap_content"
-                    android:text="A"
-                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-                    android:textColor="@color/colorPrimary"
-                    android:visibility="invisible" />
+            </LinearLayout>
 
             <View
-                    android:layout_width="0dp"
+                android:id="@+id/view_bar"
+                android:layout_width="match_parent"
                 android:layout_height="1dp"
-                    android:layout_weight="1" />
+                android:layout_marginTop="3dp"
+                android:background="@color/gray" />
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="3dp"
+                android:orientation="horizontal">
 
                 <LinearLayout
                     android:id="@+id/layout_atk"
@@ -181,8 +185,6 @@
                     <View
                         android:layout_width="5dp"
                         android:layout_height="1dp" />
-
-
                 </LinearLayout>
 
                 <LinearLayout
@@ -212,6 +214,14 @@
                         android:textColor="@color/holo_blue_bright"
                         tools:text="2500" />
                 </LinearLayout>
+
+                <TextView
+                    android:layout_width="1px"
+                    android:layout_height="wrap_content"
+                    android:text="A"
+                    android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+                    android:textColor="@color/colorPrimary"
+                    android:visibility="invisible" />
             </LinearLayout>
         </LinearLayout>
     </LinearLayout>