Skip to content

Y
YGOMobile
Commit b76918b5 authored by fallenstardust's avatar fallenstardust
Browse files
Options

优化布局

parent 16e97eda
Show whitespace changes
Inline Side-by-side
Showing with 89 additions and 83 deletions
mobile/src/main/java/cn/garymb/ygomobile/YGOStarter.java
View file @ b76918b5
...@@ -12,6 +12,7 @@ import android.graphics.drawable.Drawable; ...@@ -12,6 +12,7 @@ import android.graphics.drawable.Drawable;
import android.os.Build; import android.os.Build;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.Gravity;
import android.view.View; import android.view.View;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.ImageView; import android.widget.ImageView;
...@@ -105,6 +106,9 @@ public class YGOStarter { ...@@ -105,6 +106,9 @@ public class YGOStarter {
level.setTextColor(context.getResources().getColor(R.color.star)); level.setTextColor(context.getResources().getColor(R.color.star));
} }
cardAtk.setText((cardInfo.Attack < 0 ? "?" : String.valueOf(cardInfo.Attack))); cardAtk.setText((cardInfo.Attack < 0 ? "?" : String.valueOf(cardInfo.Attack)));
if (cardInfo.isType(CardType.Pendulum)) {
desc.setTextSize(10);
}
//连接怪兽设置 //连接怪兽设置
if (cardInfo.isType(CardType.Link)) { if (cardInfo.isType(CardType.Link)) {
level.setVisibility(View.GONE); level.setVisibility(View.GONE);
...@@ -125,7 +129,8 @@ public class YGOStarter { ...@@ -125,7 +129,8 @@ public class YGOStarter {
} }
Toast toast = new Toast(context); Toast toast = new Toast(context);
toast.setView(viewCardDetail); toast.setView(viewCardDetail);
toast.setDuration(Toast.LENGTH_LONG); toast.setDuration(Toast.LENGTH_SHORT);
toast.setGravity(Gravity.LEFT, 50, 0);
toast.show(); toast.show();
} }
......
mobile/src/main/res/layout/dialog_cardinfo_small.xml
View file @ b76918b5
...@@ -10,6 +10,11 @@ ...@@ -10,6 +10,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:layout_width="140dp" android:layout_width="140dp"
android:layout_height="203dp"> android:layout_height="203dp">
...@@ -25,6 +30,70 @@ ...@@ -25,6 +30,70 @@
tools:src="@drawable/unknown" /> tools:src="@drawable/unknown" />
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:id="@+id/layout_atkdef2_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/layout_atk_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:text="ATK/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/holo_green_light" />
<TextView
android:id="@+id/card_atk_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:maxLines="1"
android:minWidth="@dimen/label_width_small_32dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
tools:text="2500" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_def_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/TextDef_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:text="DEF/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/holo_green_light" />
<TextView
android:id="@+id/card_def_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:maxLines="1"
android:minWidth="@dimen/label_width_small_32dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
tools:text="2500" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -141,74 +210,6 @@ ...@@ -141,74 +210,6 @@
android:textColor="@color/holo_blue_bright" android:textColor="@color/holo_blue_bright"
android:textSize="15sp" android:textSize="15sp"
tools:text="[A/XYZ]" /> tools:text="[A/XYZ]" />
<LinearLayout
android:id="@+id/layout_atkdef2_toast"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:gravity="right"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/layout_atk_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:text="ATK/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/holo_green_light" />
<TextView
android:id="@+id/card_atk_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:maxLines="1"
android:minWidth="@dimen/label_width_small_32dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
tools:text="2500" />
<View
android:layout_width="5dp"
android:layout_height="1dp" />
</LinearLayout>
<LinearLayout
android:id="@+id/layout_def_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<TextView
android:id="@+id/TextDef_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:text="DEF/"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@android:color/holo_green_light" />
<TextView
android:id="@+id/card_def_toast"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="right"
android:maxLines="1"
android:minWidth="@dimen/label_width_small_32dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/holo_blue_bright"
tools:text="2500" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
...@@ -220,7 +221,7 @@ ...@@ -220,7 +221,7 @@
android:paddingBottom="5dp" android:paddingBottom="5dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white" android:textColor="@color/white"
android:textIsSelectable="true" android:textSize="12sp"
tools:text="desc" /> tools:text="desc" />
</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