Merge branch 'main' into unitTesting

Author: TheNoumanDev

modules/auth/pubspec.yaml

@@ -39,10 +39,10 @@ dependencies:
 
   get_it: ^8.0.0
   google_sign_in: ^6.1.4
-  sign_in_with_apple: ^5.0.0
+  sign_in_with_apple: ^6.1.4
   firebase_auth: ^5.3.1
   firebase_core: ^3.6.0
-  flutter_web_auth_2: ^2.1.4
+  flutter_web_auth_2: ^4.1.0
   flutter_svg: ^2.0.7
   crypto: ^3.0.3
   # auth0_flutter: ^1.2.1

modules/ensemble/lib/action/saveFile/save_mobile.dart

@@ -1,8 +1,8 @@
 import 'dart:io';
 
 import 'package:flutter/foundation.dart';
-import 'package:image_gallery_saver/image_gallery_saver.dart';
 import 'package:path_provider/path_provider.dart';
+import 'package:vision_gallery_saver/vision_gallery_saver.dart';
 // Conditionally import the file that has `dart:html` vs. the stub:
 import 'download_stub.dart' if (dart.library.html) 'download_web.dart';
 
@@ -11,7 +11,7 @@ Future<void> saveImageToDCIM(String fileName, Uint8List fileBytes) async {
     if (kIsWeb) {
       downloadFileOnWeb(fileName, fileBytes);
     } else {
-      final result = await ImageGallerySaver.saveImage(
+      final result = await VisionGallerySaver.saveImage(
         fileBytes,
         name: fileName,
       );

modules/ensemble/lib/framework/view/page.dart

@@ -286,7 +286,7 @@ class PageState extends State<Page>
       dynamic appBar = _buildAppBar(pageModel.headerModel!,
           scrollableView: true,
           showNavigationIcon: pageModel.runtimeStyles?['showNavigationIcon']);
-      if (appBar is SliverAppBar) {
+      if (appBar is SliverAppBar || appBar is AnimatedAppBar) {
         return appBar;
       }
     }
@@ -319,9 +319,12 @@ class PageState extends State<Page>
   dynamic _buildAppBar(HeaderModel headerModel,
       {required bool scrollableView, bool? showNavigationIcon}) {
     Widget? titleWidget;
+
+
     if (headerModel.titleWidget != null) {
       titleWidget = _scopeManager.buildWidget(headerModel.titleWidget!);
     }
+
     if (titleWidget == null && headerModel.titleText != null) {
       final title = _scopeManager.dataContext.eval(headerModel.titleText);
       titleWidget = Text(Utils.translate(title.toString(), context));
@@ -351,15 +354,29 @@ class PageState extends State<Page>
     Color? shadowColor = Utils.getColor(evaluatedHeader?['shadowColor']);
     double? elevation =
         Utils.optionalInt(evaluatedHeader?['elevation'], min: 0)?.toDouble();
-
+    ScrollMode scrollMode =
+        Utils.getEnum<ScrollMode>(evaluatedHeader?['scrollMode'], ScrollMode.values);
     final titleBarHeight =
         Utils.optionalInt(evaluatedHeader?['titleBarHeight'], min: 0)
                 ?.toDouble() ??
             kToolbarHeight;
 
+    // animation
+    final animation = evaluatedHeader?['animation'] != null
+        ? EnsembleThemeManager.yamlToDart(evaluatedHeader?['animation'])
+        : null;
+    bool animationEnabled = false;
+    int? duration;
+    Curve? curve;
+    if (animation != null) {
+      animationEnabled = Utils.getBool(animation!['enabled'], fallback: false);
+      duration = Utils.getInt(animation!['duration'], fallback: 0);
+      curve = Utils.getCurve(animation!['curve']);
+    }
     // applicable only to Sliver scrolling
     double? flexibleMaxHeight =
         Utils.optionalInt(evaluatedHeader?['flexibleMaxHeight'])?.toDouble();
+
     double? flexibleMinHeight =
         Utils.optionalInt(evaluatedHeader?['flexibleMinHeight'])?.toDouble();
     // collapsed height if specified needs to be bigger than titleBar height
@@ -368,28 +385,32 @@ class PageState extends State<Page>
     }
 
     if (scrollableView) {
-      return SliverAppBar(
+      return AnimatedAppBar( scrollController: externalScrollController!,
         automaticallyImplyLeading:
-            leadingWidget == null && showNavigationIcon != false,
-        leading: leadingWidget,
-        title: titleWidget,
+           leadingWidget == null && showNavigationIcon != false,
+        leadingWidget: leadingWidget,
+        titleWidget: titleWidget,
         centerTitle: centerTitle,
         backgroundColor: backgroundColor,
         surfaceTintColor: surfaceTintColor,
         foregroundColor: color,
+        animated: animationEnabled,
 
         // control the drop shadow on the header's bottom edge
         elevation: elevation,
         shadowColor: shadowColor,
 
-        toolbarHeight: titleBarHeight,
+        titleBarHeight: titleBarHeight,
+        curve: curve,
+        duration: duration,
+        backgroundWidget: backgroundWidget,
+        expandedBarHeight: flexibleMaxHeight,
+        collapsedBarHeight: flexibleMinHeight,
+        floating: scrollMode == ScrollMode.floating,
+        pinned: scrollMode == ScrollMode.pinned,
 
-        flexibleSpace: wrapsInFlexible(backgroundWidget),
-        expandedHeight: flexibleMaxHeight,
-        collapsedHeight: flexibleMinHeight,
-
-        pinned: true,
       );
+
     } else {
       return AppBar(
         automaticallyImplyLeading:
@@ -583,9 +604,10 @@ class PageState extends State<Page>
 
   Widget buildScrollablePageContent(bool hasDrawer) {
     List<Widget> slivers = [];
-
+    externalScrollController = ScrollController();
     // appBar
     Widget? appBar = buildSliverAppBar(widget._pageModel, hasDrawer);
+
     if (appBar != null) {
       slivers.add(appBar);
     }
@@ -840,6 +862,127 @@ class PageState extends State<Page>
   }
 }
 
+class AnimatedAppBar extends StatefulWidget {
+  final ScrollController scrollController;
+  final collapsedBarHeight;
+  final expandedBarHeight;
+  final automaticallyImplyLeading;
+  final leadingWidget;
+  final titleWidget;
+  final centerTitle;
+  final backgroundColor;
+  final surfaceTintColor;
+  final foregroundColor;
+  final elevation;
+  final shadowColor;
+  final titleBarHeight;
+  final backgroundWidget;
+  final floating;
+  final pinned;
+  final animated;
+  final curve;
+  final duration;
+  AnimatedAppBar(
+      {Key? key,
+        this.automaticallyImplyLeading,
+        this.leadingWidget,
+        this.titleWidget,
+        this.centerTitle,
+        this.backgroundColor,
+        this.surfaceTintColor,
+        this.foregroundColor,
+        this.elevation,
+        this.shadowColor,
+        this.titleBarHeight,
+        this.backgroundWidget,
+        this.animated,
+        this.floating,
+        this.pinned,
+        this.collapsedBarHeight,
+        this.expandedBarHeight,
+        required this.scrollController,
+        this.curve,
+        this.duration})
+      : super(key: key);
+
+  @override
+  _AnimatedAppBarState createState() => _AnimatedAppBarState();
+}
+
+class _AnimatedAppBarState extends State<AnimatedAppBar> {
+  bool isCollapsed = false;
+
+  @override
+  void initState() {
+    super.initState();
+    widget.scrollController.addListener(_updateCollapseState);
+  }
+
+  void _updateCollapseState() {
+    bool newState = widget.scrollController.hasClients &&
+        widget.scrollController.offset >
+            (widget.expandedBarHeight - widget.collapsedBarHeight);
+
+    if (newState != isCollapsed) {
+      setState(() {
+        isCollapsed = newState;
+      });
+    }
+  }
+
+  @override
+  void dispose() {
+    widget.scrollController.removeListener(_updateCollapseState);
+    super.dispose();
+  }
+
+  /// wraps the background in a FlexibleSpaceBar for automatic stretching and parallax effect.
+  Widget? wrapsInFlexible(Widget? backgroundWidget) {
+    if (backgroundWidget != null) {
+      return FlexibleSpaceBar(
+        background: backgroundWidget,
+        collapseMode: CollapseMode.parallax,
+      );
+    }
+    return null;
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return SliverAppBar(
+      collapsedHeight: widget.collapsedBarHeight,
+      expandedHeight: widget.expandedBarHeight,
+      pinned: widget.pinned,
+      centerTitle: widget.centerTitle,
+      title: widget.animated
+          ? AnimatedContainer(
+        curve: widget.curve ?? Curves.easeIn,
+        duration: Duration(
+            milliseconds: widget.duration ?? 300), // Animation duration
+        transform: Matrix4.translationValues(
+          0, // No horizontal movement
+          isCollapsed ? 0 : -100, // Move from top to bottom
+          0, // No depth movement
+        ),
+        child: widget.titleWidget, // Your title widget
+      ) : widget.titleWidget,
+      elevation: widget.elevation,
+      backgroundColor: widget.backgroundColor,
+      flexibleSpace: wrapsInFlexible(widget.backgroundWidget),
+      automaticallyImplyLeading: widget.automaticallyImplyLeading,
+      leading: widget.leadingWidget,
+      surfaceTintColor: widget.surfaceTintColor,
+      foregroundColor: widget.foregroundColor,
+      shadowColor: widget.shadowColor,
+      toolbarHeight: widget.titleBarHeight,
+    );
+  }
+}
+
+enum ScrollMode {
+  floating,
+  pinned,
+}
 class ActionResponse {
   Map<String, dynamic>? _resultData;
   Set<Function> listeners = {};

modules/ensemble/lib/framework/widget/widget.dart

@@ -109,7 +109,7 @@ abstract class EWidgetState<W extends HasController>
         rtn = AnimatedOpacity(
             // If visible, apply opacity if specified, else default to 1
             opacity: widgetController.visible != false
-                ? (Utils.getValidOpacity(widgetController.opacity ?? 1) ?? 1)
+                ? (Utils.optionalDouble(widgetController.opacity ?? 1, min: 0, max: 1.0) ?? 1)
                 : 0,
             duration: widgetController.visibilityTransitionDuration!,
             child: rtn);
@@ -125,7 +125,7 @@ abstract class EWidgetState<W extends HasController>
       if (widgetController.visibilityTransitionDuration == null &&
           widgetController.opacity != null) {
         rtn = Opacity(
-          opacity: Utils.getValidOpacity(widgetController.opacity!) ?? 1,
+          opacity: Utils.optionalDouble(widgetController.opacity!, min: 0, max: 1.0) ?? 1.0,
           child: rtn,
         );
       }

modules/ensemble/lib/layout/form.dart

@@ -68,6 +68,7 @@ class EnsembleForm extends StatefulWidget
           _controller.labelStyle = Utils.getTextStyle(value),
       'enabled': (value) => _controller.enabled = Utils.optionalBool(value),
       'readOnly': (value) => _controller.readOnly = Utils.optionalBool(value),
+      'dismissibleKeyboard': (value) => _controller.dismissibleKeyboard = Utils.getBool(value, fallback: _controller.dismissibleKeyboard),
       'width': (value) => _controller.width = Utils.optionalInt(value),
       'height': (value) => _controller.height = Utils.optionalInt(value),
       'gap': (value) => _controller.gap =
@@ -110,6 +111,7 @@ class FormController extends WidgetController {
   String? labelOverflow;
   bool? enabled;
   bool? readOnly;
+  bool dismissibleKeyboard = true;
 
   // labelMaxWidth applicable only to labelPosition=start
   int? labelMaxWidth;

modules/ensemble/lib/layout/tab/base_tab_bar.dart

@@ -108,14 +108,15 @@ abstract class BaseTabBarState extends EWidgetState<BaseTabBar>
 
   Widget _buildTabWidget(ScopeManager? scopeManager, TabItem tabItem) {
     final tabWidget = tabItem.tabWidget;
+    final label = scopeManager!.dataContext.eval(tabItem.label);
     if (scopeManager != null && tabWidget != null) {
       final customWidget = scopeManager.buildWidgetFromDefinition(tabWidget);
       return Tab(
         child: customWidget,
       );
     }
     return Tab(
-      text: tabItem.label,
+      text: label,
       icon:
           tabItem.icon != null ? ensemble.Icon.fromModel(tabItem.icon!) : null,
     );

modules/ensemble/lib/page_model.dart

@@ -398,7 +398,7 @@ class SinglePageModel extends PageModel with HasStyles {
           titleText: titleText,
           titleWidget: titleWidget,
           flexibleBackground: background,
-          leadingWidget: leadingWidget,   
+          leadingWidget: leadingWidget,  
           inlineStyles: styles,
           classList: classList);
     }

modules/ensemble/lib/util/utils.dart

@@ -694,13 +694,6 @@ class Utils {
     return textAlign;
   }
 
-  static double? getValidOpacity(double opacity) {
-    if (opacity < 0 || opacity > 1) {
-      return 1;
-    } else {
-      return opacity;
-    }
-  }
 
   static Curve? getCurve(String? curveType) {
     Curve? curve;

modules/ensemble/lib/widget/button.dart

@@ -280,7 +280,9 @@ class ButtonState extends EWidgetState<Button> {
     // if focus in on a formfield (e.g. TextField), clicking on button will
     // not remove focus, so its value is never updated. Unfocus here before
     // executing button click ensure we get all the latest value of the form fields
-    FocusManager.instance.primaryFocus?.unfocus();
+    if (widget._controller.submitForm == false) {
+      FocusManager.instance.primaryFocus?.unfocus();
+    }
 
     // submit the form if specified
     if (widget._controller.submitForm == true) {

modules/ensemble/lib/widget/helpers/controllers.dart

@@ -261,7 +261,7 @@ abstract class WidgetController extends Controller with HasStyles {
       'flex': (value) => flex = Utils.optionalInt(value, min: 1),
       'expanded': (value) => expanded = Utils.getBool(value, fallback: false),
       'visible': (value) => visible = Utils.getBool(value, fallback: true),
-      'opacity': (value) => opacity = Utils.getValidOpacity(value),
+      'opacity': (value) => opacity = Utils.optionalDouble(value, min: 0, max: 1),
       'visibilityTransitionDuration': (value) =>
           visibilityTransitionDuration = Utils.getDuration(value),
       'elevation': (value) =>
@@ -487,7 +487,7 @@ abstract class EnsembleWidgetController extends EnsembleController
       'flexMode': (value) => flexMode = FlexMode.values.from(value),
       'flex': (value) => flex = Utils.optionalInt(value, min: 1),
       'visible': (value) => visible = Utils.getBool(value, fallback: true),
-      'opacity': (value) => opacity = Utils.getValidOpacity(value),
+      'opacity': (value) => opacity = Utils.optionalDouble(value, min: 0, max: 1),
       'visibilityTransitionDuration': (value) =>
           visibilityTransitionDuration = Utils.getDuration(value),
       'textDirection': (value) => textDirection = Utils.getTextDirection(value),

modules/ensemble/lib/widget/helpers/form_helper.dart

@@ -118,6 +118,10 @@ class FormHelper {
             event: EnsembleEvent(formState.widget));
       }
     }
+    // only dismiss keyboard if dismissKeyboardOnSubmit is true (By default it is true)
+    if(formState?.widget.controller.dismissibleKeyboard == true) {
+    FocusManager.instance.primaryFocus?.unfocus();
+    }
   }
 }