Page.design replaced with Page.adaptive

Close #2650

client/ios/Flutter/AppFrameworkInfo.plist

@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>

client/ios/Podfile

@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-# platform :ios, '11.0'
+# platform :ios, '12.0'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

client/ios/Podfile.lock

@@ -139,7 +139,7 @@ SPEC CHECKSUMS:
   DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
   DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
   file_picker: 15fd9539e4eb735dc54bae8c0534a7a9511a03de
-  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   integration_test: 13825b8a9334a850581300559b8839134b124670
   media_kit_libs_ios_video: a5fe24bc7875ccd6378a0978c13185e1344651c1
   media_kit_native_event_loop: e6b2ab20cf0746eb1c33be961fcf79667304fa2a
@@ -155,8 +155,8 @@ SPEC CHECKSUMS:
   url_launcher_ios: bbd758c6e7f9fd7b5b1d4cde34d2b95fcce5e812
   volume_controller: 531ddf792994285c9b17f9d8a7e4dcdd29b3eae9
   wakelock_plus: 8b09852c8876491e4b6d179e17dfe2a0b5f60d47
-  webview_flutter_wkwebview: 4f3e50f7273d31e5500066ed267e3ae4309c5ae4
+  webview_flutter_wkwebview: be0f0d33777f1bfd0c9fdcb594786704dbf65f36
 
-PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
+PODFILE CHECKSUM: c4c93c5f6502fe2754f48404d3594bf779584011
 
 COCOAPODS: 1.14.3

client/ios/Runner.xcodeproj/project.pbxproj

@@ -155,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1430;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -342,7 +342,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -423,7 +423,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -472,7 +472,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;

client/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

packages/flet/lib/src/controls/page.dart

@@ -40,7 +40,7 @@ import 'navigation_drawer.dart';
 import 'scroll_notification_control.dart';
 import 'scrollable_control.dart';
 
-enum PageDesign { adaptive, material, cupertino }
+enum PageDesign { material, cupertino }
 
 class RoutesViewModel extends Equatable {
   final Control page;
@@ -124,7 +124,7 @@ class PageControl extends StatefulWidget {
 }
 
 class _PageControlState extends State<PageControl> with FletStoreMixin {
-  PageDesign _pageDesign = PageDesign.material;
+  bool? _adaptive;
   PageDesign _widgetsDesign = PageDesign.material;
   TargetPlatform _platform = defaultTargetPlatform;
   Brightness? _brightness;
@@ -247,20 +247,13 @@ class _PageControlState extends State<PageControl> with FletStoreMixin {
             widget.control.attrString("platform", "")!.toLowerCase(),
         orElse: () => defaultTargetPlatform);
 
-    _pageDesign = PageDesign.values.firstWhere(
-        (a) =>
-            a.name.toLowerCase() ==
-            widget.control.attrString("design", "")!.toLowerCase(),
-        orElse: () => PageDesign.material);
+    _adaptive = widget.control.attrBool("adaptive");
 
-    if ((_pageDesign == PageDesign.adaptive &&
+    _widgetsDesign = _adaptive == true &&
             (_platform == TargetPlatform.iOS ||
-                _platform == TargetPlatform.macOS)) ||
-        _pageDesign == PageDesign.cupertino) {
-      _widgetsDesign = PageDesign.cupertino;
-    } else {
-      _widgetsDesign = PageDesign.material;
-    }
+                _platform == TargetPlatform.macOS)
+        ? PageDesign.cupertino
+        : PageDesign.material;
 
     // theme
     _themeMode = ThemeMode.values.firstWhereOrNull((t) =>
@@ -648,7 +641,7 @@ class _PageControlState extends State<PageControl> with FletStoreMixin {
                 overlayWidgets: overlayWidgets(view.id),
                 loadingPage: loadingPage,
                 backend: widget.backend,
-                parentAdaptive: _pageDesign == PageDesign.adaptive,
+                parentAdaptive: _adaptive,
                 widgetsDesign: _widgetsDesign,
                 brightness: _brightness,
                 themeMode: _themeMode,
@@ -701,7 +694,7 @@ class ViewControl extends StatefulWidget {
   final List<Widget> overlayWidgets;
   final Widget? loadingPage;
   final FletControlBackend backend;
-  final bool parentAdaptive;
+  final bool? parentAdaptive;
   final PageDesign widgetsDesign;
   final Brightness? brightness;
   final ThemeMode? themeMode;

packages/flet/lib/src/controls/pagelet.dart

@@ -67,28 +67,15 @@ class _PageletControlState extends State<PageletControl> with FletStoreMixin {
     }
 
     return withPagePlatform((context, platform) {
-      PageDesign widgetsDesign = PageDesign.material;
-
-      var pageDesign = PageDesign.values.firstWhereOrNull((a) =>
-          a.name.toLowerCase() ==
-          widget.control.attrString("design", "")!.toLowerCase());
-
-      if ((pageDesign == PageDesign.adaptive &&
-              (platform == TargetPlatform.iOS ||
-                  platform == TargetPlatform.macOS)) ||
-          pageDesign == PageDesign.cupertino) {
-        widgetsDesign = PageDesign.cupertino;
-      } else {
-        widgetsDesign = PageDesign.material;
-      }
-
       bool disabled = widget.control.isDisabled || widget.parentDisabled;
-      bool? adaptive = pageDesign != null
-          ? pageDesign == PageDesign.adaptive
-          : widget.parentAdaptive;
+      bool? adaptive =
+          widget.control.attrBool("adaptive") ?? widget.parentAdaptive;
 
-      var bgcolor = HexColor.fromString(
-          Theme.of(context), widget.control.attrString("bgcolor", "")!);
+      var widgetsDesign = adaptive == true &&
+              (platform == TargetPlatform.iOS ||
+                  platform == TargetPlatform.macOS)
+          ? PageDesign.cupertino
+          : PageDesign.material;
 
       List<String> childIds = [
         appBarCtrls.firstOrNull?.id,

sdk/python/packages/flet-core/src/flet_core/__init__.py

@@ -239,7 +239,6 @@
     MaterialState,
     NotchShape,
     PaddingValue,
-    PageDesign,
     PagePlatform,
     ScrollMode,
     TabAlignment,

sdk/python/packages/flet-core/src/flet_core/page.py

@@ -10,6 +10,7 @@
 from urllib.parse import urlparse
 
 import flet_core
+from flet_core.adaptive_control import AdaptiveControl
 from flet_core.alert_dialog import AlertDialog
 from flet_core.animation import AnimationCurve
 from flet_core.app_bar import AppBar
@@ -42,7 +43,6 @@
     MainAxisAlignment,
     OffsetValue,
     PaddingValue,
-    PageDesign,
     PagePlatform,
     ScrollMode,
     ThemeMode,
@@ -72,7 +72,7 @@ def __init__(self, pubsubhub, session_id) -> None:
             pass
 
 
-class Page(Control):
+class Page(AdaptiveControl):
     """
     Page is a container for `View` (https://flet.dev/docs/controls/view) controls.
 
@@ -1242,18 +1242,6 @@ def platform(self, value: PagePlatform):
             "platform", value.value if isinstance(value, PagePlatform) else value
         )
 
-    # design
-    @property
-    def design(self):
-        av = self._get_attr("design")
-        return PageDesign(av) if av else PageDesign.MATERIAL
-
-    @design.setter
-    def design(self, value: PageDesign):
-        self._set_attr(
-            "design", value.value if isinstance(value, PageDesign) else value
-        )
-
     # platform_brightness
     @property
     def platform_brightness(self) -> ThemeMode:

sdk/python/packages/flet-core/src/flet_core/pagelet.py

@@ -15,14 +15,13 @@
     AnimationValue,
     FloatingActionButtonLocation,
     OffsetValue,
-    PageDesign,
     ResponsiveNumber,
     RotateValue,
     ScaleValue,
 )
 
 
-class Pagelet(ConstrainedControl):
+class Pagelet(ConstrainedControl, AdaptiveControl):
     """
         Pagelet implements the basic Material Design visual layout structure.
 
@@ -94,7 +93,10 @@ def __init__(
             FloatingActionButtonLocation, OffsetValue
         ] = None,
         bgcolor: Optional[str] = None,
-        design: Optional[PageDesign] = None,
+        #
+        # Adaptive
+        #
+        adaptive: Optional[bool] = None,
     ):
         ConstrainedControl.__init__(
             self,
@@ -127,6 +129,8 @@ def __init__(
             data=data,
         )
 
+        AdaptiveControl.__init__(self, adaptive=adaptive)
+
         self.content = content
         self.appbar = appbar
         self.bgcolor = bgcolor
@@ -137,7 +141,6 @@ def __init__(
         self.end_drawer = end_drawer
         self.floating_action_button = floating_action_button
         self.floating_action_button_location = floating_action_button_location
-        self.design = design
 
     def _get_control_name(self):
         return "pagelet"
@@ -319,15 +322,3 @@ def floating_action_button_location(
             "floatingActionButtonLocation",
             value.value if isinstance(value, FloatingActionButtonLocation) else value,
         )
-
-    # design
-    @property
-    def design(self):
-        av = self._get_attr("design")
-        return PageDesign(av) if av else PageDesign.MATERIAL
-
-    @design.setter
-    def design(self, value: Optional[PageDesign]):
-        self._set_attr(
-            "design", value.value if isinstance(value, PageDesign) else value
-        )

sdk/python/packages/flet-core/src/flet_core/types.py

@@ -301,12 +301,6 @@ class PagePlatform(Enum):
     LINUX = "linux"
 
 
-class PageDesign(Enum):
-    MATERIAL = "material"
-    CUPERTINO = "cupertino"
-    ADAPTIVE = "adaptive"
-
-
 ThemeModeString = Literal[None, "system", "light", "dark"]