Skip to content

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

调整布局

parent dc147398
Show whitespace changes
Inline Side-by-side
Showing with 118 additions and 61 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java
View file @ fcee02f6
...@@ -76,7 +76,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -76,7 +76,7 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
private final CardLoader cardLoader; private final CardLoader cardLoader;
private final ImageView cardImage; private final ImageView cardImage;
private final TextView name; private final TextView name;
private final ImageButton btn_related; private final LinearLayout btn_related;
private final TextView desc; private final TextView desc;
private final TextView level; private final TextView level;
private final TextView type; private final TextView type;
...@@ -90,9 +90,9 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder { ...@@ -90,9 +90,9 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
private final TextView attrView; private final TextView attrView;
private final View monsterLayout; private final View monsterLayout;
private final ImageButton close; private final ImageButton close;
private final ImageButton faq; private final LinearLayout faq;
private final ImageButton addMain; private final LinearLayout addMain;
private final ImageButton addSide; private final LinearLayout addSide;
private final View linkArrow; private final View linkArrow;
private final View layoutDetailPScale; private final View layoutDetailPScale;
private final TextView detailCardScale; private final TextView detailCardScale;
......
mobile/src/main/res/layout/dialog_cardinfo.xml
View file @ fcee02f6
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -31,56 +30,110 @@ ...@@ -31,56 +30,110 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:weightSum="5" android:orientation="horizontal"
android:orientation="horizontal"> android:weightSum="5">
<ImageButton <LinearLayout
android:id="@+id/btn_faq" android:id="@+id/btn_faq"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/button2_bg" android:background="@drawable/list_item_bg"
android:tooltipText="@string/card_faq" android:orientation="vertical">
android:gravity="center"
android:src="@drawable/ic_q_n_a"/>
<ImageButton <ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_q_n_a" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/card_faq"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_related" android:id="@+id/btn_related"
android:visibility="visible"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:background="@drawable/button2_bg" android:layout_weight="1"
android:gravity="center" android:background="@drawable/list_item_bg"
android:tooltipText="@string/card_related" android:orientation="vertical">
android:src="@drawable/ic_related"/>
<ImageButton <ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_related"
android:visibility="visible" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/card_related"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_add_main" android:id="@+id/btn_add_main"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginLeft="5dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/button2_bg" android:background="@drawable/list_item_bg"
android:gravity="center" android:orientation="vertical"
android:tooltipText="@string/card_add_main"
android:src="@drawable/ic_to_main"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible"/> tools:visibility="visible">
<ImageButton <ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_to_main"
android:visibility="visible" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/card_add_main"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
<LinearLayout
android:id="@+id/btn_add_side" android:id="@+id/btn_add_side"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="4dp" android:layout_marginLeft="5dp"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/button2_bg" android:background="@drawable/list_item_bg"
android:gravity="center" android:orientation="vertical"
android:tooltipText="@string/card_add_side"
android:src="@drawable/ic_to_side"
android:visibility="invisible" android:visibility="invisible"
tools:visibility="visible"/> tools:visibility="visible">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/ic_to_side"
android:visibility="visible" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/card_add_side"
android:textColor="@color/white"
android:textSize="8sp" />
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
......
mobile/src/main/res/layout/fragment_deck_cards.xml
View file @ fcee02f6
...@@ -41,28 +41,28 @@ ...@@ -41,28 +41,28 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/deck_name"
android:textStyle="bold"
android:shadowColor="@color/black" android:shadowColor="@color/black"
android:shadowDx="1" android:shadowDx="1"
android:shadowDy="1" android:shadowDy="1"
android:shadowRadius="2" android:shadowRadius="2"
android:textColor="@color/holo_blue_light" /> android:text="@string/deck_name"
android:textColor="@color/holo_blue_light"
android:textStyle="bold" />
<androidx.appcompat.widget.AppCompatTextView <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/tv_deck" android:id="@+id/tv_deck"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:text="@string/select_deck"
android:textColor="@color/white"
android:textSize="18sp"
android:shadowColor="@color/black" android:shadowColor="@color/black"
android:shadowDx="1" android:shadowDx="1"
android:shadowDy="1" android:shadowDy="1"
android:shadowRadius="2" android:shadowRadius="2"
android:text="@string/select_deck"
android:textColor="@color/white"
android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
</LinearLayout> </LinearLayout>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<androidx.appcompat.widget.AppCompatSpinner <androidx.appcompat.widget.AppCompatSpinner
android:id="@+id/toolbar_list" android:id="@+id/toolbar_list"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="@dimen/item_height" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:visibility="gone" /> android:visibility="gone" />
...@@ -85,20 +85,21 @@ ...@@ -85,20 +85,21 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"
android:src="@drawable/listicon" /> android:src="@drawable/listicon" />
<TextView <TextView
android:layout_width="60dp" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="@string/searchresult"
android:textColor="@color/white"
android:textStyle="bold"
android:shadowColor="@color/black" android:shadowColor="@color/black"
android:shadowDx="1" android:shadowDx="1"
android:shadowDy="1" android:shadowDy="1"
android:shadowRadius="2"/> android:shadowRadius="2"
android:text="@string/searchresult"
android:textColor="@color/white"
android:textSize="10sp"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -112,20 +113,21 @@ ...@@ -112,20 +113,21 @@
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"
android:src="@drawable/search" /> android:src="@drawable/search" />
<TextView <TextView
android:layout_width="60dp" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="@string/card_search"
android:textColor="@color/white"
android:textStyle="bold"
android:shadowColor="@color/black" android:shadowColor="@color/black"
android:shadowDx="1" android:shadowDx="1"
android:shadowDy="1" android:shadowDy="1"
android:shadowRadius="2"/> android:shadowRadius="2"
android:text="@string/card_search"
android:textColor="@color/white"
android:textSize="10sp"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -157,16 +159,18 @@ ...@@ -157,16 +159,18 @@
</com.nightonke.boommenu.BoomMenuButton> </com.nightonke.boommenu.BoomMenuButton>
<TextView <TextView
android:layout_width="60dp" android:layout_width="match_parent"
android:layout_height="20dp" android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="bottom|center_horizontal" android:gravity="bottom|center_horizontal"
android:text="@string/Function_Menu"
android:textColor="@color/white"
android:textStyle="bold"
android:shadowColor="@color/black" android:shadowColor="@color/black"
android:shadowDx="1" android:shadowDx="1"
android:shadowDy="1" android:shadowDy="1"
android:shadowRadius="2"/> android:shadowRadius="2"
android:text="@string/Function_Menu"
android:textColor="@color/white"
android:textSize="10sp"
android:textStyle="bold" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</FrameLayout> </FrameLayout>
......
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