Merge pull request #9 from definitelyme/deps-update

Upgrade `flutter_platform_widgets`

Author: robert-virkus

lib/cupertino.dart

@@ -1,5 +1,4 @@
 export 'src/cupertino/cupertino.dart';
 
-export 'package:cupertino_list_tile/cupertino_list_tile.dart';
 export 'package:cupertino_stepper/cupertino_stepper.dart';
 export 'package:cupertino_progress_bar/cupertino_progress_bar.dart';

lib/enough_platform_widgets.dart

@@ -4,5 +4,4 @@ export 'src/cupertino/cupertino.dart';
 export 'src/platform/platform.dart';
 
 export 'package:cupertino_stepper/cupertino_stepper.dart';
-export 'package:cupertino_list_tile/cupertino_list_tile.dart';
 export 'package:flutter_platform_widgets/flutter_platform_widgets.dart';

lib/platform.dart

@@ -1,4 +1,3 @@
 export 'src/platform/platform.dart';
 
-export 'package:cupertino_list_tile/cupertino_list_tile.dart';
 export 'package:flutter_platform_widgets/flutter_platform_widgets.dart';

lib/src/platform/decorated_platform_textfield.dart

@@ -133,7 +133,7 @@ class DecoratedPlatformTextField extends StatelessWidget {
   /// If not set, select all and paste will default to be enabled. Copy and cut
   /// will be disabled if [obscureText] is true. If [readOnly] is true,
   /// paste and cut will be disabled regardless.
-  final ToolbarOptions? toolbarOptions;
+  final Widget Function(BuildContext, EditableTextState)? contextMenuBuilder;
 
   /// {@macro flutter.widgets.editableText.showCursor}
   final bool? showCursor;
@@ -395,7 +395,7 @@ class DecoratedPlatformTextField extends StatelessWidget {
     this.textAlignVertical,
     this.textDirection,
     this.readOnly = false,
-    this.toolbarOptions,
+    this.contextMenuBuilder,
     this.showCursor,
     this.autofocus = false,
     this.obscuringCharacter = '•',
@@ -463,7 +463,7 @@ class DecoratedPlatformTextField extends StatelessWidget {
         textAlignVertical: textAlignVertical,
         textDirection: textDirection,
         readOnly: readOnly,
-        toolbarOptions: toolbarOptions,
+        contextMenuBuilder: contextMenuBuilder,
         showCursor: showCursor,
         obscuringCharacter: obscuringCharacter,
         smartDashesType: smartDashesType,
@@ -506,12 +506,8 @@ class DecoratedPlatformTextField extends StatelessWidget {
           obscureText: obscureText,
           onChanged: onChanged,
           keyboardAppearance: keyboardAppearance,
-          placeholder: cupertinoShowLabel
-              ? decoration?.hintText
-              : decoration?.labelText ?? decoration?.hintText,
-          prefix: decoration?.prefix ??
-              decoration?.prefixIcon ??
-              (cupertinoShowLabel ? null : icon),
+          placeholder: cupertinoShowLabel ? decoration?.hintText : decoration?.labelText ?? decoration?.hintText,
+          prefix: decoration?.prefix ?? decoration?.prefixIcon ?? (cupertinoShowLabel ? null : icon),
           suffix: decoration?.suffix ?? decoration?.suffixIcon,
           suffixMode: cupertinoSuffixMode,
           clearButtonMode: OverlayVisibilityMode.editing,
@@ -525,7 +521,7 @@ class DecoratedPlatformTextField extends StatelessWidget {
           textAlign: textAlign,
           textAlignVertical: textAlignVertical,
           readOnly: readOnly,
-          toolbarOptions: toolbarOptions,
+          contextMenuBuilder: contextMenuBuilder,
           showCursor: showCursor,
           obscuringCharacter: obscuringCharacter,
           smartDashesType: smartDashesType,
@@ -552,9 +548,7 @@ class DecoratedPlatformTextField extends StatelessWidget {
           restorationId: restorationId,
         );
         final labelText = decoration?.labelText;
-        if (cupertinoShowLabel &&
-            cupertinoAlignLabelOnTop &&
-            labelText != null) {
+        if (cupertinoShowLabel && cupertinoAlignLabelOnTop && labelText != null) {
           if (icon != null) {
             content = Row(
               mainAxisAlignment: MainAxisAlignment.start,

lib/src/platform/dialog_helper.dart

@@ -29,9 +29,7 @@ class DialogHelper {
           content: Text(query),
           actions: [
             CupertinoDialogAction(
-              child: cancelActionText != null
-                  ? Text(cancelActionText)
-                  : Icon(CupertinoIcons.clear),
+              child: cancelActionText != null ? Text(cancelActionText) : Icon(CupertinoIcons.clear),
               onPressed: () => Navigator.of(context).pop(false),
             ),
             CupertinoDialogAction(
@@ -49,7 +47,10 @@ class DialogHelper {
       TextStyle? actionTextStyle;
       if (isDangerousAction) {
         actionButtonStyle = TextButton.styleFrom(
-            backgroundColor: Colors.red, onSurface: Colors.white);
+          backgroundColor: Colors.red,
+          disabledForegroundColor: Colors.white,
+          onSurface: Colors.white,
+        );
         actionTextStyle = theme.textTheme.button!.copyWith(color: Colors.white);
       }
 
@@ -59,9 +60,7 @@ class DialogHelper {
           content: Text(query),
           actions: [
             TextButton(
-              child: cancelActionText != null
-                  ? PlatformText(cancelActionText)
-                  : Icon(Icons.cancel),
+              child: cancelActionText != null ? PlatformText(cancelActionText) : Icon(Icons.cancel),
               onPressed: () => Navigator.of(context).pop(false),
             ),
             TextButton(
@@ -88,10 +87,7 @@ class DialogHelper {
     String? cancelActionText,
   }) {
     return showWidgetDialog(context, Text(text),
-        title: title,
-        actions: actions,
-        okActionText: okActionText,
-        cancelActionText: cancelActionText);
+        title: title, actions: actions, okActionText: okActionText, cancelActionText: cancelActionText);
   }
 
   /// Shows a dialog with the given [content].
@@ -110,21 +106,15 @@ class DialogHelper {
     String? cancelActionText,
   }) {
     actions ??= [
-      if (defaultActions == DialogActions.cancel ||
-          defaultActions == DialogActions.okAndCancel) ...{
+      if (defaultActions == DialogActions.cancel || defaultActions == DialogActions.okAndCancel) ...{
         PlatformTextButton(
-          child: cancelActionText != null
-              ? PlatformText(cancelActionText)
-              : Icon(CommonPlatformIcons.cancel),
+          child: cancelActionText != null ? PlatformText(cancelActionText) : Icon(CommonPlatformIcons.cancel),
           onPressed: () => Navigator.of(context).pop(false),
         ),
       },
-      if (defaultActions == DialogActions.ok ||
-          defaultActions == DialogActions.okAndCancel) ...{
+      if (defaultActions == DialogActions.ok || defaultActions == DialogActions.okAndCancel) ...{
         PlatformTextButton(
-          child: okActionText != null
-              ? PlatformText(okActionText)
-              : Icon(CommonPlatformIcons.ok),
+          child: okActionText != null ? PlatformText(okActionText) : Icon(CommonPlatformIcons.ok),
           onPressed: () => Navigator.of(context).pop(true),
         ),
       },

lib/src/platform/platform.dart

@@ -1,6 +1,5 @@
 export 'platform_info.dart';
 export 'platform_chip.dart';
-export 'platform_list_tile.dart';
 export 'platform_popup_button.dart';
 export 'platform_stepper.dart';
 export 'platform_toolbar.dart';

lib/src/platform/platform_dialog_action_text.dart

@@ -31,9 +31,11 @@ class PlatformDialogActionText extends StatelessWidget {
         TextStyle? actionTextStyle;
         if (isDestructiveAction) {
           actionButtonStyle = TextButton.styleFrom(
-              backgroundColor: Colors.red, onSurface: Colors.white);
-          actionTextStyle =
-              theme.textTheme.button!.copyWith(color: Colors.white);
+            backgroundColor: Colors.red,
+            disabledForegroundColor: Colors.white,
+            onSurface: Colors.white,
+          );
+          actionTextStyle = theme.textTheme.button!.copyWith(color: Colors.white);
         }
         return TextButton(
           child: Text(text.toUpperCase(), style: actionTextStyle),

lib/src/platform/platform_list_tile.dart

@@ -8,12 +8,11 @@ environment:
   flutter: ">=1.17.0"
 
 dependencies:
-  cupertino_list_tile: ^0.2.1
   cupertino_stepper: ^0.2.1
   cupertino_progress_bar: ^0.2.0
   flutter:
     sdk: flutter
-  flutter_platform_widgets: ^2.0.0
+  flutter_platform_widgets: ^3.0.0
 
 dev_dependencies:
   flutter_test: