feat: 启动游戏后关闭启动器 #1235

Author: ShirosakiMio

FCL/src/main/java/com/tungsten/fcl/game/LauncherHelper.java

@@ -17,10 +17,12 @@
  */
 package com.tungsten.fcl.game;
 
+import static android.content.Context.MODE_PRIVATE;
 import static com.tungsten.fcl.util.AndroidUtils.getLocalizedText;
 import static com.tungsten.fcl.util.AndroidUtils.hasStringId;
 import static com.tungsten.fclcore.util.Logging.LOG;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -33,6 +35,7 @@
 import com.mio.manager.RendererManager;
 import com.mio.minecraft.ModCheckException;
 import com.mio.minecraft.ModChecker;
+import com.tungsten.fcl.FCLApplication;
 import com.tungsten.fcl.R;
 import com.tungsten.fcl.activity.JVMActivity;
 import com.tungsten.fcl.control.MenuType;
@@ -196,6 +199,11 @@ private void launch0() {
                             intent.putExtras(bundle);
                             LOG.log(Level.INFO, "Start JVMActivity!");
                             context.startActivity(intent);
+                            if (context.getSharedPreferences("launcher", MODE_PRIVATE).getBoolean("autoExitLauncher", false)) {
+                                Activity activity = FCLApplication.getCurrentActivity();
+                                if (activity != null)
+                                    activity.finish();
+                            }
                         }))
                         .withStage("launch.state.waiting_launching"))
                 .withStagesHint(Lang.immutableListOf(

FCL/src/main/java/com/tungsten/fcl/ui/setting/LauncherSettingPage.java

@@ -78,6 +78,7 @@ public class LauncherSettingPage extends FCLCommonPage implements View.OnClickLi
     private FCLButton clearCache;
     private FCLButton exportLog;
     private FCLButton requestAudioRecord;
+    private FCLSwitch autoExitLauncher;
     private FCLButton theme;
     private FCLButton theme2;
     private FCLButton ltBackground;
@@ -112,11 +113,13 @@ public LauncherSettingPage(Context context, int id, FCLUILayout parent, int resI
     @Override
     public void onCreate() {
         super.onCreate();
+        SharedPreferences sharedPreferences = getActivity().getSharedPreferences("launcher", MODE_PRIVATE);
         language = findViewById(R.id.language);
         checkUpdate = findViewById(R.id.check_update);
         clearCache = findViewById(R.id.clear_cache);
         exportLog = findViewById(R.id.export_log);
         requestAudioRecord = findViewById(R.id.request_audio_record);
+        autoExitLauncher = findViewById(R.id.auto_exit_launcher);
         theme = findViewById(R.id.theme);
         theme2 = findViewById(R.id.theme2);
         ltBackground = findViewById(R.id.background_lt);
@@ -184,6 +187,9 @@ public void onCreate() {
         language.setSelection(LocaleUtils.getLanguage(getContext()));
         language.setOnItemSelectedListener(this);
 
+        autoExitLauncher.setChecked(sharedPreferences.getBoolean("autoExitLauncher", false));
+        autoExitLauncher.setOnCheckedChangeListener(this);
+
         ignoreNotch.setChecked(ThemeEngine.getInstance().getTheme().isFullscreen());
         ignoreNotch.setOnCheckedChangeListener(this);
 
@@ -195,7 +201,6 @@ public void onCreate() {
         animationSpeed.progressProperty().bindBidirectional(ThemeEngine.getInstance().getTheme().animationSpeedProperty());
         ThemeEngine.getInstance().getTheme().animationSpeedProperty().addListener(observable -> Theme.saveTheme(getContext(), ThemeEngine.getInstance().getTheme()));
 
-        SharedPreferences sharedPreferences = getActivity().getSharedPreferences("launcher", MODE_PRIVATE);
         vibrationDuration.setProgress(sharedPreferences.getInt("vibrationDuration", 100));
         vibrationDuration.addProgressListener();
         vibrationDuration.progressProperty().addListener(observable -> {
@@ -529,15 +534,17 @@ public void onNothingSelected(AdapterView<?> parent) {
 
     @Override
     public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+        SharedPreferences sharedPreferences = getActivity().getSharedPreferences("launcher", MODE_PRIVATE);
         if (buttonView == ignoreNotch) {
             ThemeEngine.getInstance().applyAndSave(getContext(), getActivity().getWindow(), isChecked);
             getActivity().getWindow().setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN, WindowManager.LayoutParams.FLAG_LAYOUT_IN_SCREEN);
         } else if (buttonView == closeSkinModel) {
             ThemeEngine.getInstance().getTheme().setiIgnoreSkinContainer(isChecked);
             Theme.saveTheme(getContext(), ThemeEngine.getInstance().getTheme());
         } else if (buttonView == disableFullscreenInput) {
-            SharedPreferences sharedPreferences = getActivity().getSharedPreferences("launcher", MODE_PRIVATE);
             sharedPreferences.edit().putBoolean("disableFullscreenInput", isChecked).apply();
+        } else if (buttonView == autoExitLauncher) {
+            sharedPreferences.edit().putBoolean("autoExitLauncher", isChecked).apply();
         }
     }
 }

FCL/src/main/res/layout/page_setting_launcher.xml

@@ -204,6 +204,21 @@
 
                 </androidx.appcompat.widget.LinearLayoutCompat>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:background="@android:color/darker_gray" />
+
+                <com.tungsten.fcllibrary.component.view.FCLSwitch
+                    android:id="@+id/auto_exit_launcher"
+                    android:text="@string/settings_launcher_exit_after_launching"
+                    android:paddingStart="12dp"
+                    android:paddingTop="8dp"
+                    android:paddingEnd="12dp"
+                    android:paddingBottom="8dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"/>
+
             </com.tungsten.fcllibrary.component.view.FCLLinearLayout>
 
             <com.tungsten.fcllibrary.component.view.FCLLinearLayout

FCL/src/main/res/values-zh/strings.xml

@@ -838,6 +838,7 @@
     <string name="settings_launcher_animation_speed">动画速度</string>
     <string name="settings_launcher_vibrate_duration">震动时长（用于TouchController模组）</string>
     <string name="settings_disable_fullscreen_input">禁用全屏输入（用于TouchController模组）</string>
+    <string name="settings_launcher_exit_after_launching">启动器启动后自动关闭</string>
 
     <string name="settings_memory">游戏内存</string>
     <string name="settings_memory_allocate_auto">最低分配 %1$.1f GB / 实际分配 %2$.1f GB</string>

FCL/src/main/res/values/strings.xml

@@ -898,6 +898,7 @@
     <string name="settings_launcher_animation_speed">Animation Speed</string>
     <string name="settings_launcher_vibrate_duration">Vibration Duration (For TouchController mod)</string>
     <string name="settings_disable_fullscreen_input">Disable fullscreen input (For TouchController mod)</string>
+    <string name="settings_launcher_exit_after_launching">Launcher exits after launching</string>
 
     <string name="settings_memory">Memory</string>
     <string name="settings_memory_allocate_auto">%1$.1f GB Minimum / %2$.1f GB Allocated</string>