feat: optimize logcat floating

Author: dreamguxiang

app/src/main/java/org/levimc/launcher/core/minecraft/Application.kt

@@ -13,7 +13,7 @@ import xcrash.XCrash
 import java.io.File
 import android.content.Intent
 import org.levimc.launcher.ui.activities.CrashActivity
-import org.levimc.launcher.ui.views.LogcatOverlayManager
+import org.levimc.launcher.ui.dialogs.LogcatOverlayManager
 
 class LauncherApplication : Application() {
 

app/src/main/java/org/levimc/launcher/ui/activities/MainActivity.java

@@ -5,7 +5,6 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 import android.widget.TextView;
@@ -41,7 +40,6 @@
 import org.levimc.launcher.ui.dialogs.gameversionselect.VersionUtil;
 import org.levimc.launcher.ui.views.MainViewModel;
 import org.levimc.launcher.ui.views.MainViewModelFactory;
-import org.levimc.launcher.ui.views.LogcatOverlay;
 import org.levimc.launcher.util.ApkImportManager;
 import org.levimc.launcher.util.GithubReleaseUpdater;
 import org.levimc.launcher.util.LanguageManager;

app/src/main/java/org/levimc/launcher/ui/activities/SettingsActivity.java

@@ -23,6 +23,7 @@
 import org.levimc.launcher.settings.FeatureSettings;
 import org.levimc.launcher.ui.adapter.SettingsAdapter;
 import org.levimc.launcher.ui.animation.DynamicAnim;
+import org.levimc.launcher.ui.dialogs.LogcatOverlayManager;
 import org.levimc.launcher.util.GithubReleaseUpdater;
 import org.levimc.launcher.util.LanguageManager;
 import org.levimc.launcher.util.PermissionsHandler;
@@ -72,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) {
             addSwitchItem(getString(R.string.show_logcat_overlay), fs.isLogcatOverlayEnabled(), (btn, checked) -> {
                 fs.setLogcatOverlayEnabled(checked);
                 try {
-                    org.levimc.launcher.ui.views.LogcatOverlayManager mgr = org.levimc.launcher.ui.views.LogcatOverlayManager.getInstance();
+                    LogcatOverlayManager mgr = LogcatOverlayManager.getInstance();
                     if (mgr != null) mgr.refreshVisibility();
                 } catch (Throwable ignored) {}
             });

app/src/main/java/org/levimc/launcher/ui/dialogs/LogcatOverlay.java

@@ -0,0 +1,78 @@
+package org.levimc.launcher.ui.dialogs;
+
+import android.app.*;
+import android.content.*;
+import android.os.*;
+import android.view.ViewGroup;
+import org.levimc.launcher.settings.FeatureSettings;
+import org.levimc.launcher.ui.activities.SplashActivity;
+
+public class LogcatOverlayManager {
+
+    private static volatile LogcatOverlayManager instance;
+    private final Application app;
+    private LogcatOverlay overlay;
+    private final Handler mainHandler = new Handler(Looper.getMainLooper());
+    private volatile boolean onSplash = false;
+
+    private LogcatOverlayManager(Application app) {
+        this.app = app;
+        registerLifecycleCallbacks();
+        registerSettingsListener();
+    }
+
+    public static void init(Application app) {
+        if (instance == null) {
+            synchronized (LogcatOverlayManager.class) {
+                if (instance == null) instance = new LogcatOverlayManager(app);
+            }
+        }
+    }
+
+    public static LogcatOverlayManager getInstance() { return instance; }
+
+    private void attachTo(Activity act) {
+        if (overlay == null) overlay = new LogcatOverlay(act.getApplicationContext());
+        ViewGroup root = act.findViewById(android.R.id.content);
+        if (root == null) return;
+        if (overlay.getParent() != root) {
+            if (overlay.getParent() instanceof ViewGroup) ((ViewGroup) overlay.getParent()).removeView(overlay);
+            root.addView(overlay);
+        }
+        updateVisibility();
+    }
+
+    private void updateVisibility() {
+        boolean show = FeatureSettings.getInstance().isLogcatOverlayEnabled() && !onSplash;
+        mainHandler.post(() -> {
+            if (overlay == null) return;
+            if (show) overlay.show(); else overlay.hide();
+        });
+    }
+
+    private void registerLifecycleCallbacks() {
+        app.registerActivityLifecycleCallbacks(new Application.ActivityLifecycleCallbacks() {
+            @Override public void onActivityResumed(Activity activity) {
+                onSplash = activity instanceof SplashActivity;
+                attachTo(activity);
+            }
+            @Override public void onActivityCreated(Activity a, Bundle b) {}
+            @Override public void onActivityStarted(Activity a) {}
+            @Override public void onActivityPaused(Activity a) {}
+            @Override public void onActivityStopped(Activity a) {}
+            @Override public void onActivitySaveInstanceState(Activity a, Bundle b) {}
+            @Override public void onActivityDestroyed(Activity a) {}
+        });
+    }
+
+    private void registerSettingsListener() {
+        SharedPreferences sp = app.getSharedPreferences("feature_settings", Context.MODE_PRIVATE);
+        sp.registerOnSharedPreferenceChangeListener((prefs, key) -> {
+            if ("settings_json".equals(key)) updateVisibility();
+        });
+    }
+
+    public void refreshVisibility() { updateVisibility(); }
+
+
+}

app/src/main/java/org/levimc/launcher/ui/dialogs/LogcatOverlayManager.java

@@ -0,0 +1,15 @@
+package org.levimc.launcher.ui.dialogs;
+
+import android.text.Editable;
+import android.text.TextWatcher;
+import java.util.function.Consumer;
+
+public abstract class SimpleTextWatcher implements TextWatcher {
+    public static SimpleTextWatcher after(Consumer<Editable> f) {
+        return new SimpleTextWatcher() {
+            @Override public void afterTextChanged(Editable s) { f.accept(s); }
+        };
+    }
+    @Override public void beforeTextChanged(CharSequence s,int a,int b,int c){}
+    @Override public void onTextChanged(CharSequence s,int a,int b,int c){}
+}