Improve dialog handling to allow the update of existing sound sources

theEvilReaper · theEvilReaper · commit 50c2d22bf58f · 2025-11-05T15:30:43.000+01:00
diff --git a/lib/feature/sound/card/small_file_card.dart b/lib/feature/sound/card/small_file_card.dart
@@ -1,9 +1,15 @@
+import 'package:async_redux/async_redux.dart';
 import 'package:flutter/material.dart';
+import 'package:stelaris/api/model/sound/sound_file_source.dart';
+import 'package:stelaris/api/state/actions/sound/sound_file_actions.dart';
 import 'package:stelaris/feature/sound/card/folder_icon.dart';
 import 'package:stelaris/feature/sound/modal/sound_file_modal.dart';
 
 class SmallFileCard extends StatelessWidget {
-  const SmallFileCard({super.key});
+
+  const SmallFileCard({required this.fileSource, super.key});
+
+  final SoundFileSource fileSource;
 
   @override
   Widget build(BuildContext context) {
@@ -19,23 +25,14 @@ class SmallFileCard extends StatelessWidget {
           showDialog(
             context: context,
             builder: (context) => SoundFileModal(
+              initialData: fileSource,
               create: false,
-              onSave: ({
-                required name,
-                required volume,
-                required pitch,
-                required weight,
-                required stream,
-                required attenuationDistance,
-                required preload,
-                required type,
-              }) {
-                // Handle save logic here
-              },
+              onSave: (soundFile) =>
+                  context.dispatch(SoundFileLinkAction(soundFile)),
             ),
           );
         },
-        child: const FolderIcon()
+        child: const FolderIcon(),
       ),
     );
   }
diff --git a/lib/feature/sound/card/sound_card_button.dart b/lib/feature/sound/card/sound_card_button.dart
@@ -1,10 +1,15 @@
+import 'package:async_redux/async_redux.dart';
 import 'package:flutter/material.dart';
+import 'package:stelaris/api/model/sound/sound_file_source.dart';
+import 'package:stelaris/api/state/actions/sound/sound_file_actions.dart';
 import 'package:stelaris/feature/sound/modal/sound_file_modal.dart';
 
 /// The [SoundCardButton] is a widget that displays a specific button on a sound card which triggers a dialog to view sound file details.
 /// It is styled with the theme's secondary container colors and has a rounded rectangle shape.
 class SoundCardButton extends StatelessWidget {
-  const SoundCardButton({super.key});
+  const SoundCardButton({required this.source, super.key});
+
+  final SoundFileSource source;
 
   @override
   Widget build(BuildContext context) {
@@ -20,20 +25,9 @@ class SoundCardButton extends StatelessWidget {
         showDialog(
           context: context,
           builder: (context) => SoundFileModal(
+            initialData: source,
             create: false,
-            onSave:
-                ({
-                  required name,
-                  required volume,
-                  required pitch,
-                  required weight,
-                  required stream,
-                  required attenuationDistance,
-                  required preload,
-                  required type,
-                }) {
-                  // Handle save logic here
-                },
+            onSave: (soundFile) => context.dispatch(SoundFileLinkAction(soundFile))
           ),
         );
       },
diff --git a/lib/feature/sound/card/sound_file_card.dart b/lib/feature/sound/card/sound_file_card.dart
@@ -8,18 +8,19 @@ class SoundFileCard extends StatelessWidget {
 
   static const double _fullCardMinWidth = 230;
 
-  const SoundFileCard({required this.eventModel, super.key});
+  const SoundFileCard({required this.source, super.key});
 
-  final SoundFileSource eventModel;
+  final SoundFileSource source;
 
   @override
   Widget build(BuildContext context) {
+    debugPrint('Build file card with model ' + source.toString());
     final theme = Theme.of(context);
     return LayoutBuilder(
       builder: (context, constraints) {
         // If the card is too narrow, show only the icon centered in a card
         if (constraints.maxWidth < _fullCardMinWidth) {
-          return const SmallFileCard();
+          return SmallFileCard(fileSource: source);
         }
         // Otherwise, show the full card layout
         return Card(
@@ -37,22 +38,22 @@ class SoundFileCard extends StatelessWidget {
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
                       Text(
-                        eventModel.name,
+                        source.name,
                         style: theme.textTheme.titleMedium?.copyWith(
                           color: theme.colorScheme.onSurface,
                         ),
                       ),
                       const SizedBox(height: 4),
                       Text(
-                        eventModel.name,
+                        source.name,
                         style: theme.textTheme.bodySmall?.copyWith(
                           color: theme.colorScheme.onSurfaceVariant,
                         ),
                       ),
                     ],
                   ),
                 ),
-                const SoundCardButton()
+                SoundCardButton(source: source)
               ],
             ),
           ),
diff --git a/lib/feature/sound/modal/section/string_field_section.dart b/lib/feature/sound/modal/section/string_field_section.dart
@@ -1,8 +1,16 @@
 import 'package:flutter/material.dart';
 import 'package:stelaris/feature/sound/modal/section/base_section.dart';
+import 'package:stelaris/util/typedefs.dart';
 
 class StringInputSection extends StatefulWidget {
-  const StringInputSection({super.key});
+  const StringInputSection({
+    required this.onUpdate,
+    required this.initialValue,
+    super.key,
+  });
+
+  final String initialValue;
+  final ValueUpdate<String> onUpdate;
 
   @override
   State<StringInputSection> createState() => _StringInputSectionState();
@@ -15,22 +23,24 @@ class _StringInputSectionState extends State<StringInputSection> {
   @override
   void initState() {
     super.initState();
-    _controller = TextEditingController();
+    _controller = TextEditingController(text: widget.initialValue);
   }
 
   @override
   Widget build(BuildContext context) {
     final colorScheme = Theme.of(context).colorScheme;
     final outlineBorder = OutlineInputBorder(
       borderRadius: _borderRadius,
-      borderSide: BorderSide(
-        color: colorScheme.outline,
-      ),
+      borderSide: BorderSide(color: colorScheme.outline),
     );
     return BaseSection(
       title: 'Name',
       child: TextField(
         controller: _controller,
+        onChanged: (value) {
+          if (value.isNotEmpty && value.trim().isEmpty) return;
+          widget.onUpdate(value);
+        },
         decoration: InputDecoration(
           hintText: 'Enter your sound name',
           hintStyle: TextStyle(color: colorScheme.onSurfaceVariant),
diff --git a/lib/feature/sound/modal/sound_file_modal.dart b/lib/feature/sound/modal/sound_file_modal.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'package:stelaris/api/model/sound/sound_file_source.dart';
 import 'package:stelaris/feature/base/button/cancel_button.dart';
 import 'package:stelaris/feature/sound/modal/section/base_section.dart';
 import 'package:stelaris/feature/sound/modal/type/integer_fields_section.dart';
@@ -8,38 +9,54 @@ import 'package:stelaris/feature/sound/modal/type/volume_section.dart';
 import 'section/string_field_section.dart';
 
 class SoundFileModal extends StatefulWidget {
-  final void Function({
-    required String name,
-    required double volume,
-    required double pitch,
-    required int weight,
-    required bool stream,
-    required int attenuationDistance,
-    required bool preload,
-    required String type,
-  })?
-  onSave;
 
-  final bool create;
+  const SoundFileModal({
+    required this.create,
+    required this.onSave,
+    this.initialData,
+    super.key,
+  });
 
-  const SoundFileModal({required this.create, required this.onSave, super.key});
+  final void Function(SoundFileSource soundFile)? onSave;
+  final bool create;
+  final SoundFileSource? initialData;
 
   @override
   State<SoundFileModal> createState() => _SoundFileModalState();
 }
 
+
 class _SoundFileModalState extends State<SoundFileModal> {
-  String _name = '';
-  double _volume = 1;
-  double _pitch = 1;
-  int _weight = 1;
-  bool _stream = true;
-  int _attenuationDistance = 16;
-  bool _preload = false;
-  String _type = 'file';
+  late String _name;
+  late double _volume;
+  late double _pitch;
+  late int _weight;
+  late bool _stream;
+  late int _attenuationDistance;
+  late bool _preload;
+  late String _type;
 
   final _formKey = GlobalKey<FormState>();
 
+  @override
+  void initState() {
+    super.initState();
+    debugPrint('Read data from');
+    if (widget.initialData != null) {
+      debugPrint('Exsts');
+      debugPrint(widget.initialData!.toString());
+    }
+    final data = widget.initialData;
+    _name = data?.name ?? '';
+    _volume = data?.volume ?? 1;
+    _pitch = data?.pitch ?? 1;
+    _weight = data?.weight ?? 1;
+    _stream = true;
+    _attenuationDistance = data?.attenuationDistance ?? 16;
+    _preload = data?.preload ?? false;
+    _type = data?.type ?? 'file';
+  }
+
   @override
   Widget build(BuildContext context) {
     final media = MediaQuery.of(context);
@@ -67,7 +84,10 @@ class _SoundFileModalState extends State<SoundFileModal> {
                     style: Theme.of(context).textTheme.titleLarge,
                   ),
                   const SizedBox(height: 24),
-                  const StringInputSection(),
+                  StringInputSection(
+                    initialValue: _name,
+                    onUpdate: (value) => _name = value,
+                  ),
                   const SizedBox(height: 16),
                   VolumeSection(
                     initialPitch: _pitch,
@@ -133,15 +153,17 @@ class _SoundFileModalState extends State<SoundFileModal> {
                         onPressed: () {
                           if (_formKey.currentState?.validate() ?? false) {
                             widget.onSave?.call(
-                              name: _name,
-                              volume: _volume,
-                              pitch: _pitch,
-                              weight: _weight,
-                              stream: _stream,
-                              attenuationDistance: _attenuationDistance,
-                              preload: _preload,
-                              type: _type,
+                              SoundFileSource(
+                                name: _name,
+                                volume: _volume,
+                                pitch: _pitch,
+                                weight: _weight,
+                                attenuationDistance: _attenuationDistance,
+                                preload: _preload,
+                                type: _type,
+                              ),
                             );
+
                             Navigator.pop(context);
                           }
                         },
diff --git a/lib/feature/sound/sound_file_entries.dart b/lib/feature/sound/sound_file_entries.dart
@@ -78,29 +78,7 @@ class _SoundFileEntriesState extends State<SoundFileEntryPage> {
       builder: (context) =>
           SoundFileModal(
             create: true,
-            onSave:
-                ({
-              required name,
-              required volume,
-              required pitch,
-              required weight,
-              required stream,
-              required attenuationDistance,
-              required preload,
-              required type,
-            }) {
-              final SoundFileSource fileSource = SoundFileSource(
-                name: 'Test',
-                volume: volume,
-                pitch: pitch,
-                attenuationDistance: attenuationDistance,
-                preload: preload,
-                type: type,
-                weight: weight,
-              );
-              context.dispatch(SoundFileLinkAction(fileSource));
-              // Handle save logic here
-            },
+            onSave: (soundFile) => context.dispatch(SoundFileLinkAction(soundFile))
           ),
     );
   }
@@ -123,7 +101,7 @@ class _SoundFileEntriesState extends State<SoundFileEntryPage> {
             minWidth: 220,
             maxWidth: 400,
           ),
-          child: SoundFileCard(eventModel: files.items[index]),
+          child: SoundFileCard(source: files.items[index]),
         );
       },
     );
