Add variations and background editor

CodeDoctorDE · CodeDoctorDE · commit dc73b98caa3b · 2025-01-10T19:37:08.000+01:00
diff --git a/app/lib/pages/editor/backgrounds.dart b/app/lib/pages/editor/backgrounds.dart
@@ -4,6 +4,7 @@ import 'package:flutter_gen/gen_l10n/app_localizations.dart';
 import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:setonix/bloc/editor.dart';
+import 'package:setonix/pages/editor/textures.dart';
 import 'package:setonix_api/setonix_api.dart';
 
 class BackgroundsEditorPage extends StatelessWidget {
@@ -31,6 +32,15 @@ class BackgroundsEditorPage extends StatelessWidget {
                       },
                       child: ListTile(
                         title: Text(id),
+                        onTap: () {
+                          showDialog(
+                            context: context,
+                            builder: (context) => BlocProvider.value(
+                              value: cubit,
+                              child: BackgroundEditorDialog(name: id),
+                            ),
+                          );
+                        },
                         trailing: IconButton(
                           icon: const Icon(PhosphorIconsLight.trash),
                           onPressed: () {
@@ -63,3 +73,82 @@ class BackgroundsEditorPage extends StatelessWidget {
     );
   }
 }
+
+class BackgroundEditorDialog extends StatefulWidget {
+  final String name;
+
+  const BackgroundEditorDialog({
+    super.key,
+    required this.name,
+  });
+
+  @override
+  State<BackgroundEditorDialog> createState() => _BackgroundEditorDialogState();
+}
+
+class _BackgroundEditorDialogState extends State<BackgroundEditorDialog> {
+  BackgroundDefinition? _value;
+  late PackTranslation _translation;
+
+  @override
+  void initState() {
+    super.initState();
+    final editorState = context.read<EditorCubit>().state;
+    _value = editorState.getBackground(widget.name);
+    _translation = editorState.getTranslationOrDefault();
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final value = _value;
+    if (value == null) {
+      return const SizedBox();
+    }
+    return ResponsiveAlertDialog(
+      title: Text(widget.name),
+      constraints: const BoxConstraints(
+          maxWidth: LeapBreakpoints.compact, maxHeight: 600),
+      content: ListView(
+        shrinkWrap: true,
+        children: [
+          TextFormField(
+            decoration: InputDecoration(
+              labelText: AppLocalizations.of(context).name,
+              filled: true,
+              icon: const Icon(PhosphorIconsLight.textT),
+            ),
+            initialValue: _translation.backgrounds[widget.name]?.name,
+            onChanged: (value) {
+              final translation = BackgroundTranslation(name: value);
+              _translation = _translation.copyWith.backgrounds
+                  .put(widget.name, translation);
+            },
+          ),
+          const SizedBox(height: 8),
+          VisualEditingView(
+              value: value,
+              onChanged: (value) {
+                setState(() {
+                  _value = value;
+                });
+              }),
+        ],
+      ),
+      actions: [
+        TextButton(
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+          child: Text(AppLocalizations.of(context).cancel),
+        ),
+        ElevatedButton(
+          onPressed: () {
+            context.read<EditorCubit>().setBackground(widget.name, value);
+            Navigator.of(context).pop();
+          },
+          child: Text(AppLocalizations.of(context).save),
+        ),
+      ],
+    );
+  }
+}
diff --git a/app/lib/pages/editor/figures.dart b/app/lib/pages/editor/figures.dart
@@ -93,7 +93,7 @@ class FigureEditorDialog extends StatefulWidget {
 }
 
 class _FigureEditorDialogState extends State<FigureEditorDialog> {
-  late FigureDefinition? _value;
+  FigureDefinition? _value;
   late PackTranslation _translation;
 
   @override
@@ -188,6 +188,27 @@ class _FigureEditorDialogState extends State<FigureEditorDialog> {
                                 final variation = variations[index];
                                 return ListTile(
                                   title: Text(variation.key),
+                                  onTap: () async {
+                                    final bloc = context.read<EditorCubit>();
+                                    final result =
+                                        await showDialog<VariationDefinition>(
+                                      context: context,
+                                      builder: (context) => BlocProvider.value(
+                                        value: bloc,
+                                        child: _FigureVariationEditorDialog(
+                                          name: variation.key,
+                                          value: variation.value,
+                                        ),
+                                      ),
+                                    );
+                                    if (result == null) return;
+                                    setState(() {
+                                      _value = value.copyWith.variations.put(
+                                        variation.key,
+                                        result,
+                                      );
+                                    });
+                                  },
                                   trailing: IconButton(
                                     icon: const Icon(PhosphorIconsLight.trash),
                                     onPressed: () {
@@ -255,3 +276,56 @@ class _FigureEditorDialogState extends State<FigureEditorDialog> {
     );
   }
 }
+
+class _FigureVariationEditorDialog extends StatefulWidget {
+  final String name;
+  final VariationDefinition value;
+
+  const _FigureVariationEditorDialog({
+    super.key,
+    required this.name,
+    required this.value,
+  });
+
+  @override
+  State<_FigureVariationEditorDialog> createState() =>
+      __FigureVariationEditorDialogState();
+}
+
+class __FigureVariationEditorDialogState
+    extends State<_FigureVariationEditorDialog> {
+  late VariationDefinition _value;
+
+  @override
+  void initState() {
+    super.initState();
+    _value = widget.value;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return ResponsiveAlertDialog(
+      title: Text(widget.name),
+      content: VisualEditingView(
+        value: _value,
+        onChanged: (v) => setState(() {
+          _value = v;
+        }),
+      ),
+      actions: [
+        TextButton(
+          onPressed: () {
+            Navigator.of(context).pop();
+          },
+          child: Text(AppLocalizations.of(context).cancel),
+        ),
+        ElevatedButton(
+          onPressed: () {
+            Navigator.of(context).pop(_value);
+          },
+          child: Text(AppLocalizations.of(context).save),
+        ),
+      ],
+    );
+  }
+}
diff --git a/app/macos/Flutter/GeneratedPluginRegistrant.swift b/app/macos/Flutter/GeneratedPluginRegistrant.swift
@@ -8,7 +8,7 @@ import Foundation
 import device_info_plus
 import dynamic_color
 import file_selector_macos
-import flutter_secure_storage_macos
+import flutter_secure_storage_darwin
 import package_info_plus
 import path_provider_foundation
 import screen_retriever_macos
@@ -21,7 +21,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
-  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
+  FlutterSecureStorageDarwinPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageDarwinPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   ScreenRetrieverMacosPlugin.register(with: registry.registrar(forPlugin: "ScreenRetrieverMacosPlugin"))
diff --git a/app/pubspec.lock b/app/pubspec.lock
@@ -458,26 +458,26 @@ packages:
     dependency: "direct main"
     description:
       name: flutter_secure_storage
-      sha256: "127f5ab0b6402baa7a3322bddb419a22874f7b5b1e12c9946e329c7f846d8e4e"
+      sha256: f7eceb0bc6f4fd0441e29d43cab9ac2a1c5ffd7ea7b64075136b718c46954874
       url: "https://pub.dev"
     source: hosted
-    version: "10.0.0-beta.3"
-  flutter_secure_storage_linux:
+    version: "10.0.0-beta.4"
+  flutter_secure_storage_darwin:
     dependency: transitive
     description:
-      name: flutter_secure_storage_linux
-      sha256: b777e220fbf21c149574aa31f9e4ed56dcf025c4ef196664fe90954c265105dc
+      name: flutter_secure_storage_darwin
+      sha256: f226f2a572bed96bc6542198ebaec227150786e34311d455a7e2d3d06d951845
       url: "https://pub.dev"
     source: hosted
-    version: "2.0.0"
-  flutter_secure_storage_macos:
+    version: "0.1.0"
+  flutter_secure_storage_linux:
     dependency: transitive
     description:
-      name: flutter_secure_storage_macos
-      sha256: "75894eb6b402ac7f7f5ee5487d651b87855a338e26eb6993f4b2fce33013a615"
+      name: flutter_secure_storage_linux
+      sha256: b777e220fbf21c149574aa31f9e4ed56dcf025c4ef196664fe90954c265105dc
       url: "https://pub.dev"
     source: hosted
-    version: "4.0.0"
+    version: "2.0.0"
   flutter_secure_storage_platform_interface:
     dependency: transitive
     description:
@@ -1051,10 +1051,10 @@ packages:
     dependency: transitive
     description:
       name: shared_preferences_android
-      sha256: "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d"
+      sha256: bf808be89fe9dc467475e982c1db6c2faf3d2acf54d526cd5ec37d86c99dbd84
       url: "https://pub.dev"
     source: hosted
-    version: "2.4.0"
+    version: "2.4.1"
   shared_preferences_foundation:
     dependency: transitive
     description:
@@ -1297,10 +1297,10 @@ packages:
     dependency: transitive
     description:
       name: url_launcher_windows
-      sha256: "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4"
+      sha256: "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77"
       url: "https://pub.dev"
     source: hosted
-    version: "3.1.3"
+    version: "3.1.4"
   uuid:
     dependency: transitive
     description:
diff --git a/docs/package.json b/docs/package.json
@@ -11,18 +11,18 @@
   },
   "dependencies": {
     "@astrojs/check": "^0.9.4",
-    "@astrojs/react": "^4.1.2",
+    "@astrojs/react": "^4.1.3",
     "@astrojs/starlight": "^0.30.5",
     "@phosphor-icons/react": "^2.1.7",
-    "@types/react": "^19.0.3",
+    "@types/react": "^19.0.4",
     "@types/react-dom": "^19.0.2",
-    "astro": "^5.1.3",
+    "astro": "^5.1.5",
     "react": "^19.0.0",
     "react-dom": "^19.0.0",
     "remark-gemoji": "^8.0.0",
     "remark-heading-id": "^1.0.1",
     "sharp": "^0.33.5",
-    "typescript": "^5.7.2"
+    "typescript": "^5.7.3"
   },
   "packageManager": "pnpm@10.0.0",
   "devDependencies": {
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
