移除settingsActivity

微调贴图
修改自带卡组和收藏夹

mobile/assets/data/conf/system.conf

@@ -7,9 +7,9 @@
 41420027
 97268402
 65681983
-61740673
+91800273
 27204311
 35261759
+24508238
 23002292
-50588353
 82385847
\ No newline at end of file

mobile/assets/data/deck/[SAMPLE]CyberMata.ydk

@@ -53,9 +53,9 @@
 58069384
 48608796
 46724542
+46724542
 60303245
 94259633
-70369116
 !side
 27204311
 27204311
@@ -70,4 +70,5 @@
 34267821
 34267821
 34267821
-5851097
\ No newline at end of file
+48130397
+48130397
\ No newline at end of file

mobile/src/main/AndroidManifest.xml

@@ -134,15 +134,6 @@
             android:name="cn.garymb.ygomobile.YGOMobileActivity"
             android:theme="@style/AppTheme.Game"
             tools:replace="android:theme" />
-
-        <activity
-            android:name="cn.garymb.ygomobile.ui.settings.SettingsActivity"
-            android:configChanges="orientation|keyboardHidden|navigation|screenSize"
-            android:label="@string/settings"
-            android:launchMode="singleTop"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppTheme"
-            android:windowSoftInputMode="stateAlwaysHidden|adjustResize" />
         <activity
             android:name="cn.garymb.ygomobile.ui.file.FileActivity"
             android:configChanges="orientation|keyboardHidden|navigation|screenSize"

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

@@ -28,11 +28,8 @@ 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.DeckManagerFragment;
-import cn.garymb.ygomobile.ui.home.HomeActivity;
 import cn.garymb.ygomobile.ui.home.HomeFragment;
 import cn.garymb.ygomobile.ui.home.MainActivity;
-import cn.garymb.ygomobile.ui.settings.SettingsActivity;
 import cn.garymb.ygomobile.utils.FileUtils;
 import cn.garymb.ygomobile.utils.IOUtils;
 import cn.garymb.ygomobile.utils.YGOUtil;

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

@@ -8,7 +8,6 @@ import android.widget.Toast;
 
 import androidx.annotation.Nullable;
 import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentTransaction;
 
 import com.ashokvarma.bottomnavigation.BottomNavigationBar;
 import com.ashokvarma.bottomnavigation.BottomNavigationItem;
@@ -23,7 +22,7 @@ import cn.garymb.ygomobile.ui.activities.BaseActivity;
 import cn.garymb.ygomobile.ui.cards.CardSearchFragment;
 import cn.garymb.ygomobile.ui.cards.DeckManagerFragment;
 import cn.garymb.ygomobile.ui.mycard.MycardFragment;
-import cn.garymb.ygomobile.ui.settings.fragments.SettingFragment;
+import cn.garymb.ygomobile.ui.settings.SettingFragment;
 import cn.garymb.ygomobile.utils.ScreenUtil;
 
 public abstract class HomeActivity extends BaseActivity implements BottomNavigationBar.OnTabSelectedListener {
@@ -44,6 +43,9 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        if (savedInstanceState != null) {
+            savedInstanceState.putParcelable("android:support:fragments", null);
+        }
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_home);
         setExitAnimEnable(false);
@@ -53,9 +55,9 @@ public abstract class HomeActivity extends BaseActivity implements BottomNavigat
             public void onViewInitFinished(boolean arg0) {
                 //x5內核初始化完成的回调，为true表示x5内核加载成功，否则表示x5内核加载失败，会自动切换到系统内核。
                 if (arg0) {
-                    Toast.makeText(getActivity(), "加载X5内核成功", Toast.LENGTH_SHORT).show();
+                    //Toast.makeText(getActivity(), "加载X5内核成功", Toast.LENGTH_SHORT).show();
                 } else {
-                    Toast.makeText(getActivity(), "加载系统内核成功", Toast.LENGTH_SHORT).show();
+                    //Toast.makeText(getActivity(), "加载系统内核成功", Toast.LENGTH_SHORT).show();
                 }
             }
 

mobile/src/main/java/cn/garymb/ygomobile/ui/settings/fragments/SettingFragment.java → mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingFragment.java

-package cn.garymb.ygomobile.ui.settings.fragments;
+package cn.garymb.ygomobile.ui.settings;
 
 import static cn.garymb.ygomobile.Constants.ACTION_RELOAD;
 import static cn.garymb.ygomobile.Constants.CORE_SKIN_AVATAR_SIZE;

mobile/src/main/java/cn/garymb/ygomobile/ui/settings/SettingsActivity.java

-package cn.garymb.ygomobile.ui.settings;
-
-import android.os.Bundle;
-
-import androidx.annotation.Nullable;
-
-import cn.garymb.ygomobile.lite.R;
-import cn.garymb.ygomobile.ui.activities.BaseActivity;
-import cn.garymb.ygomobile.ui.settings.fragments.SettingFragment;
-
-public class SettingsActivity extends BaseActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_settings);
-        getSupportActionBar().hide();
-        enableBackHome();
-        getFragmentManager().beginTransaction().replace(R.id.fragment, new SettingFragment()).commit();
-    }
-}

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

-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:id="@+id/fragment_settings"
-    android:background="@drawable/bg3">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="#80000000"
-        android:orientation="vertical">
-
-        <fragment android:name="cn.garymb.ygomobile.ui.settings.fragments.SettingFragment"
-            android:id="@+id/fragment"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file