迁移设置fragment

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

@@ -257,6 +257,7 @@ public class CardSearchFragment extends BaseFragemnt implements CardLoader.CallB
         if (mDrawerlayout.isDrawerOpen(Constants.CARD_SEARCH_GRAVITY)) {
             mDrawerlayout.closeDrawer(Constants.CARD_SEARCH_GRAVITY);
         } else {
+            onBack();
             //super.onBackPressed();
         }
     }

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

@@ -151,7 +151,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         return layoutView;
     }
 
-    public void initView(View layoutView){
+    public void initView(View layoutView) {
         screenWidth = getResources().getDisplayMetrics().widthPixels;
         mImageLoader = new ImageLoader(true);
         mDrawerLayout = layoutView.findViewById(R.id.drawer_layout);
@@ -200,10 +200,10 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
         layoutView.findViewById(R.id.btn_nav_search).setOnClickListener((v) -> doMenu(R.id.action_search));
         layoutView.findViewById(R.id.btn_nav_list).setOnClickListener((v) -> doMenu(R.id.action_card_list));
         tv_deck.setOnClickListener(v -> YGODialogUtil.dialogDeckSelect(getActivity(), AppsSettings.get().getLastDeckPath(), this));
-        mContext = (BaseActivity)getActivity();
+        mContext = (BaseActivity) getActivity();
     }
 
-    public void preLoadFile(){
+    public void preLoadFile() {
         String preLoadFile = getActivity().getIntent().getStringExtra(Intent.EXTRA_TEXT);
         final File _file;
         //打开指定卡组
@@ -374,7 +374,37 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
 
     @Override
     public void onUserInvisible() {
-
+        if (mDeckAdapater.isChanged()) {
+            File ydk = mDeckAdapater.getYdkFile();
+            if (ydk != null && ydk.exists()) {
+                DialogPlus builder = new DialogPlus(getContext());
+                builder.setTitle(R.string.question);
+                builder.setMessage(R.string.quit_deck_tip);
+                builder.setMessageGravity(Gravity.CENTER_HORIZONTAL);
+                builder.setRightButtonText(getString(R.string.save_quit));
+                builder.setLeftButtonText(getString(R.string.quit));
+                builder.setRightButtonListener((dlg, s) -> {
+                    doMenu(R.id.action_save);
+                    dlg.dismiss();
+                    isExit = true;
+                });
+                builder.setLeftButtonListener((dlg, s) -> {
+                    dlg.dismiss();
+                    isExit = true;
+                });
+                builder.show();
+            }
+        } else {
+            //super.onBackHome();
+        }
+        if (mDrawerLayout.isDrawerOpen(Constants.CARD_SEARCH_GRAVITY)) {
+            mDrawerLayout.closeDrawer(Constants.CARD_SEARCH_GRAVITY);
+            return;
+        }
+        if (mDrawerLayout.isDrawerOpen(Gravity.LEFT)) {
+            mDrawerLayout.closeDrawer(Gravity.LEFT);
+            return;
+        }
     }
 
     @Override
@@ -662,7 +692,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                     }
                 });
                 mCardDetail.setCallBack((card, favorite) -> {
-                    if(mCardSelector.isShowFavorite()){
+                    if (mCardSelector.isShowFavorite()) {
                         mCardSelector.showFavorites(false);
                     }
                 });
@@ -740,12 +770,10 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
                     doMenu(R.id.action_save);
                     dlg.dismiss();
                     isExit = true;
-                    //finish();
                 });
                 builder.setLeftButtonListener((dlg, s) -> {
                     dlg.dismiss();
                     isExit = true;
-                    //finish();
                 });
                 builder.show();
             }
@@ -760,7 +788,6 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
             mDrawerLayout.closeDrawer(Gravity.LEFT);
             return;
         }
-        //finish();
     }
 
     @Override
@@ -1002,7 +1029,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
 //            loadDeckFromFile(file);
 //        }
         Deck deck = mDeckAdapater.toDeck(mDeckAdapater.getYdkFile());
-        if (deck.getDeckCount()==0){
+        if (deck.getDeckCount() == 0) {
             builderShareLoading.dismiss();
             YGOUtil.show("卡组中没有卡片");
             return;
@@ -1363,7 +1390,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     @Override
     public void onDeckMove(List<DeckFile> deckFileList, DeckType toDeckType) {
         File ydk = mDeckAdapater.getYdkFile();
-        if(ydk == null){
+        if (ydk == null) {
             return;
         }
         String currentDeckPath = ydk.getPath();
@@ -1378,7 +1405,7 @@ public class DeckManagerFragment extends BaseFragemnt implements RecyclerViewIte
     @Override
     public void onDeckCopy(List<DeckFile> deckFileList, DeckType toDeckType) {
         File ydk = mDeckAdapater.getYdkFile();
-        if(ydk == null){
+        if (ydk == null) {
             return;
         }
         String currentDeckPath = ydk.getPath();

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

@@ -50,8 +50,8 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
 
     private BottomNavigationBar bottomNavigationBar;
     private FrameLayout frameLayout;
-    private FragmentTransaction transaction;
     private Fragment mFragment;
+    private SettingFragment mSettingFragment;
 
     private HomeFragment fragment_home;
     private CardSearchFragment fragment_search;
@@ -61,7 +61,6 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
 
 
     private DuelAssistantManagement duelAssistantManagement;
-    private AppBarConfiguration appBarConfiguration;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -132,6 +131,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
                         switchFragment(fragment_mycard);
                         break;
                     case 4:
+                        switchSettingFragment();
                         break;
                 }
             }
@@ -150,14 +150,23 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         fragment_search = new CardSearchFragment();
         fragment_deck_cards = new DeckManagerFragment();
         fragment_mycard = new MycardFragment();
+        fragment_settings = new SettingFragment();
         mFragment = fragment_home;
         getSupportFragmentManager().beginTransaction()
                 .add(R.id.fragment_content, fragment_home)
                 .commit();
+        getFragmentManager().beginTransaction()
+                .add(R.id.fragment_content, fragment_settings)
+                .hide(fragment_settings)
+                .commit();
         getSupportActionBar().hide();
     }
 
     private void switchFragment(Fragment fragment) {
+        if (fragment_settings.isVisible())
+            getFragmentManager().beginTransaction().hide(fragment_settings).commit();
+        if (mFragment.isHidden())
+            getSupportFragmentManager().beginTransaction().show(mFragment).commit();
         //判断当前显示的Fragment是不是切换的Fragment
         if (mFragment != fragment) {
             //判断切换的Fragment是否已经添加过
@@ -173,6 +182,13 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         }
     }
 
+    private void switchSettingFragment() {
+        getSupportFragmentManager().beginTransaction().hide(mFragment).commit();
+        getFragmentManager().beginTransaction().show(fragment_settings).commit();
+
+    }
+
+
     @Override
     protected void onResume() {
         super.onResume();

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

@@ -299,7 +299,11 @@ public class MycardFragment extends BaseFragemnt implements View.OnClickListener
      */
     @Override
     public void onClick(View v) {
-
+        switch (v.getId()) {
+            case R.id.tv_back_mc:
+                onHome();
+                break;
+        }
     }
 
     @Override

mobile/src/main/java/cn/garymb/ygomobile/ui/preference/SettingsFragment.java

-package cn.garymb.ygomobile.ui.preference;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-
-import cn.garymb.ygomobile.base.BaseFragemnt;
-import cn.garymb.ygomobile.lite.R;
-
-public class SettingsFragment extends BaseFragemnt  implements View.OnClickListener{
-    @Nullable
-    @Override
-    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        View layoutView;
-
-        layoutView = inflater.inflate(R.layout.fragment_settings, container, false);
-
-        //initView(layoutView, savedInstanceState);
-
-        return layoutView;
-    }
-
-    /**
-     * 第一次fragment可见（进行初始化工作）
-     */
-    @Override
-    public void onFirstUserVisible() {
-
-    }
-
-    /**
-     * fragment可见（切换回来或者onResume）
-     */
-    @Override
-    public void onUserVisible() {
-
-    }
-
-    /**
-     * 第一次fragment不可见（不建议在此处理事件）
-     */
-    @Override
-    public void onFirstUserInvisible() {
-
-    }
-
-    /**
-     * fragment不可见（切换掉或者onPause）
-     */
-    @Override
-    public void onUserInvisible() {
-
-    }
-
-    @Override
-    public void onBackHome() {
-
-    }
-
-    @Override
-    public void onBackPressed() {
-
-    }
-
-    /**
-     * Called when a view has been clicked.
-     *
-     * @param v The view that was clicked.
-     */
-    @Override
-    public void onClick(View v) {
-
-    }
-}

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

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

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

@@ -7,7 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:clipToPadding="false"
-    android:fitsSystemWindows="false"
+    android:layout_marginBottom="60dp"
     tools:openDrawer="left">
 
 

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

@@ -24,7 +24,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:divider="@android:color/transparent"
-                android:layout_marginBottom="70dp"
+                android:layout_marginBottom="60dp"
                 android:dividerHeight="4dp"
                 android:padding="5dp"
                 android:scrollbars="vertical" />

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

@@ -7,7 +7,7 @@
     android:background="@drawable/red"
     android:orientation="vertical"
     android:padding="10dp"
-    android:layout_marginBottom="70dp"
+    android:layout_marginBottom="60dp"
     android:theme="@style/AppTheme.PopupOverlay.Dark"
     tools:showIn="@layout/fragment_search">
 

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

@@ -6,6 +6,7 @@
     android:background="@color/mediumPurple"
     android:orientation="vertical"
     android:paddingTop="20dp"
+    android:layout_marginBottom="60dp"
     tools:showIn="@layout/fragment_mycard">
 
     <LinearLayout