Add global ui reload function (setState) + fix flickering when switch…

…ing screens
Hedon-haven · Feb 5, 2025 · 8420193 · 8420193
1 parent 4309edc
commit 8420193
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 8 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -73,6 +73,14 @@ class ViewerAppState extends State<ViewerApp> with WidgetsBindingObserver {
   bool updateAvailable = false;
   UpdateManager updateManager = UpdateManager();
 
+  Future<bool> onboardingCompleted = sharedStorage
+      .getBool("general_onboarding_completed")
+      .then((value) => value ?? false);
+  Future<String> appearanceType = sharedStorage
+      .getString("appearance_launcher_appearance")
+      .then((value) => value ?? "Hedon haven");
+  Future<ThemeMode> themeMode = getThemeMode();
+
   /// This controls whether the preview should be currently blocked
   bool blockPreview = false;
   int _selectedIndex = 0;
@@ -86,6 +94,9 @@ class ViewerAppState extends State<ViewerApp> with WidgetsBindingObserver {
   @override
   void initState() {
     super.initState();
+
+    initGlobalSetState(setStateMain);
+
     // Hide app preview by default
     // The desktops don't support app preview hiding at an OS level
     if (Platform.isAndroid || Platform.isIOS) {
@@ -170,15 +181,31 @@ class ViewerAppState extends State<ViewerApp> with WidgetsBindingObserver {
   }
 
   void setStateMain() {
-    logger.d("setState called from child");
+    logger.w("Global setState called");
+
+    // reload ui vars to force a true reload
+    onboardingCompleted = sharedStorage
+        .getBool("general_onboarding_completed")
+        .then((value) => value ?? false);
+    appearanceType = sharedStorage
+        .getString("appearance_launcher_appearance")
+        .then((value) => value ?? "Hedon haven");
+    themeMode = getThemeMode();
+
+    // Set current screen to home
+    _selectedIndex = 0;
+
+    // Clear navigation stack
+    materialAppKey.currentState?.popUntil((route) => route.isFirst);
+
     setState(() {});
   }
 
   @override
   Widget build(BuildContext context) {
     return DynamicColorBuilder(builder: (lightColorScheme, darkColorScheme) {
       return FutureBuilder<ThemeMode?>(
-          future: getThemeMode(),
+          future: themeMode,
           builder: (context, snapshot) {
             return MaterialApp(
               title: "Hedon haven",
@@ -193,12 +220,11 @@ class ViewerAppState extends State<ViewerApp> with WidgetsBindingObserver {
                         primarySwatch: Colors.green,
                         brightness: Brightness.dark),
               ),
-              themeMode: snapshot.data ?? ThemeMode.dark,
+              themeMode: snapshot.data ?? ThemeMode.system,
               navigatorKey: materialAppKey,
               home: Stack(children: [
                 FutureBuilder<bool?>(
-                    future:
-                        sharedStorage.getBool("general_onboarding_completed"),
+                    future: onboardingCompleted,
                     builder: (context, snapshotParent) {
                       // Don't show anything until the future is done
                       if (snapshotParent.connectionState ==
@@ -208,8 +234,7 @@ class ViewerAppState extends State<ViewerApp> with WidgetsBindingObserver {
                       return !snapshotParent.data!
                           ? WelcomeScreen(setStateMain: setStateMain)
                           : FutureBuilder<String?>(
-                              future: sharedStorage
-                                  .getString("appearance_launcher_appearance"),
+                              future: appearanceType,
                               builder: (context, snapshot) {
                                 // Don't show anything until the future is done
                                 if (snapshot.connectionState ==

diff --git a/lib/ui/screens/settings/settings_appearance.dart b/lib/ui/screens/settings/settings_appearance.dart
@@ -51,6 +51,7 @@ class _AppearanceScreenState extends State<AppearanceScreen> {
                           onSelected: (value) async {
                             await sharedStorage.setString(
                                 "appearance_theme_mode", value);
+                            globalSetState();
                             setState(() {});
                           },
                         );

diff --git a/lib/ui/screens/settings/settings_developer.dart b/lib/ui/screens/settings/settings_developer.dart
@@ -114,7 +114,11 @@ class DeveloperScreen extends StatelessWidget {
                               await setDefaultSettings(true);
                               PluginManager.discoverAndLoadPlugins();
                               showToast(
-                                  "All settings have been reset", context);
+                                  "All settings have been reset. Reloading UI in 2 seconds",
+                                  context);
+                              await Future.delayed(const Duration(seconds: 2));
+                              // Reload entire UI
+                              globalSetState();
                             }),
                         ListTile(
                             leading: const Icon(Icons.storage),
@@ -150,6 +154,15 @@ class DeveloperScreen extends StatelessWidget {
                               showToast(
                                   "Icon cache has been refreshed", context);
                             }),
+                        ListTile(
+                            leading: const Icon(Icons.widgets),
+                            title: const Text("Reload entire UI"),
+                            onTap: () async {
+                              showToast(
+                                  "Reloading entire UI in 2 seconds", context);
+                              await Future.delayed(const Duration(seconds: 2));
+                              globalSetState();
+                            }),
                         FutureBuilder<bool?>(
                             future:
                                 sharedStorage.getBool("general_enable_logging"),

diff --git a/lib/utils/global_vars.dart b/lib/utils/global_vars.dart
@@ -12,6 +12,9 @@ late Logger logger;
 late PackageInfo packageInfo;
 late http.Client client;
 
+/// Global visual app reload. MUST be set from initGlobalSetState, NOT from the main initGlobalVars()
+late void Function() globalSetState;
+
 /// This stores the global setting of whether the preview should be hidden
 bool hidePreview = true;
 
@@ -27,6 +30,12 @@ Future<void> initGlobalVars() async {
   await initHttpClient();
 }
 
+// This function is not called by the main initGlobalVars as it has to be set
+// from the UI part of main, not the startup part
+Future<void> initGlobalSetState(void Function() function) async {
+  globalSetState = function;
+}
+
 Future<void> initSharedStorage() async {
   sharedStorage = SharedPreferencesAsync();
 }