将deckmanagerActivity转移为deckmanagerFragment

mobile/src/main/java/cn/garymb/ygomobile/GameUriManager.java

@@ -29,7 +29,7 @@ import java.util.Locale;
 import cn.garymb.ygodata.YGOGameOptions;
 import cn.garymb.ygomobile.bean.Deck;
 import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
+import cn.garymb.ygomobile.ui.cards.DeckManagerFragment;
 import cn.garymb.ygomobile.ui.home.HomeFragment;
 import cn.garymb.ygomobile.ui.preference.SettingsActivity;
 import cn.garymb.ygomobile.utils.FileUtils;
@@ -212,7 +212,7 @@ public class GameUriManager {
             boolean isLua = file.getName().toLowerCase(Locale.US).endsWith(".lua");
             Log.i(Constants.TAG, "open file:" + uri + "->" + file.getAbsolutePath());
             if (isYdk) {
-                DeckManagerActivity.start(activity, file.getAbsolutePath());
+                DeckManagerFragment.start(activity, file.getAbsolutePath());
             } else if (isYpk) {
                 if (!AppsSettings.get().isReadExpansions()) {
                     activity.startActivity(startSetting);
@@ -251,7 +251,7 @@ public class GameUriManager {
                     if (!deckInfo.isCompleteDeck()) {
                         YGOUtil.show("当前卡组缺少完整信息，将只显示已有卡片");
                     }
-                    DeckManagerActivity.start(activity, file.getAbsolutePath());
+                    DeckManagerFragment.start(activity, file.getAbsolutePath());
                 }
             } else if (Constants.URI_ROOM.equals(host)) {
                 YGODAUtil.deRoomListener(uri, (host1, port, password, exception) -> {
@@ -289,7 +289,7 @@ public class GameUriManager {
             }
         }
         if (deck != null && deck.exists()) {
-            DeckManagerActivity.start(activity, deck.getAbsolutePath());
+            DeckManagerFragment.start(activity, deck.getAbsolutePath());
         } else {
             Log.w("kk", "no find " + name);
             activity.finish();

mobile/src/main/java/cn/garymb/ygomobile/ui/activities/BaseActivity.java

@@ -248,7 +248,7 @@ public class BaseActivity extends AppCompatActivity {
      *
      * @return 是否满足权限申请条件
      */
-    protected boolean startPermissionsActivity() {
+    public boolean startPermissionsActivity() {
         return startPermissionsActivity(getPermissions());
     }
 
@@ -258,7 +258,7 @@ public class BaseActivity extends AppCompatActivity {
      * @param permissions 要申请的权限列表
      * @return 是否满足权限申请条件
      */
-    protected boolean startPermissionsActivity(String[] permissions) {
+    public boolean startPermissionsActivity(String[] permissions) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
             return false;
         if (permissions == null || permissions.length == 0)

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

@@ -32,7 +32,7 @@ import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.cards.CardSearchFragment;
-import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
+import cn.garymb.ygomobile.ui.cards.DeckManagerFragment;
 import cn.garymb.ygomobile.ui.cards.deck.DeckUtils;
 import cn.garymb.ygomobile.ui.plus.DialogPlus;
 import cn.garymb.ygomobile.utils.FileLogUtil;
@@ -91,7 +91,7 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
         // 配置navigation与底部菜单之间的联系
         // 底部菜单的样式里面的item里面的ID与navigation布局里面指定的ID必须相同，否则会出现绑定失败的情况
         appBarConfiguration = new AppBarConfiguration.Builder(
-                R.id.home_fragment, R.id.cardSearcher_fragment, R.id.mycard_fragment, R.id.setting_fragment).build();
+                R.id.home_fragment, R.id.cardSearcher_fragment, R.id.deckManager_fragment, R.id.mycard_fragment, R.id.setting_fragment).build();
         // 建立fragment容器的控制器，这个容器就是页面的上的fragment容器
         NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
         // 启动
@@ -248,13 +248,13 @@ public abstract class HomeActivity extends BaseActivity implements OnDuelAssista
                 if (!deckInfo.isCompleteDeck()) {
                     YGOUtil.show("当前卡组缺少完整信息，将只显示已有卡片");
                 }
-                DeckManagerActivity.start(this, file.getAbsolutePath());
+                DeckManagerFragment.start(this, file.getAbsolutePath());
             } else {
                 //如果是卡组文本
                 try {
                     //以当前时间戳作为卡组名保存卡组
                     File file = DeckUtils.save(getString(R.string.rename_deck) + System.currentTimeMillis(), deckMessage);
-                    DeckManagerActivity.start(this, file.getAbsolutePath());
+                    DeckManagerFragment.start(this, file.getAbsolutePath());
                 } catch (IOException e) {
                     e.printStackTrace();
                     Toast.makeText(this, getString(R.string.save_failed_bcos) + e, Toast.LENGTH_SHORT).show();

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

@@ -59,7 +59,8 @@ import cn.garymb.ygomobile.ui.activities.WebActivity;
 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.DeckManagerActivity;
+
+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;
@@ -132,9 +133,6 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
         mServerListManager.bind(mServerList);
         mServerListManager.syncLoadData();
         cv_deckmanager = view.findViewById(R.id.action_deck_manager);
-        cv_deckmanager.setOnClickListener((v) -> {
-                startActivity(new Intent(getActivity(), DeckManagerActivity.class));
-        });
         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);
@@ -532,7 +530,7 @@ public class HomeFragment extends BaseFragemnt implements View.OnClickListener {
                 //startActivity(new Intent(getContext(), CardSearchActivity.class));
                 break;
             case R.id.action_deck_manager:
-                startActivity(new Intent(getActivity(), DeckManagerActivity.class));
+
                 break;
             case R.id.action_join_qq_group:
                 String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK";

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

@@ -28,7 +28,7 @@ import cn.garymb.ygodata.YGOGameOptions;
 import cn.garymb.ygomobile.AppsSettings;
 import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.bean.events.DeckFile;
-import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
+import cn.garymb.ygomobile.ui.cards.DeckManagerFragment;
 import cn.garymb.ygomobile.ui.plus.DefWebViewClient;
 import cn.garymb.ygomobile.utils.DeckUtil;
 
@@ -208,7 +208,7 @@ public class MyCard {
 
         @JavascriptInterface
         public void edit_deck() {
-            activity.startActivity(new Intent(activity, DeckManagerActivity.class));
+            activity.startActivity(new Intent(activity, DeckManagerFragment.class));
         }
 
         @JavascriptInterface

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

@@ -36,7 +36,8 @@ import cn.garymb.ygomobile.YGOStarter;
 import cn.garymb.ygomobile.lite.BuildConfig;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.activities.BaseActivity;
-import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
+
+import cn.garymb.ygomobile.ui.cards.DeckManagerFragment;
 import cn.garymb.ygomobile.ui.mycard.mcchat.SplashActivity;
 import cn.garymb.ygomobile.utils.ActivityUtils;
 import cn.garymb.ygomobile.utils.glide.GlideCompat;
@@ -305,7 +306,7 @@ public class MyCardActivity extends BaseActivity implements MyCard.MyCardListene
                 mWebViewPlus.loadUrl(mMyCard.getHomeUrl());
                 break;
             case R.id.action_deck_manager:
-                startActivity(new Intent(this, DeckManagerActivity.class));
+                startActivity(new Intent(this, DeckManagerFragment.class));
                 closeDrawer();
                 break;
             case R.id.action_arena:

mobile/src/main/java/com/ourygo/assistant/service/DuelAssistantService.java

@@ -45,7 +45,7 @@ import cn.garymb.ygomobile.bean.ServerList;
 import cn.garymb.ygomobile.lite.R;
 import cn.garymb.ygomobile.ui.adapters.ServerListAdapter;
 import cn.garymb.ygomobile.ui.cards.CardSearchFragment;
-import cn.garymb.ygomobile.ui.cards.DeckManagerActivity;
+import cn.garymb.ygomobile.ui.cards.DeckManagerFragment;
 import cn.garymb.ygomobile.ui.cards.deck.DeckUtils;
 import cn.garymb.ygomobile.ui.home.MainActivity;
 import cn.garymb.ygomobile.ui.home.ServerListManager;
@@ -232,13 +232,13 @@ public class DuelAssistantService extends Service implements OnDuelAssistantList
                 if (!deckInfo.isCompleteDeck()){
                     YGOUtil.show("当前卡组缺少完整信息，将只显示已有卡片");
                 }
-                DeckManagerActivity.start(DuelAssistantService.this, file.getAbsolutePath());
+                DeckManagerFragment.start(DuelAssistantService.this, file.getAbsolutePath());
             } else {
                 //如果是卡组文本
                 try {
                     //以当前时间戳作为卡组名保存卡组
                     File file = DeckUtils.save(getString(R.string.rename_deck) + System.currentTimeMillis(), deckMessage);
-                    DeckManagerActivity.start(DuelAssistantService.this, file.getAbsolutePath());
+                    DeckManagerFragment.start(DuelAssistantService.this, file.getAbsolutePath());
                 } catch (IOException e) {
                     e.printStackTrace();
                     Toast.makeText(DuelAssistantService.this, getString(R.string.save_failed_bcos) + e, Toast.LENGTH_SHORT).show();

mobile/src/main/res/menu/bottom_nav_menu.xml

@@ -11,6 +11,11 @@
         android:icon="@drawable/search"
         android:title="@string/search"
         app:showAsAction="always" />
+    <item
+        android:id="@+id/deckManager_fragment"
+        android:icon="@drawable/deck"
+        android:title="@string/deck_manager"
+        app:showAsAction="always" />
     <item
         android:id="@+id/mycard_fragment"
         android:icon="@drawable/mycard"

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

@@ -13,6 +13,10 @@
         android:id="@+id/cardSearcher_fragment"
         android:name="cn.garymb.ygomobile.ui.cards.CardSearchFragment"
         tools:layout="@layout/search_fragment"/>
+    <fragment
+        android:id="@+id/deckManager_fragment"
+        android:name="cn.garymb.ygomobile.ui.cards.DeckManagerFragment"
+        tools:layout="@layout/activity_deck_cards"/>
     <fragment
         android:id="@+id/mycard_fragment"
         android:name="cn.garymb.ygomobile.ui.mycard.MycardFragment"