Merge pull request #69 from mono0926/67-support-for-macos-style-alert…

…-dialog 67 support for macos style alert dialog
mono0926 · Apr 28, 2022 · 906e9e1 · 906e9e1
2 parents 6dfc99a + 44c6ecb
commit 906e9e1
Show file tree

Hide file tree

Showing 30 changed files with 1,803 additions and 125 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## 1.6.0
+
+- Support for macOS dialogs
+- Add `AdaptiveDialog.instance.updateConfiguration`, a method used for changing default configuration
+
 ## 1.5.1
 
 - Add `autocorrect` to `DialogTextField` (#63)

diff --git a/example/assets/images/love.png b/example/assets/images/love.png
diff --git a/example/lib/app.dart b/example/lib/app.dart
@@ -1,4 +1,3 @@
-import 'package:example/pages/home_page.dart';
 import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
@@ -13,13 +12,10 @@ class App extends ConsumerWidget {
   @override
   Widget build(BuildContext context, WidgetRef ref) {
     final router = ref.watch(routerProvider);
-    final platform = ref.watch(
-      adaptiveStyleNotifier.select((s) => s.platform),
-    );
     return MaterialApp.router(
       title: title,
-      theme: lightTheme().copyWith(platform: platform),
-      darkTheme: darkTheme().copyWith(platform: platform),
+      theme: lightTheme(),
+      darkTheme: darkTheme(),
       routeInformationParser: router.routeInformationParser,
       routerDelegate: router.routerDelegate,
       localizationsDelegates: const [

diff --git a/example/lib/main.dart b/example/lib/main.dart
@@ -1,3 +1,4 @@
+import 'package:adaptive_dialog/adaptive_dialog.dart';
 import 'package:flutter/material.dart' hide Router;
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
@@ -7,6 +8,14 @@ import 'app.dart';
 void main() {
   WidgetsFlutterBinding.ensureInitialized();
   GoRouter.setUrlPathStrategy(UrlPathStrategy.path);
+  AdaptiveDialog.instance.updateConfiguration(
+    macOS: AdaptiveDialogMacOSConfiguration(
+      applicationIcon: ClipRRect(
+        borderRadius: BorderRadius.circular(16),
+        child: Image.asset('assets/images/love.png'),
+      ),
+    ),
+  );
   runApp(
     const ProviderScope(
       child: App(),

diff --git a/example/lib/pages/alert_page.dart b/example/lib/pages/alert_page.dart
@@ -165,7 +165,7 @@ class AlertPage extends StatelessWidget {
                 message: 'This is message.',
                 isDestructiveAction: true,
                 cancelLabel: 'No!',
-                useActionSheetForCupertino: true,
+                useActionSheetForIOS: true,
               );
               logger.info(result);
             },

diff --git a/example/lib/pages/home_page.dart b/example/lib/pages/home_page.dart
@@ -4,7 +4,6 @@ import 'package:example/router/router.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
-import 'package:recase/recase.dart';
 import 'package:url_launcher/url_launcher.dart';
 
 class HomePage extends StatelessWidget {
@@ -62,36 +61,34 @@ class _StyleDropdownButton extends ConsumerWidget {
       child: Padding(
         padding: const EdgeInsets.symmetric(horizontal: 4),
         child: DropdownButton<AdaptiveStyle>(
-          value: ref.watch(adaptiveStyleNotifier),
+          value: ref.watch(adaptiveStyleProvider),
           items: AdaptiveStyle.values
+              // ignore: deprecated_member_use
+              .where((style) => style != AdaptiveStyle.cupertino)
               .map(
                 (style) => DropdownMenuItem(
                   value: style,
-                  child: Text(
-                    style.name.pascalCase,
-                  ),
+                  child: Text(style.label),
                 ),
               )
               .toList(),
           onChanged: (style) =>
-              ref.read(adaptiveStyleNotifier.notifier).update((_) => style!),
+              ref.read(adaptiveStyleProvider.notifier).update(style!),
         ),
       ),
     );
   }
 }
 
-final adaptiveStyleNotifier = StateProvider((ref) => AdaptiveStyle.adaptive);
+final adaptiveStyleProvider =
+    StateNotifierProvider<AdaptiveStyleNotifier, AdaptiveStyle>(
+  (ref) => AdaptiveStyleNotifier(),
+);
 
-extension AdaptiveStyleX on AdaptiveStyle {
-  TargetPlatform? get platform {
-    switch (this) {
-      case AdaptiveStyle.material:
-        return TargetPlatform.android;
-      case AdaptiveStyle.cupertino:
-        return TargetPlatform.iOS;
-      case AdaptiveStyle.adaptive:
-        return null;
-    }
+class AdaptiveStyleNotifier extends StateNotifier<AdaptiveStyle> {
+  AdaptiveStyleNotifier() : super(AdaptiveStyle.adaptive);
+  void update(AdaptiveStyle style) {
+    AdaptiveDialog.instance.updateConfiguration(defaultStyle: style);
+    state = style;
   }
 }
diff --git a/example/lib/pages/text_input_dialog_page.dart b/example/lib/pages/text_input_dialog_page.dart
@@ -1,7 +1,9 @@
 import 'package:adaptive_dialog/adaptive_dialog.dart';
+import 'package:example/pages/home_page.dart';
 import 'package:example/router/router.dart';
 import 'package:example/util/util.dart';
 import 'package:flutter/material.dart';
+import 'package:flutter_riverpod/flutter_riverpod.dart';
 import 'package:go_router/go_router.dart';
 
 class TextInputDialogRoute extends GoRouteData {
@@ -10,11 +12,11 @@ class TextInputDialogRoute extends GoRouteData {
   Widget build(BuildContext context) => const TextInputDialogPage();
 }
 
-class TextInputDialogPage extends StatelessWidget {
+class TextInputDialogPage extends ConsumerWidget {
   const TextInputDialogPage({Key? key}) : super(key: key);
 
   @override
-  Widget build(BuildContext context) {
+  Widget build(BuildContext context, WidgetRef ref) {
     final theme = Theme.of(context);
     return Scaffold(
       appBar: AppBar(
@@ -163,9 +165,12 @@ class TextInputDialogPage extends StatelessWidget {
                 hintText: 'Start with "F"',
                 retryTitle: 'Incorrect',
                 retryMessage: 'Retry?',
-                retryOkLabel: AdaptiveStyle.adaptive.isCupertinoStyle(theme)
-                    ? 'Retry'
-                    : 'RETRY',
+                retryOkLabel: ref
+                        .watch(adaptiveStyleProvider)
+                        .effectiveStyle(theme)
+                        .isMaterial(theme)
+                    ? 'RETRY'
+                    : 'Retry',
               );
               logger.info('ok: $ok');
               if (!ok) {

diff --git a/example/macos/Flutter/ephemeral/.app_filename b/example/macos/Flutter/ephemeral/.app_filename
@@ -0,0 +1 @@
+example.app
diff --git a/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig b/example/macos/Flutter/ephemeral/Flutter-Generated.xcconfig
@@ -0,0 +1,14 @@
+// This is a generated file; do not edit or check into version control.
+FLUTTER_ROOT=/Users/mono/fvm/versions/stable
+FLUTTER_APPLICATION_PATH=/Users/mono/Git/adaptive_dialog/example
+COCOAPODS_PARALLEL_CODE_SIGN=true
+FLUTTER_TARGET=/Users/mono/Git/adaptive_dialog/example/lib/main.dart
+FLUTTER_BUILD_DIR=build
+FLUTTER_BUILD_NAME=1.0.0
+FLUTTER_BUILD_NUMBER=1
+EXCLUDED_ARCHS=arm64
+DART_DEFINES=RkxVVFRFUl9XRUJfQVVUT19ERVRFQ1Q9dHJ1ZQ==
+DART_OBFUSCATION=false
+TRACK_WIDGET_CREATION=true
+TREE_SHAKE_ICONS=false
+PACKAGE_CONFIG=/Users/mono/Git/adaptive_dialog/example/.dart_tool/package_config.json