Skip to content

Y
YGOMobile-Cn-Ko-En
Commit c24cbdd1 authored by fallenstardust's avatar fallenstardust
Browse files
Options

更改卡牌列表布局 

fix 显示LINK-后未恢复显示DEF/
parent 970b2b26
Hide whitespace changes
Inline Side-by-side
Showing with 54 additions and 43 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/adapters/CardListAdapter.java
View file @ c24cbdd1
...@@ -128,6 +128,7 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i ...@@ -128,6 +128,7 @@ public class CardListAdapter extends BaseRecyclerAdapterPlus<Card, ViewHolder> i
holder.TextDef.setText(""); holder.TextDef.setText("");
} else { } else {
holder.cardDef.setText((item.Defense < 0 ? "?" : String.valueOf(item.Defense))); holder.cardDef.setText((item.Defense < 0 ? "?" : String.valueOf(item.Defense)));
holder.TextDef.setText("DEF/");
/* } /* }
if(item.isType(CardType.Link)) { if(item.isType(CardType.Link)) {
holder.TextDef.setText(" "); holder.TextDef.setText(" ");
......
mobile/src/main/res/layout/item_search_card_swipe.xml
View file @ c24cbdd1
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
android:text="@string/card_add_side" android:text="@string/card_add_side"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white" /> android:textColor="@color/white" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -90,37 +89,24 @@ ...@@ -90,37 +89,24 @@
android:textSize="18sp" android:textSize="18sp"
tools:text="Card Name" /> tools:text="Card Name" />
<TextView <LinearLayout
android:id="@+id/card_level"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:shadowColor="@color/black"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="2"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/star"
tools:text="★★★★" />
<TextView
android:id="@+id/card_type"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
android:textSize="15sp"
tools:text="[A/XYZ]" />
<View <TextView
android:id="@+id/view_bar" android:id="@+id/card_level"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_marginTop="3dp" android:maxLines="1"
android:background="@color/gray" /> android:shadowColor="@color/black"
android:shadowDx="1"
android:shadowDy="1"
android:shadowRadius="2"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/star"
tools:text="★4" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -128,29 +114,47 @@ ...@@ -128,29 +114,47 @@
android:layout_marginTop="3dp" android:layout_marginTop="3dp"
android:orientation="horizontal"> android:orientation="horizontal">
<TextView
android:id="@+id/card_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
android:textSize="15sp"
tools:text="[A/XYZ]" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
<TextView <TextView
android:id="@+id/card_code" android:id="@+id/card_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="right"
android:gravity="center_vertical" android:gravity="center_vertical"
android:maxLines="1" android:maxLines="1"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" android:textAppearance="@style/TextAppearance.AppCompat.Caption"
android:textColor="@color/holo_blue_bright" android:textColor="@color/holo_blue_bright"
tools:text="123456789" /> tools:text="123456789" />
</LinearLayout>
<TextView <View
android:layout_width="1px" android:id="@+id/view_bar"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:text="A" android:layout_height="1dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:layout_marginTop="3dp"
android:textColor="@color/colorPrimary" android:background="@color/gray" />
android:visibility="invisible" />
<View <LinearLayout
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="1dp" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_marginTop="3dp"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:id="@+id/layout_atk" android:id="@+id/layout_atk"
...@@ -181,8 +185,6 @@ ...@@ -181,8 +185,6 @@
<View <View
android:layout_width="5dp" android:layout_width="5dp"
android:layout_height="1dp" /> android:layout_height="1dp" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -212,6 +214,14 @@ ...@@ -212,6 +214,14 @@
android:textColor="@color/holo_blue_bright" android:textColor="@color/holo_blue_bright"
tools:text="2500" /> tools:text="2500" />
</LinearLayout> </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> </LinearLayout>
</LinearLayout> </LinearLayout>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment