fix: android immersive mode issue

nini22P · Dec 11, 2024 · d3b0ed4 · d3b0ed4
1 parent 3f5bffa
commit d3b0ed4
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
         android:icon="@mipmap/ic_launcher"
         android:allowBackup="false"
         android:fullBackupContent="false"
+        android:enableOnBackInvokedCallback="true"
     >
         <activity android:name=".MainActivity" android:exported="true" android:launchMode="singleTop" android:taskAffinity="" android:theme="@style/LaunchTheme" android:configChanges="orientation|keyboardHidden|keyboard|screenSize|smallestScreenSize|locale|layoutDirection|fontScale|screenLayout|density|uiMode" android:hardwareAccelerated="true" android:windowSoftInputMode="adjustResize">
             <!-- Specifies an Android theme to apply to this Activity as soon as

diff --git a/lib/pages/home_page.dart b/lib/pages/home_page.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:iris/pages/player/iris_player.dart';
 
@@ -7,6 +8,25 @@ class HomePage extends HookWidget {
 
   @override
   Widget build(BuildContext context) {
+    useEffect(() {
+      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+      SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
+        systemNavigationBarColor: Colors.transparent,
+      ));
+      return null;
+    }, []);
+
+    useEffect(() {
+      SystemChrome.setSystemUIChangeCallback((value) async {
+        if (value) {
+          SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
+        }
+      });
+      return () {
+        SystemChrome.setSystemUIChangeCallback(null);
+      };
+    }, []);
+
     return const Scaffold(
       body: IrisPlayer(),
     );

diff --git a/lib/pages/player/iris_player.dart b/lib/pages/player/iris_player.dart
@@ -97,23 +97,6 @@ class IrisPlayer extends HookWidget {
       }
     }
 
-    final appLifecycleState = useAppLifecycleState();
-
-    useEffect(() {
-      if (appLifecycleState == AppLifecycleState.resumed) {
-        SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      }
-      return null;
-    }, [appLifecycleState]);
-
-    useEffect(() {
-      SystemChrome.setEnabledSystemUIMode(SystemUiMode.immersive);
-      SystemChrome.setSystemUIOverlayStyle(const SystemUiOverlayStyle(
-        systemNavigationBarColor: Colors.transparent,
-      ));
-      return null;
-    }, []);
-
     useEffect(() {
       if (isDesktop()) {
         windowManager