Merge pull request #6 from flet-dev/main

Merge changes

Author: Skquark

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Flet changelog
 
+# 0.17.0
+
+* `SearchBar` control ([#2212](https://github.com/flet-dev/flet/issues/2212)).
+* `CupertinoNavigationBar` control ([#2241](https://github.com/flet-dev/flet/issues/2241)).
+
 # 0.16.0
 
 * `CupertinoSlider` control and `Slider.adaptive` ([#2224](https://github.com/flet-dev/flet/issues/2224)).

client/ios/Podfile.lock

@@ -97,15 +97,15 @@ SPEC CHECKSUMS:
   audioplayers_darwin: 877d9a4d06331c5c374595e46e16453ac7eafa40
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
-  file_picker: ce3938a0df3cc1ef404671531facef740d03f920
+  file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
   Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
   integration_test: 13825b8a9334a850581300559b8839134b124670
   path_provider_foundation: 29f094ae23ebbca9d3d0cec13889cd9060c0e943
   SDWebImage: 72f86271a6f3139cc7e4a89220946489d4b9a866
   sensors_plus: 5717760720f7e6acd96fdbd75b7428f5ad755ec2
   shared_preferences_foundation: 5b919d13b803cadd15ed2dc053125c68730e5126
   SwiftyGif: 6c3eafd0ce693cad58bb63d2b2fb9bacb8552780
-  url_launcher_ios: 08a3dfac5fb39e8759aeb0abbd5d9480f30fc8b4
+  url_launcher_ios: bf5ce03e0e2088bad9cc378ea97fa0ed5b49673b
   webview_flutter_wkwebview: 2e2d318f21a5e036e2c3f26171342e95908bd60a
 
 PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3

client/pubspec.lock

@@ -183,7 +183,7 @@ packages:
       path: "../package"
       relative: true
     source: path
-    version: "0.16.0"
+    version: "0.17.0"
   flutter:
     dependency: "direct main"
     description: flutter

package/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.17.0
+
+* `SearchBar` control ([#2212](https://github.com/flet-dev/flet/issues/2212)).
+* `CupertinoNavigationBar` control ([#2241](https://github.com/flet-dev/flet/issues/2241)).
+
 # 0.16.0
 
 * `CupertinoSlider` control and `Slider.adaptive` ([#2224](https://github.com/flet-dev/flet/issues/2224)).

package/lib/src/controls/create_control.dart

@@ -1,6 +1,7 @@
 import 'dart:math';
 
 import 'package:collection/collection.dart';
+import 'package:flet/src/controls/search_anchor.dart';
 import 'package:flet/src/controls/segmented_button.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
@@ -15,14 +16,11 @@ import '../utils/theme.dart';
 import '../utils/transforms.dart';
 import 'alert_dialog.dart';
 import 'animated_switcher.dart';
-import 'bottom_app_bar.dart';
 import 'audio.dart';
 import 'badge.dart';
-import 'cupertino_slider.dart';
-import 'expansion_panel.dart';
-import 'selection_area.dart';
 import 'banner.dart';
 import 'barchart.dart';
+import 'bottom_app_bar.dart';
 import 'bottom_sheet.dart';
 import 'canvas.dart';
 import 'card.dart';
@@ -32,6 +30,11 @@ import 'circle_avatar.dart';
 import 'clipboard.dart';
 import 'column.dart';
 import 'container.dart';
+import 'cupertino_checkbox.dart';
+import 'cupertino_navigation_bar.dart';
+import 'cupertino_radio.dart';
+import 'cupertino_slider.dart';
+import 'cupertino_switch.dart';
 import 'datatable.dart';
 import 'date_picker.dart';
 import 'dismissible.dart';
@@ -41,6 +44,7 @@ import 'draggable.dart';
 import 'dropdown.dart';
 import 'elevated_button.dart';
 import 'error.dart';
+import 'expansion_panel.dart';
 import 'expansion_tile.dart';
 import 'file_picker.dart';
 import 'flet_app_control.dart';
@@ -64,12 +68,12 @@ import 'popup_menu_button.dart';
 import 'progress_bar.dart';
 import 'progress_ring.dart';
 import 'radio.dart';
-import 'cupertino_radio.dart';
 import 'radio_group.dart';
 import 'range_slider.dart';
 import 'responsive_row.dart';
 import 'row.dart';
 import 'safe_area.dart';
+import 'selection_area.dart';
 import 'semantics.dart';
 import 'shader_mask.dart';
 import 'shake_detector.dart';
@@ -87,8 +91,6 @@ import 'transparent_pointer.dart';
 import 'vertical_divider.dart';
 import 'webview.dart';
 import 'window_drag_area.dart';
-import 'cupertino_checkbox.dart';
-import 'cupertino_switch.dart';
 
 Widget createControl(Control? parent, String id, bool parentDisabled,
     {Widget? nextChild}) {
@@ -483,6 +485,14 @@ Widget createWidget(Key? key, ControlViewModel controlView, Control? parent,
           control: controlView.control,
           children: controlView.children,
           parentDisabled: parentDisabled);
+    case "searchbar":
+      return SearchAnchorControl(
+          key: key,
+          parent: parent,
+          control: controlView.control,
+          children: controlView.children,
+          parentDisabled: parentDisabled,
+          dispatch: controlView.dispatch);
     case "checkbox":
       return CheckboxControl(
           key: key,
@@ -621,6 +631,13 @@ Widget createWidget(Key? key, ControlViewModel controlView, Control? parent,
           children: controlView.children,
           parentDisabled: parentDisabled,
           dispatch: controlView.dispatch);
+    case "cupertinonavigationbar":
+      return CupertinoNavigationBarControl(
+          parent: parent,
+          control: controlView.control,
+          children: controlView.children,
+          parentDisabled: parentDisabled,
+          dispatch: controlView.dispatch);
     case "bottomappbar":
       return BottomAppBarControl(
         parent: parent,

package/lib/src/controls/cupertino_navigation_bar.dart

@@ -0,0 +1,119 @@
+import 'package:collection/collection.dart';
+import 'package:flutter/cupertino.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_redux/flutter_redux.dart';
+
+import '../actions.dart';
+import '../flet_app_services.dart';
+import '../models/app_state.dart';
+import '../models/control.dart';
+import '../models/controls_view_model.dart';
+import '../protocol/update_control_props_payload.dart';
+import '../utils/colors.dart';
+import '../utils/icons.dart';
+import 'create_control.dart';
+import '../utils/borders.dart';
+
+class CupertinoNavigationBarControl extends StatefulWidget {
+  final Control? parent;
+  final Control control;
+  final List<Control> children;
+  final bool parentDisabled;
+  final dynamic dispatch;
+
+  const CupertinoNavigationBarControl(
+      {Key? key,
+      this.parent,
+      required this.control,
+      required this.children,
+      required this.parentDisabled,
+      required this.dispatch})
+      : super(key: key);
+
+  @override
+  State<CupertinoNavigationBarControl> createState() =>
+      _CupertinoNavigationBarControlState();
+}
+
+class _CupertinoNavigationBarControlState
+    extends State<CupertinoNavigationBarControl> {
+  int _selectedIndex = 0;
+
+  void _onTap(int index) {
+    _selectedIndex = index;
+    debugPrint("Selected index: $_selectedIndex");
+    List<Map<String, String>> props = [
+      {"i": widget.control.id, "selectedindex": _selectedIndex.toString()}
+    ];
+    widget.dispatch(
+        UpdateControlPropsAction(UpdateControlPropsPayload(props: props)));
+    final server = FletAppServices.of(context).server;
+    server.updateControlProps(props: props);
+    server.sendPageEvent(
+        eventTarget: widget.control.id,
+        eventName: "change",
+        eventData: _selectedIndex.toString());
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    debugPrint("CupertinoNavigationBarControl build: ${widget.control.id}");
+
+    bool disabled = widget.control.isDisabled || widget.parentDisabled;
+    var selectedIndex = widget.control.attrInt("selectedIndex", 0)!;
+
+    if (_selectedIndex != selectedIndex) {
+      _selectedIndex = selectedIndex;
+    }
+
+    var navBar = StoreConnector<AppState, ControlsViewModel>(
+        distinct: true,
+        converter: (store) => ControlsViewModel.fromStore(
+            store,
+            widget.children
+                .where((c) => c.isVisible && c.name == null)
+                .map((c) => c.id)),
+        builder: (content, viewModel) {
+          return CupertinoTabBar(
+              backgroundColor: HexColor.fromString(
+                  Theme.of(context), widget.control.attrString("bgColor", "")!),
+              activeColor: HexColor.fromString(
+                  Theme.of(context), widget.control.attrString("activeColor", "")!),
+              inactiveColor: HexColor.fromString(Theme.of(context),
+                  widget.control.attrString("inactiveColor", "")!) ?? CupertinoColors.inactiveGray,
+              iconSize: widget.control.attrDouble("iconSize", 30.0)!,
+              currentIndex: _selectedIndex,
+              border: parseBorder(Theme.of(context), widget.control, "border"),
+              onTap: _onTap,
+              items: viewModel.controlViews.map((destView) {
+                var label = destView.control.attrString("label", "")!;
+
+                var icon =
+                    getMaterialIcon(destView.control.attrString("icon", "")!);
+                var iconContentCtrls =
+                    destView.children.where((c) => c.name == "icon_content");
+
+                var selectedIcon = getMaterialIcon(
+                    destView.control.attrString("selectedIcon", "")!);
+                var selectedIconContentCtrls = destView.children
+                    .where((c) => c.name == "selected_icon_content");
+
+                return BottomNavigationBarItem(
+                    tooltip: destView.control.attrString("tooltip", "")!,
+                    icon: iconContentCtrls.isNotEmpty
+                        ? createControl(destView.control,
+                            iconContentCtrls.first.id, disabled)
+                        : Icon(icon),
+                    activeIcon: selectedIconContentCtrls.isNotEmpty
+                        ? createControl(destView.control,
+                            selectedIconContentCtrls.first.id, disabled)
+                        : selectedIcon != null
+                            ? Icon(selectedIcon)
+                            : null,
+                    label: label);
+              }).toList());
+        });
+
+    return constrainedControl(context, navBar, widget.parent, widget.control);
+  }
+}

package/lib/src/controls/navigation_bar.dart

@@ -1,4 +1,5 @@
 import 'package:collection/collection.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 
@@ -12,6 +13,7 @@ import '../utils/colors.dart';
 import '../utils/icons.dart';
 import 'create_control.dart';
 import '../utils/borders.dart';
+import 'cupertino_navigation_bar.dart';
 
 class NavigationBarControl extends StatefulWidget {
   final Control? parent;
@@ -56,6 +58,17 @@ class _NavigationBarControlState extends State<NavigationBarControl> {
   Widget build(BuildContext context) {
     debugPrint("NavigationBarControl build: ${widget.control.id}");
 
+    bool adaptive = widget.control.attrBool("adaptive", false)!;
+    if (adaptive &&
+        (defaultTargetPlatform == TargetPlatform.iOS ||
+            defaultTargetPlatform == TargetPlatform.macOS)) {
+      return CupertinoNavigationBarControl(
+          control: widget.control,
+          children: widget.children,
+          parentDisabled: widget.parentDisabled,
+          dispatch: widget.dispatch);
+    }
+
     bool disabled = widget.control.isDisabled || widget.parentDisabled;
     var selectedIndex = widget.control.attrInt("selectedIndex", 0)!;
 

package/lib/src/controls/page.dart

@@ -655,7 +655,7 @@ class _ViewControlState extends State<ViewControl> {
             } else if (ctrl.type == "floatingactionbutton") {
               fab = ctrl;
               continue;
-            } else if (ctrl.type == "navigationbar") {
+            } else if (ctrl.type == "navigationbar" || ctrl.type == "cupertinonavigationbar" ) {
               navBar = ctrl;
               continue;
             } else if (ctrl.type == "navigationdrawer" &&