Skip to content

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

优化decklistadapter UI

parent 1e1f6808
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 59 deletions
mobile/src/main/res/drawable/btn_cloud_upload_bg.xml 0 → 100644
View file @ 88229e24
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_cloud_upload_p" android:state_pressed="true" />
<item android:drawable="@drawable/ic_cloud_upload_n" />
</selector>
\ No newline at end of file
mobile/src/main/res/drawable/ic_cloud_upload_n.xml 0 → 100644
View file @ 88229e24
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.9" android:height="10dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="10dp">
<path android:fillColor="#00FFFF" android:pathData="M518.3,459c-3.2,-4.1 -9.4,-4.1 -12.6,0l-112,141.7c-4.1,5.2 -0.4,12.9 6.3,12.9h73.9V856c0,4.4 3.6,8 8,8h60c4.4,0 8,-3.6 8,-8V613.7H624c6.7,0 10.4,-7.7 6.3,-12.9L518.3,459z"/>
<path android:fillColor="#FFFFFF" android:pathData="M811.4,366.7C765.6,245.9 648.9,160 512.2,160S258.8,245.8 213,366.6C127.3,389.1 64,467.2 64,560c0,110.5 89.5,200 199.9,200H304c4.4,0 8,-3.6 8,-8v-60c0,-4.4 -3.6,-8 -8,-8h-40.1c-33.7,0 -65.4,-13.4 -89,-37.7 -23.5,-24.2 -36,-56.8 -34.9,-90.6 0.9,-26.4 9.9,-51.2 26.2,-72.1 16.7,-21.3 40.1,-36.8 66.1,-43.7l37.9,-9.9 13.9,-36.6c8.6,-22.8 20.6,-44.1 35.7,-63.4 14.9,-19.2 32.6,-35.9 52.4,-49.9 41.1,-28.9 89.5,-44.2 140,-44.2s98.9,15.3 140,44.2c19.9,14 37.5,30.8 52.4,49.9 15.1,19.3 27.1,40.7 35.7,63.4l13.8,36.5 37.8,10C846.1,454.5 884,503.8 884,560c0,33.1 -12.9,64.3 -36.3,87.7 -23.4,23.4 -54.5,36.3 -87.6,36.3H720c-4.4,0 -8,3.6 -8,8v60c0,4.4 3.6,8 8,8h40.1C870.5,760 960,670.5 960,560c0,-92.7 -63.1,-170.7 -148.6,-193.3z"/>
</vector>
mobile/src/main/res/drawable/ic_cloud_upload_p.xml 0 → 100644
View file @ 88229e24
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:alpha="0.9" android:height="10dp" android:viewportHeight="1024" android:viewportWidth="1024" android:width="10dp">
<path android:fillColor="#00FF00" android:pathData="M518.3,459c-3.2,-4.1 -9.4,-4.1 -12.6,0l-112,141.7c-4.1,5.2 -0.4,12.9 6.3,12.9h73.9V856c0,4.4 3.6,8 8,8h60c4.4,0 8,-3.6 8,-8V613.7H624c6.7,0 10.4,-7.7 6.3,-12.9L518.3,459z"/>
<path android:fillColor="#FFFF00" android:pathData="M811.4,366.7C765.6,245.9 648.9,160 512.2,160S258.8,245.8 213,366.6C127.3,389.1 64,467.2 64,560c0,110.5 89.5,200 199.9,200H304c4.4,0 8,-3.6 8,-8v-60c0,-4.4 -3.6,-8 -8,-8h-40.1c-33.7,0 -65.4,-13.4 -89,-37.7 -23.5,-24.2 -36,-56.8 -34.9,-90.6 0.9,-26.4 9.9,-51.2 26.2,-72.1 16.7,-21.3 40.1,-36.8 66.1,-43.7l37.9,-9.9 13.9,-36.6c8.6,-22.8 20.6,-44.1 35.7,-63.4 14.9,-19.2 32.6,-35.9 52.4,-49.9 41.1,-28.9 89.5,-44.2 140,-44.2s98.9,15.3 140,44.2c19.9,14 37.5,30.8 52.4,49.9 15.1,19.3 27.1,40.7 35.7,63.4l13.8,36.5 37.8,10C846.1,454.5 884,503.8 884,560c0,33.1 -12.9,64.3 -36.3,87.7 -23.4,23.4 -54.5,36.3 -87.6,36.3H720c-4.4,0 -8,3.6 -8,8v60c0,4.4 3.6,8 8,8h40.1C870.5,760 960,670.5 960,560c0,-92.7 -63.1,-170.7 -148.6,-193.3z"/>
</vector>
mobile/src/main/res/layout/activity_deck_square.xml deleted 100644 → 0
View file @ 1e1f6808
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="cn.garymb.ygomobile.deck_square.DeckSquareActivity">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#aa000000" />
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/packagetablayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
app:tabGravity="fill"
app:tabMode="scrollable" />
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/login_btn"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|left"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginBottom="16dp"
app:srcCompat="@android:drawable/ic_dialog_email" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
mobile/src/main/res/layout/dialog_deck_manager.xml
View file @ 88229e24
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@drawable/window2s"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar" android:id="@+id/appbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@null" android:background="@drawable/veil2"
android:paddingBottom="5dp"> android:paddingBottom="5dp">
......
mobile/src/main/res/layout/item_deck_list_swipe.xml
View file @ 88229e24
...@@ -27,7 +27,9 @@ ...@@ -27,7 +27,9 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:layout_gravity="center"
android:orientation="horizontal"
android:weightSum="5">
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
...@@ -52,6 +54,7 @@ ...@@ -52,6 +54,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/holo_blue_bright" android:textColor="@color/holo_blue_bright"
android:textSize="10sp" android:textSize="10sp"
android:visibility="gone"
tools:text="40" /> tools:text="40" />
<LinearLayout <LinearLayout
...@@ -87,7 +90,7 @@ ...@@ -87,7 +90,7 @@
<LinearLayout <LinearLayout
android:id="@+id/ll_extra_n_side" android:id="@+id/ll_extra_n_side"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
...@@ -126,14 +129,21 @@ ...@@ -126,14 +129,21 @@
tools:text="15" /> tools:text="15" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
<Button </LinearLayout>
android:id="@+id/local_deck_upload_btn" <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_gravity="bottom"
android:text="上传" /> android:layout_weight="1">
<Button
android:id="@+id/local_deck_upload_btn"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginLeft="@dimen/dp_10"
android:background="@drawable/btn_cloud_upload_bg"
android:gravity="center" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
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