Fix layout of dialogs

CodeDoctorDE · CodeDoctorDE · commit 18811dcb73b8 · 2025-05-19T11:28:25.000+02:00
diff --git a/api/pubspec.lock b/api/pubspec.lock
@@ -318,10 +318,10 @@ packages:
     dependency: transitive
     description:
       name: meta
-      sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+      sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
       url: "https://pub.dev"
     source: hosted
-    version: "1.16.0"
+    version: "1.17.0"
   mime:
     dependency: transitive
     description:
diff --git a/app/lib/pages/alarm/countdown.dart b/app/lib/pages/alarm/countdown.dart
@@ -62,7 +62,7 @@ class _AlarmCountdownPageState extends State<AlarmCountdownPage> {
           children: [
             FittedBox(
               child: Text(
-                '${_duration.inDays}:${_duration.inHours % 24}:${(_duration.inMinutes % 60).toString().padLeft(2, '0')}:${(_duration.inSeconds % 60).toString().padLeft(2, '0')}',
+                '${_duration.inDays}:${(_duration.inHours % 24).toString().padLeft(2, '0')}:${(_duration.inMinutes % 60).toString().padLeft(2, '0')}:${(_duration.inSeconds % 60).toString().padLeft(2, '0')}',
                 style: TextStyle(
                   fontSize: fontSize.toDouble(),
                   fontWeight: FontWeight.w900,
@@ -72,11 +72,12 @@ class _AlarmCountdownPageState extends State<AlarmCountdownPage> {
             const SizedBox(height: 20),
             Text(
               _alarm.title,
-              style: Theme.of(context).textTheme.headlineMedium,
+              style: TextTheme.of(context).headlineLarge,
             ),
             const SizedBox(height: 4),
             Text(
               DateFormat.yMMMMEEEEd().format(_alarm.date),
+              style: TextTheme.of(context).bodyLarge,
             ),
             Text(
               DateFormat.Hm().format(_alarm.date),
diff --git a/app/lib/pages/notes/label.dart b/app/lib/pages/notes/label.dart
@@ -30,7 +30,7 @@ class LabelDialog extends StatelessWidget {
     var currentSource = source ?? '';
     var currentService =
         context.read<FlowCubit>().getService(currentSource).label;
-    return AlertDialog(
+    return ResponsiveAlertDialog(
       title: Row(
         mainAxisSize: MainAxisSize.min,
         children: [
@@ -56,45 +56,42 @@ class LabelDialog extends StatelessWidget {
               : AppLocalizations.of(context).editLabel),
         ],
       ),
-      content: SizedBox(
-        width: 500,
-        child: Column(children: [
-          if (source == null) ...[
-            SourceDropdown<LabelService>(
-              value: currentSource,
-              buildService: (e) => e.label,
-              onChanged: (connected) {
-                currentSource = connected?.source ?? '';
-              },
-            ),
-            const SizedBox(height: 16),
-          ],
-          TextFormField(
-            decoration: InputDecoration(
-              labelText: AppLocalizations.of(context).name,
-              filled: true,
-              icon: const PhosphorIcon(PhosphorIconsLight.fileText),
-            ),
-            initialValue: currentLabel.name,
-            onChanged: (value) {
-              currentLabel = currentLabel.copyWith(name: value);
+      constraints: const BoxConstraints(maxWidth: LeapBreakpoints.compact),
+      content: ListView(shrinkWrap: true, children: [
+        if (source == null) ...[
+          SourceDropdown<LabelService>(
+            value: currentSource,
+            buildService: (e) => e.label,
+            onChanged: (connected) {
+              currentSource = connected?.source ?? '';
             },
           ),
           const SizedBox(height: 16),
-          MarkdownField(
-            decoration: InputDecoration(
-              labelText: AppLocalizations.of(context).description,
-              border: const OutlineInputBorder(),
-              icon: const PhosphorIcon(PhosphorIconsLight.fileText),
-            ),
-            value: currentLabel.description,
-            onChanged: (value) {
-              currentLabel = currentLabel.copyWith(description: value);
-            },
-          )
-        ]),
-      ),
-      scrollable: true,
+        ],
+        TextFormField(
+          decoration: InputDecoration(
+            labelText: AppLocalizations.of(context).name,
+            filled: true,
+            icon: const PhosphorIcon(PhosphorIconsLight.fileText),
+          ),
+          initialValue: currentLabel.name,
+          onChanged: (value) {
+            currentLabel = currentLabel.copyWith(name: value);
+          },
+        ),
+        const SizedBox(height: 16),
+        MarkdownField(
+          decoration: InputDecoration(
+            labelText: AppLocalizations.of(context).description,
+            border: const OutlineInputBorder(),
+            icon: const PhosphorIcon(PhosphorIconsLight.fileText),
+          ),
+          value: currentLabel.description,
+          onChanged: (value) {
+            currentLabel = currentLabel.copyWith(description: value);
+          },
+        )
+      ]),
       actions: [
         TextButton(
           onPressed: () => Navigator.of(context).pop(),
diff --git a/app/lib/pages/resources/resource.dart b/app/lib/pages/resources/resource.dart
@@ -39,7 +39,7 @@ class ResourceDialog extends StatelessWidget {
       title: Text(create
           ? AppLocalizations.of(context).createResource
           : AppLocalizations.of(context).editResource),
-      constraints: const BoxConstraints(maxWidth: 600, maxHeight: 800),
+      constraints: const BoxConstraints(maxWidth: 600, maxHeight: 500),
       content: DefaultTabController(
         length: tabs ? 3 : 1,
         child: Column(
diff --git a/app/lib/pages/users/user.dart b/app/lib/pages/users/user.dart
@@ -3,6 +3,7 @@ import 'package:flow_api/models/model.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flow/src/generated/i18n/app_localizations.dart';
+import 'package:material_leap/material_leap.dart';
 import 'package:phosphor_flutter/phosphor_flutter.dart';
 import 'package:flow_api/models/user/model.dart';
 import 'package:flow_api/models/user/service.dart';
@@ -23,50 +24,47 @@ class UserDialog extends StatelessWidget {
     var currentSource = source ?? '';
     var currentService =
         context.read<FlowCubit>().getService(currentSource).user;
-    return AlertDialog(
+    return ResponsiveAlertDialog(
       title: Text(source == null
           ? AppLocalizations.of(context).createUser
           : AppLocalizations.of(context).editUser),
-      content: SizedBox(
-        width: 500,
-        child: Column(children: [
-          if (source == null) ...[
-            SourceDropdown<UserService>(
-              value: currentSource,
-              buildService: (e) => e.user,
-              onChanged: (connected) {
-                currentSource = connected?.source ?? '';
-                currentService = connected?.model;
-              },
-            ),
-          ],
-          const SizedBox(height: 16),
-          TextFormField(
-            decoration: InputDecoration(
-              labelText: AppLocalizations.of(context).name,
-              filled: true,
-              icon: const PhosphorIcon(PhosphorIconsLight.fileText),
-            ),
-            initialValue: currentUser.name,
-            onChanged: (value) {
-              currentUser = currentUser.copyWith(name: value);
+      constraints: const BoxConstraints(maxWidth: LeapBreakpoints.compact),
+      content: ListView(shrinkWrap: true, children: [
+        if (source == null) ...[
+          SourceDropdown<UserService>(
+            value: currentSource,
+            buildService: (e) => e.user,
+            onChanged: (connected) {
+              currentSource = connected?.source ?? '';
+              currentService = connected?.model;
             },
           ),
-          const SizedBox(height: 16),
-          MarkdownField(
-            decoration: InputDecoration(
-              labelText: AppLocalizations.of(context).description,
-              border: const OutlineInputBorder(),
-              icon: const PhosphorIcon(PhosphorIconsLight.fileText),
-            ),
-            value: currentUser.description,
-            onChanged: (value) {
-              currentUser = currentUser.copyWith(description: value);
-            },
+        ],
+        const SizedBox(height: 16),
+        TextFormField(
+          decoration: InputDecoration(
+            labelText: AppLocalizations.of(context).name,
+            filled: true,
+            icon: const PhosphorIcon(PhosphorIconsLight.fileText),
+          ),
+          initialValue: currentUser.name,
+          onChanged: (value) {
+            currentUser = currentUser.copyWith(name: value);
+          },
+        ),
+        const SizedBox(height: 16),
+        MarkdownField(
+          decoration: InputDecoration(
+            labelText: AppLocalizations.of(context).description,
+            border: const OutlineInputBorder(),
+            icon: const PhosphorIcon(PhosphorIconsLight.fileText),
           ),
-        ]),
-      ),
-      scrollable: true,
+          value: currentUser.description,
+          onChanged: (value) {
+            currentUser = currentUser.copyWith(description: value);
+          },
+        ),
+      ]),
       actions: [
         TextButton(
           onPressed: () => Navigator.of(context).pop(),
diff --git a/app/lib/widgets/markdown_field.dart b/app/lib/widgets/markdown_field.dart
@@ -82,6 +82,7 @@ class _MarkdownFieldState extends State<MarkdownField> {
                   ],
                 )
               : Column(
+                  mainAxisSize: MainAxisSize.min,
                   children: [
                     SizedBox(height: widget.toolbar?.height),
                     GestureDetector(
diff --git a/docs/package.json b/docs/package.json
@@ -13,10 +13,10 @@
     "@astrojs/check": "^0.9.4",
     "@astrojs/react": "^4.2.7",
     "@astrojs/starlight": "^0.34.3",
-    "@phosphor-icons/react": "^2.1.7",
+    "@phosphor-icons/react": "^2.1.8",
     "@types/react": "^19.1.4",
     "@types/react-dom": "^19.1.5",
-    "astro": "^5.7.12",
+    "astro": "^5.7.13",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
     "remark-gemoji": "^8.0.0",
@@ -26,7 +26,7 @@
   "packageManager": "pnpm@10.10.0",
   "devDependencies": {
     "@vite-pwa/astro": "^1.1.0",
-    "sass": "^1.88.0",
+    "sass": "^1.89.0",
     "sharp": "^0.34.1",
     "vite-plugin-pwa": "^1.0.0",
     "workbox-window": "^7.3.0"
diff --git a/docs/pnpm-lock.yaml b/docs/pnpm-lock.yaml
diff --git a/metadata/en-US/changelogs/12.txt b/metadata/en-US/changelogs/12.txt
diff --git a/tools/pubspec.lock b/tools/pubspec.lock

Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,7 @@ class _MarkdownFieldState extends State<MarkdownField> {`
`82`	`82`	`],`
`83`	`83`	`)`
`84`	`84`	`: Column(`
	`85`	`+ mainAxisSize: MainAxisSize.min,`
`85`	`86`	`children: [`
`86`	`87`	`SizedBox(height: widget.toolbar?.height),`
`87`	`88`	`GestureDetector(`