调整布局

mobile/src/main/java/cn/garymb/ygomobile/ui/cards/DeckManagerFragment.java

@@ -131,6 +131,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     private RecyclerView mRecyclerView;
     private DeckAdapater mDeckAdapater;
     private final AppsSettings mSettings = AppsSettings.get();
+    private BaseActivity mContext;
 
     private File mPreLoadFile;
     private DeckItemTouchHelper mDeckItemTouchHelper;
@@ -828,7 +829,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         DialogPlus builder = new DialogPlus(getContext());
         switch (menuId) {
             case R.id.action_deck_backup_n_restore:
-                //startPermissionsActivity();
+                mContext.startPermissionsActivity();
                 builder.setTitle(R.string.question);
                 builder.setMessage(R.string.deck_explain);
                 builder.setMessageGravity(Gravity.CENTER_HORIZONTAL);
@@ -844,9 +845,6 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                 });
                 builder.show();
                 break;
-//            case R.id.action_refresh:
-//                mDeckAdapater.notifyDataSetChanged();
-//                break;
             case R.id.action_search:
                 //弹条件对话框
                 showSearch(true);

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeActivity.java

@@ -221,13 +221,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
 
     public abstract void updateImages();
 
-    /*
-        public void AnimationShake() {
-            Animation shake = AnimationUtils.loadAnimation(this, R.anim.shake);//加载动画资源文件
-            findViewById(R.id.cube).startAnimation(shake); //给组件播放动画效果
-        }
-    */
-
     private void saveDeck(String deckMessage, boolean isUrl) {
         DialogPlus dialog = new DialogPlus(this);
         dialog.setTitle(R.string.question);

mobile/src/main/java/cn/garymb/ygomobile/ui/home/HomeFragment.java

@@ -130,7 +130,6 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
         mServerListManager = new ServerListManager(getContext(), mServerListAdapter);
         mServerListManager.bind(mServerList);
         mServerListManager.syncLoadData();
-        cv_deckmanager = view.findViewById(R.id.action_deck_manager);
         cv_donation = view.findViewById(R.id.nav_webpage);
         cv_game = view.findViewById(R.id.action_game);
         cv_download_ex = view.findViewById(R.id.action_download_ex);

mobile/src/main/res/layout/dialog_plus_base.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@drawable/window">
+    android:background="@drawable/sdialogl">
 
     <RelativeLayout
         android:id="@+id/layout_title"

mobile/src/main/res/layout/fragment_home.xml

@@ -264,52 +264,13 @@
                             android:textStyle="bold" />
                     </RelativeLayout>
                 </androidx.cardview.widget.CardView>
-                <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
-                    android:id="@+id/action_deck_manager"
-                    android:layout_width="100dp"
-                    android:layout_height="100dp"
-                    android:layout_marginBottom="10dp"
-                    android:clickable="true"
-                    android:foreground="?android:attr/selectableItemBackground"
-                    android:orientation="vertical"
-                    app:cardBackgroundColor="@color/transparent"
-                    app:cardElevation="0dp"
-                    app:cardUseCompatPadding="false"
-                    app:elevation="0dp">
-
-                    <RelativeLayout
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content">
-
-                        <ImageView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="-30dp"
-                            android:layout_marginLeft="20dp"
-                            android:layout_marginTop="20dp"
-                            android:layout_marginEnd="-30dp"
-                            android:layout_marginRight="-20dp"
-                            android:layout_marginBottom="-20dp"
-                            android:scaleType="fitEnd"
-                            android:src="@drawable/downloadimages" />
-
-                        <TextView
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/window3"
-                            android:paddingLeft="13dp"
-                            android:paddingTop="13dp"
-                            android:text="@string/deck_manager"
-                            android:textColor="@color/holo_blue_bright"
-                            android:textSize="10sp"
-                            android:textStyle="bold" />
-                    </RelativeLayout>
-                </androidx.cardview.widget.CardView>
             </LinearLayout>
+
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="match_parent"
                 android:orientation="vertical">
+
                 <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
                     android:id="@+id/action_join_qq_group"
                     android:layout_width="100dp"

mobile/src/main/res/layout/preference_custom.xml

-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeight"
-    android:paddingRight="?android:attr/scrollbarSize">
-
-    <RelativeLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="15dip"
-        android:layout_marginTop="6dip"
-        android:layout_marginRight="6dip"
-        android:layout_marginBottom="6dip"
-        android:layout_weight="1">
-
-        <TextView
-            android:id="@android:id/title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:textAppearance="@style/TextAppearance.AppCompat.Title"
-            android:textColor="@color/holo_blue_bright"
-            android:textSize="16sp"
-            tools:text="Title" />
-
-        <TextView
-            android:id="@android:id/summary"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_below="@android:id/title"
-            android:layout_alignLeft="@android:id/title"
-            android:layout_marginTop="4dp"
-            android:textAppearance="@style/TextAppearance.AppCompat.Caption"
-            android:textColor="@color/white"
-            android:textSize="12sp"
-            tools:text="Summary" />
-
-    </RelativeLayout>
-
-    <!-- Preference should place its actual preference widget here. -->
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center_vertical"
-        android:orientation="vertical" />
-</LinearLayout>
\ No newline at end of file