Merge branch 'master' into feature/samples-tabs

forus-labs · Jun 25, 2024 · fcebbdb · fcebbdb
2 parents 0c059c7 + cc075d7
commit fcebbdb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 36 deletions.
diff --git a/forui/example/lib/main.dart b/forui/example/lib/main.dart
@@ -45,30 +45,31 @@ class _ExampleWidgetState extends State<ExampleWidget> {
   Widget build(BuildContext context) => Padding(
         padding: const EdgeInsets.all(8.0),
         child: Column(
+          mainAxisSize: MainAxisSize.min,
           crossAxisAlignment: CrossAxisAlignment.start,
           children: [
-            FButton(
-              style: FButtonStyle.destructive,
-              label: 'Delete?',
-              onPress: () => showAdaptiveDialog(
-                context: context,
-                builder: (context) => FDialog(
-                  direction: Axis.horizontal,
-                  title: 'Are you absolutely sure?',
-                  body:
-                      'This action cannot be undone. This will permanently delete your account and remove your data from our servers.',
-                  actions: [
-                    FButton(
-                        style: FButtonStyle.outline,
-                        label: 'Cancel',
-                        onPress: () {
-                          Navigator.of(context).pop();
-                        }),
-                    FButton(label: 'Continue', onPress: () {}),
-                  ],
-                ),
-              ),
-            ),
+            // FButton(
+            //   style: FButtonStyle.destructive,
+            //   label: 'Delete?',
+            //   onPress: () => showAdaptiveDialog(
+            //     context: context,
+            //     builder: (context) => FDialog(
+            //       direction: Axis.horizontal,
+            //       title: 'Are you absolutely sure?',
+            //       body:
+            //           'This action cannot be undone. This will permanently delete your account and remove your data from our servers.',
+            //       actions: [
+            //         FButton(
+            //             style: FButtonStyle.outline,
+            //             label: 'Cancel',
+            //             onPress: () {
+            //               Navigator.of(context).pop();
+            //             }),
+            //         FButton(label: 'Continue', onPress: () {}),
+            //       ],
+            //     ),
+            //   ),
+            // ),
             const SizedBox(height: 10),
             Expanded(
               child: FTabs(

diff --git a/forui/lib/src/widgets/dialog/dialog.dart b/forui/lib/src/widgets/dialog/dialog.dart
@@ -136,7 +136,7 @@ class FDialog extends StatelessWidget {
         removeBottom: true,
         context: context,
         child: Align(
-          child: DefaultTextStyle.merge(
+          child: DefaultTextStyle(
             style: typography.base.copyWith(color: theme.colorScheme.foreground),
             child: Semantics(
               scopesRoute: true,

diff --git a/samples/lib/main.dart b/samples/lib/main.dart
@@ -34,24 +34,21 @@ class EmptyPage extends StatelessWidget {
 class _AppRouter extends $_AppRouter {
   @override
   List<AutoRoute> get routes => [
-    AutoRoute(page: EmptyRoute.page, initial: true),
+    AutoRoute(
+      page: EmptyRoute.page,
+      initial: true,
+    ),
     AutoRoute(
       path: '/badge',
       page: BadgeRoute.page,
     ),
     AutoRoute(
-      path: '/button',
-      page: EmptyRoute.page,
-      children: [
-        AutoRoute(
-          path: 'text',
-          page: ButtonTextRoute.page,
-        ),
-        AutoRoute(
-          path: 'icon',
-          page: ButtonIconRoute.page,
-        ),
-      ],
+      path: '/button/text',
+      page: ButtonTextRoute.page,
+    ),
+    AutoRoute(
+      path: '/button/icon',
+      page: ButtonIconRoute.page,
     ),
     AutoRoute(
       path: '/card',