Skip to content

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

卡片详情按钮图标

parent 57005175
Show whitespace changes
Inline Side-by-side
Showing with 51 additions and 43 deletions
mobile/src/main/java/cn/garymb/ygomobile/ui/cards/CardDetail.java
View file @ 248ddc60
......@@ -533,8 +533,8 @@ public class CardDetail extends BaseAdapterPlus.BaseViewHolder {
}
if (mShowAdd) {
if (cardInfo.isType(CardType.Token)) {
addSide.setVisibility(View.INVISIBLE);
addMain.setVisibility(View.INVISIBLE);
addSide.setVisibility(View.GONE);
addMain.setVisibility(View.GONE);
} else {
addSide.setVisibility(View.VISIBLE);
addMain.setVisibility(View.VISIBLE);
......
mobile/src/main/res/drawable/ic_q_n_a.xml 0 → 100644
View file @ 248ddc60
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
<path
android:fillColor="@color/red"
android:pathData="M34.83,38.3H22.66l-4,1.3-.43-1.3H12.89V27.48l-1.37.44V39.65H36.2V20.9a9.68,9.68,0,0,1-1.37.51ZM15.63,21v6.46h.89l2.21-.72.19-.06a5.85,5.85,0,0,0,.78-.58H17V20.71A7,7,0,0,0,15.63,21Zm-3.58,3.92.84,2.51V22.66A3.5,3.5,0,0,0,12,24.61ZM12.89,5.7H25.57a10.85,10.85,0,0,1,7.91-.63,11.57,11.57,0,0,1,2.73,1.19V4.35H11.52V17.13a10.32,10.32,0,0,1,1.37-.69ZM17,15.51V11.14h4.28l.4-1.35H15.63v5.86A12.87,12.87,0,0,1,17,15.51ZM31.4,16.58l.19.05h.5V10.09l-.1,0c-2-.59-4-.15-4.95,1l0,.1h3.71v5.24Zm-.13,5.24-.1.35-.45,1.5v2.4H30l-.4,1.36h2.48v-5.6Zm3.56-10v3.83a2.41,2.41,0,0,0,.73-1.13A2.9,2.9,0,0,0,34.83,11.83ZM33.11,6.32A8.68,8.68,0,0,0,24,8.63a5.08,5.08,0,0,0-1,1.54l-.39,1.3,2.63.77.39-1.3s0-.26.37-.72a6.12,6.12,0,0,1,6.37-1.45c3.19.93,5.18,3.68,4.45,6.13a4.49,4.49,0,0,1-3.56,2.93,4.3,4.3,0,0,1-2.26.05l-2.63-.77-1.55,5.21,2.63.77.78-2.6,0-.08c4.12.66,8-1.32,9-4.79C40.44,11.81,37.66,7.64,33.11,6.32ZM10.65,24.52c.17-2,1.88-3.95,4.4-4.78,3.16-1,6.37.1,7.19,2.53A4.44,4.44,0,0,1,21,26.69,4.2,4.2,0,0,1,19.16,28l-2.61.85L18.28,34l2.6-.85L20,30.58l0-.08c3.77-1.77,5.84-5.6,4.7-9-1.26-3.77-5.94-5.64-10.45-4.16-3.54,1.16-5.92,4-6.17,7a5.23,5.23,0,0,0,.08,1.82l.43,1.29,2.6-.85-.43-1.29A1.18,1.18,0,0,1,10.65,24.52Zm8.91,13.36L22.17,37l-.86-2.58-2.61.85Zm6.88-14.25-.77,2.6L28.3,27l.78-2.61Z" />
</vector>
\ No newline at end of file
mobile/src/main/res/drawable/ic_related.xml 0 → 100644
View file @ 248ddc60
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
<path
android:fillColor="@color/holo_orange_bright"
android:pathData="M23.54,39.8l-19-2.53,3.9-28.8,5.92.79A12.89,12.89,0,0,1,15,8l-7.73-1L3,38.44l21.75,2.89,1.6-11.79c-.46-.05-.91-.12-1.36-.21ZM13.17,14q0-.67.15-1.35l-4-.53-2.45,18,16.32,2.16L23.62,29c-.45-.13-.89-.29-1.32-.46L22,30.83,8.4,29l2.08-15.34ZM38.06,27.58l-1.19.67-1.31-2.31a13.22,13.22,0,0,0,4-17.43,13.51,13.51,0,0,0-18.3-5.09,13.25,13.25,0,0,0-5.14,18.12,13.51,13.51,0,0,0,17,5.72l1.31,2.32-1.19.66L40,42.08l4.79-2.66Zm-4.27-2.12a12.14,12.14,0,0,1-16.45-4.58A11.9,11.9,0,0,1,22,4.59,12.14,12.14,0,0,1,38.41,9.17,11.9,11.9,0,0,1,33.79,25.46ZM22.36,5.74A10.56,10.56,0,0,0,20.74,6.9l14.5,1.92L33.13,24.45l.07,0a10.93,10.93,0,0,0,1.44-1l2-14.78a12.34,12.34,0,0,0-1-1.16ZM17,15.77l11.09,1.47L27,25.76a10.59,10.59,0,0,0,1.38,0l1.31-9.7L17,14.4A10.44,10.44,0,0,0,17,15.77Z">
</path>
</vector>
\ No newline at end of file
mobile/src/main/res/drawable/ic_to_main.xml 0 → 100644
View file @ 248ddc60
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="48.0"
android:viewportHeight="48.0">
<path
android:fillColor="@color/holo_orange_bright"
android:pathData="M23.37,5.39,9.05,7V26l1.37.21v11.9l15.09,2.25,1.37.15,12.34-1.37V7.75ZM25.51,39,11.8,36.94V26.41l13.71,2.05Zm0-29.7v17.8L10.42,24.83V8.19L23.34,6.76,34,8.35ZM37.85,37.92l-11,1.22V10.51l11-1.22Z" />
</vector>
\ No newline at end of file
mobile/src/main/res/layout/dialog_cardinfo.xml
View file @ 248ddc60
......@@ -31,81 +31,61 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:weightSum="4.5"
android:orientation="horizontal">
<TextView
<ImageButton
android:id="@+id/btn_faq"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_weight="1"
android:background="@drawable/button2_bg"
android:tooltipText="@string/card_faq"
android:gravity="center"
android:shadowColor="@color/black"
android:text="@string/card_faq"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@color/colorAccentDark"
android:textSize="10sp"
android:textStyle="bold" />
android:src="@drawable/ic_q_n_a"/>
<TextView
<ImageButton
android:id="@+id/btn_related"
android:visibility="gone"
android:visibility="visible"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
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" />
android:tooltipText="@string/card_related"
android:src="@drawable/ic_related"/>
<TextView
<ImageButton
android:id="@+id/btn_add_main"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_weight="1"
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="10sp"
android:textStyle="bold"
android:visibility="invisible"
tools:visibility="visible" />
android:tooltipText="@string/card_add_main"
android:src="@drawable/ic_to_main"/>
<TextView
<ImageButton
android:id="@+id/btn_add_side"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="4dp"
android:layout_weight="1"
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="10sp"
android:textStyle="bold"
android:visibility="invisible"
tools:visibility="visible" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:layout_weight="1" />
android:tooltipText="@string/card_add_side"
android:src="@drawable/ic_to_main" />
<ImageButton
android:id="@+id/btn_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_weight="0.5"
android:layout_gravity="right|center"
android:layout_marginLeft="20dp"
android:background="@android:color/transparent"
app:srcCompat="@drawable/ic_close_black_24dp" />
</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