Inline the Config GUI widget into its sole parent

Author: TechnicJelle

build.yaml

@@ -15,4 +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/advanced_mode_toggle.dart

lib/project_view/configs/config_gui.dart …t_view/configs/advanced_mode_toggle.dartlib/project_view/configs/config_gui.dart renamed to lib/project_view/configs/advanced_mode_toggle.dart lib/project_view/configs/config_gui.dart renamed to lib/project_view/configs/advanced_mode_toggle.dart

@@ -3,11 +3,9 @@ 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";
 
-part "config_gui.freezed.dart";
+part "advanced_mode_toggle.freezed.dart";
 
 @freezed
 sealed class AdvancedMode with _$AdvancedMode {
@@ -44,26 +42,6 @@ class AdvancedModeNotifier extends Notifier<AdvancedMode> {
   }
 }
 
-class ConfigGUI extends ConsumerWidget {
-  const ConfigGUI({super.key});
-
-  @override
-  Widget build(BuildContext context, WidgetRef ref) {
-    final ConfigFile openConfig = ref.watch(openConfigProvider)!;
-    final AdvancedMode advancedMode = ref.watch(advancedModeProvider);
-
-    return Stack(
-      children: [
-        advancedMode.when(
-          data: (val) => val ? AdvancedEditor(openConfig) : BaseConfigView(openConfig),
-          loading: () => const Center(child: CircularProgressIndicator()),
-        ),
-        const AdvancedModeToggle(),
-      ],
-    );
-  }
-}
-
 // I don't want these for providers; too long
 // ignore: specify_nonobvious_property_types
 final advancedModeProvider = NotifierProvider(AdvancedModeNotifier.new);

…ect_view/configs/config_gui.freezed.dart …onfigs/advanced_mode_toggle.freezed.dartlib/project_view/configs/config_gui.freezed.dart renamed to lib/project_view/configs/advanced_mode_toggle.freezed.dart lib/project_view/configs/config_gui.freezed.dart renamed to lib/project_view/configs/advanced_mode_toggle.freezed.dart

@@ -8,7 +8,7 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
 
 import "../../../main_menu/settings/setting_heading.dart";
 import "../../../utils.dart";
-import "../config_gui.dart";
+import "../advanced_mode_toggle.dart";
 import "../models/base.dart";
 import "../models/core.dart";
 import "../models/map.dart";

lib/project_view/configs/views/base.dart

@@ -2,7 +2,10 @@ import "package:flutter/material.dart";
 import "package:flutter_riverpod/flutter_riverpod.dart";
 
 import "../project_configs_provider.dart";
-import "configs/config_gui.dart";
+import "configs/advanced_editor.dart";
+import "configs/advanced_mode_toggle.dart";
+import "configs/models/base.dart";
+import "configs/views/base.dart";
 import "control_panel.dart";
 import "sidebar/project_sidebar.dart";
 
@@ -11,16 +14,27 @@ class ProjectView extends ConsumerWidget {
 
   @override
   Widget build(BuildContext context, WidgetRef ref) {
-    final bool isConfigOpen = ref.watch(
-      openConfigProvider.select((config) => config != null),
-    );
+    final ConfigFile? openConfig = ref.watch(openConfigProvider);
+    final AdvancedMode advancedMode = ref.watch(advancedModeProvider);
 
     return Row(
       crossAxisAlignment: CrossAxisAlignment.stretch,
       children: [
         const ProjectSidebar(),
         Expanded(
-          child: isConfigOpen ? const ConfigGUI() : const ControlPanel(),
+          child: openConfig == null
+              ? const ControlPanel()
+              : Stack(
+                  children: [
+                    advancedMode.when(
+                      data: (value) => value
+                          ? AdvancedEditor(openConfig)
+                          : BaseConfigView(openConfig),
+                      loading: () => const Center(child: CircularProgressIndicator()),
+                    ),
+                    const AdvancedModeToggle(),
+                  ],
+                ),
         ),
       ],
     );

lib/project_view/project_view.dart

@@ -3,7 +3,7 @@ import "package:flutter_riverpod/flutter_riverpod.dart";
 
 import "../../project_configs_provider.dart";
 import "../../sidebar.dart";
-import "../configs/config_gui.dart";
+import "../configs/advanced_mode_toggle.dart";
 import "../configs/models/base.dart";
 import "../configs/models/map.dart";
 import "../control_row/control_row.dart";