Split the Advanced Mode toggle into its own widget

Author: TechnicJelle

build.yaml

@@ -15,3 +15,4 @@ targets:
         generate_for:
           - lib/project_configs_provider.dart
           - lib/project_view/configs/models/*.dart
+          - lib/project_view/configs/config_gui.dart

lib/project_view/configs/config_gui.dart

@@ -1,96 +1,106 @@
 import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:freezed_annotation/freezed_annotation.dart";
 
 import "../../project_configs_provider.dart";
 import "advanced_editor.dart";
 import "models/base.dart";
 import "views/base.dart";
 
-class AdvancedModeNotifier extends Notifier<bool> {
+part "config_gui.freezed.dart";
+
+@freezed
+sealed class AdvancedMode with _$AdvancedMode {
+  // The function name and lack of other parameters makes it clear enough
+  // ignore: avoid_positional_boolean_parameters
+  const factory AdvancedMode.data(bool value) = AdvancedModeData;
+
+  const factory AdvancedMode.loading() = AdvancedModeLoading;
+}
+
+class AdvancedModeNotifier extends Notifier<AdvancedMode> {
   @override
-  bool build() {
-    return false;
+  AdvancedMode build() {
+    return const .data(false);
   }
 
   // The function name and lack of other parameters makes it clear enough
-  // ignore: avoid_positional_boolean_parameters, use_setters_to_change_properties
+  // ignore: avoid_positional_boolean_parameters
   void set(bool newState) {
-    state = newState;
+    if (newState) {
+      // advanced mode was just enabled; that goes instantly
+      state = .data(newState);
+    } else {
+      // advanced mode was just disabled, so we need to re-read the file into the models again
+      state = const .loading();
+      // wait a frame for the file to be properly saved on dispose of the advanced editor
+      // this cannot be called there, because it's not allowed to red.read in a dispose()
+      WidgetsBinding.instance.addPostFrameCallback((_) async {
+        final ConfigFile openConfig = ref.read(openConfigProvider)!;
+        await ref.read(projectProviderNotifier).refreshConfigFile(openConfig.file);
+        state = .data(newState);
+      });
+    }
   }
 }
 
-// I don't want these for providers; too long
-// ignore: specify_nonobvious_property_types
-final advancedModeProvider = NotifierProvider(AdvancedModeNotifier.new);
-
-class ConfigGUI extends ConsumerStatefulWidget {
+class ConfigGUI extends ConsumerWidget {
   const ConfigGUI({super.key});
 
   @override
-  ConsumerState<ConfigGUI> createState() => _ConfigGUIState();
-}
-
-class _ConfigGUIState extends ConsumerState<ConfigGUI> {
-  bool loading = false;
-
-  @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final ConfigFile openConfig = ref.watch(openConfigProvider)!;
-    final bool advancedMode = ref.watch(advancedModeProvider);
+    final AdvancedMode advancedMode = ref.watch(advancedModeProvider);
 
     return Stack(
       children: [
-        if (loading)
-          const Center(child: CircularProgressIndicator())
-        else if (advancedMode)
-          AdvancedEditor(openConfig)
-        else
-          BaseConfigView(openConfig),
-        Align(
-          alignment: .topRight,
-          child: Padding(
-            padding: const EdgeInsets.only(right: 12, top: 8),
-            child: Row(
-              mainAxisSize: .min,
-              children: [
-                Text(
-                  "Advanced Mode",
-                  style: TextStyle(
-                    color: advancedMode
-                        ? Colors.white
-                        : TextTheme.of(context).bodyLarge?.color,
-                  ),
-                ),
-                Switch(
-                  value: advancedMode,
-                  onChanged: loading
-                      ? null
-                      : (bool justSwitchedToAdvancedMode) async {
-                          ref
-                              .read(advancedModeProvider.notifier)
-                              .set(justSwitchedToAdvancedMode);
-                          setState(() {
-                            if (!justSwitchedToAdvancedMode) loading = true;
-                          });
+        advancedMode.when(
+          data: (val) => val ? AdvancedEditor(openConfig) : BaseConfigView(openConfig),
+          loading: () => const Center(child: CircularProgressIndicator()),
+        ),
+        const AdvancedModeToggle(),
+      ],
+    );
+  }
+}
 
-                          // advanced mode was just disabled, so we need to re-read the file into the models again
-                          if (!justSwitchedToAdvancedMode) {
-                            //wait a frame for the file to be properly saved on dispose of the advanced editor
-                            //this cannot be called there, because it's not allowed to red.read in a dispose()
-                            WidgetsBinding.instance.addPostFrameCallback((_) async {
-                              await ref
-                                  .read(projectProviderNotifier)
-                                  .refreshConfigFile(openConfig.file);
-                              setState(() => loading = false);
-                            });
-                          }
-                        },
-                ),
-              ],
+// I don't want these for providers; too long
+// ignore: specify_nonobvious_property_types
+final advancedModeProvider = NotifierProvider(AdvancedModeNotifier.new);
+
+class AdvancedModeToggle extends ConsumerWidget {
+  const AdvancedModeToggle({super.key});
+
+  @override
+  Widget build(BuildContext context, WidgetRef ref) {
+    final AdvancedMode advancedMode = ref.watch(advancedModeProvider);
+    final bool enabled = advancedMode.when(data: (value) => value, loading: () => true);
+    final bool loading = advancedMode is AdvancedModeLoading;
+
+    return Align(
+      alignment: .topRight,
+      child: Padding(
+        padding: const EdgeInsets.only(right: 12, top: 8),
+        child: Row(
+          mainAxisSize: .min,
+          children: [
+            Text(
+              "Advanced Mode",
+              style: TextStyle(
+                color: enabled ? Colors.white : TextTheme.of(context).bodyLarge?.color,
+              ),
+            ),
+            Switch(
+              value: enabled,
+              onChanged: loading
+                  ? null
+                  : (bool justSwitchedToAdvancedMode) => ref
+                        .read(advancedModeProvider.notifier)
+                        .set(justSwitchedToAdvancedMode),
             ),
-          ),
+          ],
         ),
-      ],
+      ),
     );
   }
 }