微调布局

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

@@ -75,7 +75,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         View layoutView;
-        layoutView = inflater.inflate(R.layout.search_fragment, container, false);
+        layoutView = inflater.inflate(R.layout.fragment_search, container, false);
         mResult_count = layoutView.findViewById(R.id.search_result_count);
         duelAssistantManagement = DuelAssistantManagement.getInstance();
         intentSearchMessage = getActivity().getIntent().getStringExtra(CardSearchFragment.SEARCH_MESSAGE);

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

@@ -148,7 +148,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         View layoutView;
-        layoutView = inflater.inflate(R.layout.activity_deck_cards, container, false);
+        layoutView = inflater.inflate(R.layout.fragment_deck_cards, container, false);
         AnimationShake2(layoutView);
         mImageLoader = new ImageLoader(true);
         mDrawerLayout = layoutView.findViewById(R.id.drawer_layout);

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

@@ -20,7 +20,6 @@ import android.view.ViewGroup;
 import android.view.inputmethod.EditorInfo;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.ImageView;
 import android.widget.ListView;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -60,7 +59,6 @@ import cn.garymb.ygomobile.ui.adapters.ServerListAdapter;
 import cn.garymb.ygomobile.ui.adapters.SimpleListAdapter;
 import cn.garymb.ygomobile.ui.cards.CardDetailRandom;
 
-import cn.garymb.ygomobile.ui.cards.DeckManagerFragment;
 import cn.garymb.ygomobile.ui.mycard.MyCardActivity;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.ui.plus.VUiKit;
@@ -98,7 +96,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
         if (isHorizontal)
             layoutView = inflater.inflate(R.layout.main_horizontal_fragment, container, false);
         else
-            layoutView = inflater.inflate(R.layout.main_fragment, container, false);
+            layoutView = inflater.inflate(R.layout.fragment_home, container, false);
 
         initView(layoutView, savedInstanceState);
         //event

mobile/src/main/java/cn/garymb/ygomobile/ui/mycard/MycardFragment.java

@@ -21,7 +21,7 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
         if (isHorizontal)
             view = inflater.inflate(R.layout.mycard_horizontal_fragment, container, false);
         else
-            view = inflater.inflate(R.layout.mycard_fragment, container, false);
+            view = inflater.inflate(R.layout.fragment_mycard, container, false);
         this.currentBundle = savedInstanceState;
         //initView(view);
         return view;

mobile/src/main/res/layout/activity_deck_cards.xml → mobile/src/main/res/layout/fragment_deck_cards.xml

@@ -32,7 +32,7 @@
                 android:layout_height="70dp"
                 android:layout_gravity="bottom"
                 android:layout_marginLeft="10dp"
-                android:layout_marginBottom="2dp"
+                android:layout_marginBottom="70dp"
                 android:orientation="horizontal"
                 android:weightSum="1">
 
@@ -159,7 +159,8 @@
             android:orientation="vertical"
             android:paddingLeft="4dp"
             android:paddingTop="2dp"
-            android:paddingRight="5dp">
+            android:paddingRight="5dp"
+            android:layout_marginBottom="70dp">
 
             <LinearLayout
                 android:layout_width="match_parent"

mobile/src/main/res/layout/search_fragment.xml → mobile/src/main/res/layout/fragment_search.xml

@@ -23,16 +23,17 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:divider="@android:color/transparent"
+                android:layout_marginBottom="70dp"
                 android:dividerHeight="4dp"
                 android:padding="5dp"
-                android:scrollbars="none" />
+                android:scrollbars="vertical" />
 
             <LinearLayout
                 android:layout_width="60dp"
                 android:layout_height="100dp"
                 android:layout_gravity="bottom|right"
                 android:layout_marginRight="20dp"
-                android:layout_marginBottom="60dp"
+                android:layout_marginBottom="70dp"
                 android:orientation="vertical">
 
                 <Button

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

@@ -7,9 +7,9 @@
     android:background="@drawable/red"
     android:orientation="vertical"
     android:padding="10dp"
-
+    android:layout_marginBottom="70dp"
     android:theme="@style/AppTheme.PopupOverlay.Dark"
-    tools:showIn="@layout/search_fragment">
+    tools:showIn="@layout/fragment_search">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -242,7 +242,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="60dp"
+            android:layout_marginTop="10dp"
             android:orientation="horizontal">
 
             <com.google.android.material.textfield.TextInputLayout
@@ -269,7 +269,6 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="60dp"
             android:orientation="horizontal">
 
             <androidx.appcompat.widget.AppCompatButton

mobile/src/main/res/navigation/mobile_navigation.xml

@@ -8,19 +8,19 @@
     <fragment
         android:id="@+id/home_fragment"
         android:name="cn.garymb.ygomobile.ui.home.HomeFragment"
-        tools:layout="@layout/main_fragment" />
+        tools:layout="@layout/fragment_home" />
     <fragment
         android:id="@+id/cardSearcher_fragment"
         android:name="cn.garymb.ygomobile.ui.cards.CardSearchFragment"
-        tools:layout="@layout/search_fragment"/>
+        tools:layout="@layout/fragment_search"/>
     <fragment
         android:id="@+id/deckManager_fragment"
         android:name="cn.garymb.ygomobile.ui.cards.DeckManagerFragment"
-        tools:layout="@layout/activity_deck_cards"/>
+        tools:layout="@layout/fragment_deck_cards"/>
     <fragment
         android:id="@+id/mycard_fragment"
         android:name="cn.garymb.ygomobile.ui.mycard.MycardFragment"
-        tools:layout="@layout/mycard_fragment" />
+        tools:layout="@layout/fragment_mycard" />
     <fragment
         android:id="@+id/setting_fragment"
         android:name="cn.garymb.ygomobile.ui.preference.fragments.SettingFragment"