Merge branch 'main' of https://github.com/Enough-Software/enough_platform_widgets

Author: robert-virkus

.gitignore

@@ -19,3 +19,7 @@ doc/api/
 *.js_
 *.js.deps
 *.js.map
+
+*.iml
+.vscode
+.idea

README.md

@@ -19,7 +19,7 @@ Platform widgets use their material or cupertino equivalent based on the chosen
 * `PlatformChip` a simple cross-platform `Chip` replacement
 * `PlatformDialogActionButton` is a platform aware dialog action
 * `PlatformDialogActionText` provides a platform aware dialog action text
-* `DropdownButton` is a replacement for the material `DropdownButton`
+* `PlatformDropdownButton` is a replacement for the material `DropdownButton`
 * `PlatformFilledButtonIcon` uses an `ElevatedButton.filled` on material and a `CupertinoButton.filled` on cupertino
 * `DensePlatformIconButton` replaces the material `IconButton`
 * `PlatformInkWell` is a rectangular area of a that responds to touch and is based either on `InkWell` or on `CupertinoInkWell`

lib/src/cupertino/cupertino_dropdown_button.dart

@@ -12,6 +12,8 @@ class CupertinoDropdownButton<T> extends StatefulWidget {
   final void Function(T? value)? onChanged;
   final double itemExtent;
   final Widget? hint;
+  final double? width;
+  final double? height;
 
   const CupertinoDropdownButton({
     Key? key,
@@ -21,6 +23,8 @@ class CupertinoDropdownButton<T> extends StatefulWidget {
     this.onChanged,
     this.hint,
     required this.itemExtent,
+    this.width,
+    this.height,
   }) : super(key: key);
 
   @override
@@ -71,8 +75,8 @@ class _CupertinoDropdownButtonState<T>
         final result = await showCupertinoModalPopup<bool>(
           context: context,
           builder: (context) => SizedBox(
-            width: MediaQuery.of(context).size.width,
-            height: MediaQuery.of(context).size.height * 0.7,
+            width: widget.width ?? MediaQuery.of(context).size.width,
+            height: widget.height ?? MediaQuery.of(context).size.height * 0.7,
             child: SafeArea(
               child: Container(
                 color: CupertinoTheme.of(context).barBackgroundColor,

lib/src/platform/platform_dropdown_button.dart

@@ -3,92 +3,153 @@ import 'package:flutter_platform_widgets/flutter_platform_widgets.dart';
 
 import '../../cupertino.dart';
 
-/// A platform aware DropdownButton
-class PlatformDropdownButton<T> extends StatelessWidget {
+abstract class _BaseData<T> {
+  _BaseData({
+    this.items,
+    this.selectedItemBuilder,
+    this.value,
+    this.itemHeight,
+    this.hint,
+    this.onChanged
+  });
+
   final List<DropdownMenuItem<T>>? items;
   final List<Widget> Function(BuildContext context)? selectedItemBuilder;
   final T? value;
+  final double? itemHeight;
   final Widget? hint;
-  final Widget? disabledHint;
   final void Function(T? value)? onChanged;
+}
+
+class MaterialDropdownButtonData<T> extends _BaseData<T> {
+  MaterialDropdownButtonData({
+    super.items,
+    super.selectedItemBuilder,
+    super.value,
+    super.itemHeight,
+    super.hint,
+    super.onChanged,
+    this.disabledHint,
+    this.onTap,
+    this.elevation,
+    this.style,
+    this.underline,
+    this.icon,
+    this.iconDisabledColor,
+    this.iconEnabledColor,
+    this.iconSize,
+    this.isDense,
+    this.isExpanded,
+    this.focusColor,
+    this.focusNode,
+    this.autofocus,
+    this.dropdownColor,
+    this.menuMaxHeight,
+  });
+
+  final Widget? disabledHint;
   final void Function()? onTap;
-  final int elevation;
+  final int? elevation;
   final TextStyle? style;
   final Widget? underline;
   final Widget? icon;
   final Color? iconDisabledColor;
   final Color? iconEnabledColor;
-  final double iconSize;
-  final bool isDense;
-  final bool isExpanded;
-  final double? itemHeight;
+  final double? iconSize;
+  final bool? isDense;
+  final bool? isExpanded;
   final Color? focusColor;
   final FocusNode? focusNode;
-  final bool autofocus;
+  final bool? autofocus;
   final Color? dropdownColor;
   final double? menuMaxHeight;
+}
+
+class CupertinoDropdownButtonData<T> extends _BaseData<T> {
+  CupertinoDropdownButtonData({
+    super.items,
+    super.selectedItemBuilder,
+    super.value,
+    super.itemHeight,
+    super.hint,
+    super.onChanged,
+    this.width,
+    this.height
+  });
+
+  final double? width;
+  final double? height;
+}
+
+/// A platform aware DropdownButton
+class PlatformDropdownButton<T> extends StatelessWidget {
+  final List<DropdownMenuItem<T>>? items;
+  final List<Widget> Function(BuildContext context)? selectedItemBuilder;
+  final T? value;
+  final double? itemHeight;
+  final Widget? hint;
+  final void Function(T? value)? onChanged;
+
+  final PlatformBuilder<MaterialDropdownButtonData<T>>? material;
+  final PlatformBuilder<CupertinoDropdownButtonData<T>>? cupertino;
 
   const PlatformDropdownButton({
     Key? key,
     required this.items,
     this.selectedItemBuilder,
     this.value,
     this.hint,
-    this.disabledHint,
     this.onChanged,
-    this.onTap,
-    this.elevation = 8,
-    this.style,
-    this.underline,
-    this.icon,
-    this.iconDisabledColor,
-    this.iconEnabledColor,
-    this.iconSize = 24.0,
-    this.isDense = false,
-    this.isExpanded = false,
-    this.itemHeight = kMinInteractiveDimension,
-    this.focusColor,
-    this.focusNode,
-    this.autofocus = false,
-    this.dropdownColor,
-    this.menuMaxHeight,
+    this.itemHeight,
+    this.material,
+    this.cupertino,
   }) : super(key: key);
 
   @override
   Widget build(BuildContext context) {
     return PlatformWidget(
-      material: (context, platform) => DropdownButton<T>(
-        items: items,
-        selectedItemBuilder: selectedItemBuilder,
-        value: value,
-        hint: hint,
-        disabledHint: disabledHint,
-        onChanged: onChanged,
-        onTap: onTap,
-        elevation: elevation,
-        style: style,
-        underline: underline,
-        icon: icon,
-        iconDisabledColor: iconDisabledColor,
-        iconEnabledColor: iconEnabledColor,
-        iconSize: iconSize,
-        isDense: isDense,
-        isExpanded: isExpanded,
-        itemHeight: itemHeight,
-        focusColor: focusColor,
-        focusNode: focusNode,
-        autofocus: autofocus,
-        dropdownColor: dropdownColor,
-        menuMaxHeight: menuMaxHeight,
-      ),
-      cupertino: (context, platform) => CupertinoDropdownButton(
-        items: items,
-        selectedItemBuilder: selectedItemBuilder,
-        value: value,
-        itemExtent: itemHeight ?? 12.0,
-        hint: hint,
-        onChanged: onChanged,
-      ),
+      material: (context, platform) {
+        final data = material?.call(context, platform);
+
+        return DropdownButton<T>(
+          items: data?.items ?? items ?? <DropdownMenuItem<T>>[],
+          selectedItemBuilder: data?.selectedItemBuilder ?? selectedItemBuilder,
+          value: data?.value ?? value,
+          hint: data?.hint ?? hint,
+          onChanged: data?.onChanged ?? onChanged,
+          itemHeight: data?.itemHeight ?? itemHeight ?? kMinInteractiveDimension,
+          disabledHint: data?.disabledHint,
+          onTap: data?.onTap,
+          elevation: data?.elevation ?? 8,
+          style: data?.style,
+          underline: data?.underline,
+          icon: data?.icon,
+          iconDisabledColor: data?.iconDisabledColor,
+          iconEnabledColor: data?.iconEnabledColor,
+          iconSize: data?.iconSize ?? 24.0,
+          isDense: data?.isDense ?? false,
+          isExpanded: data?.isExpanded ?? false,
+          focusColor: data?.focusColor,
+          focusNode: data?.focusNode,
+          autofocus: data?.autofocus ?? false,
+          dropdownColor: data?.dropdownColor,
+          menuMaxHeight: data?.menuMaxHeight,
+        );
+      },
+      cupertino: (context, platform) {
+        final data = cupertino?.call(context, platform);
+
+        return CupertinoDropdownButton(
+          items: data?.items ?? items,
+          selectedItemBuilder: data?.selectedItemBuilder ?? selectedItemBuilder,
+          value: data?.value ?? value,
+          itemExtent: data?.itemHeight ?? itemHeight ?? 12.0,
+          hint: data?.hint ?? hint,
+          onChanged: data?.onChanged ?? onChanged,
+          width: data?.width,
+          height: data?.height,
+        );
+      },
     );
   }
 }

pubspec.yaml

@@ -4,7 +4,7 @@ version: 0.6.0
 homepage: https://github.com/Enough-Software/enough_platform_widgets
 
 environment:
-  sdk: ">=2.12.0 <3.0.0"
+  sdk: ">=2.17.0 <3.0.0"
   flutter: ">=1.17.0"
 
 dependencies: