Merge branch 'main' into BottomNavbar-Eval-1855

mehsaandev · web-flow · commit b0a180a4de98 · 2025-02-14T18:32:29.000+05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,56 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## 2025-02-13
+
+### Changes
+
+---
+
+Packages with breaking changes:
+
+ - There are no breaking changes in this release.
+
+Packages with other changes:
+
+ - [`ensemble` - `v1.1.22`](#ensemble---v1122)
+ - [`ensemble_chat` - `v0.0.1+1`](#ensemble_chat---v0011)
+ - [`ensemble_auth` - `v1.0.1`](#ensemble_auth---v101)
+ - [`ensemble_location` - `v0.0.1+1`](#ensemble_location---v0011)
+ - [`ensemble_camera` - `v0.0.1+1`](#ensemble_camera---v0011)
+ - [`ensemble_contacts` - `v0.0.1+1`](#ensemble_contacts---v0011)
+ - [`ensemble_file_manager` - `v0.0.1+1`](#ensemble_file_manager---v0011)
+ - [`ensemble_bluetooth` - `v0.0.1+1`](#ensemble_bluetooth---v0011)
+ - [`ensemble_connect` - `v0.0.1+1`](#ensemble_connect---v0011)
+ - [`ensemble_deeplink` - `v0.0.1+1`](#ensemble_deeplink---v0011)
+ - [`ensemble_network_info` - `v0.0.1+1`](#ensemble_network_info---v0011)
+
+Packages with dependency updates only:
+
+> Packages listed below depend on other packages in this workspace that have had changes. Their versions have been incremented to bump the minimum dependency versions of the packages they depend upon in this project.
+
+ - `ensemble_chat` - `v0.0.1+1`
+ - `ensemble_auth` - `v1.0.1`
+ - `ensemble_location` - `v0.0.1+1`
+ - `ensemble_camera` - `v0.0.1+1`
+ - `ensemble_contacts` - `v0.0.1+1`
+ - `ensemble_file_manager` - `v0.0.1+1`
+ - `ensemble_bluetooth` - `v0.0.1+1`
+ - `ensemble_connect` - `v0.0.1+1`
+ - `ensemble_deeplink` - `v0.0.1+1`
+ - `ensemble_network_info` - `v0.0.1+1`
+
+---
+
+#### `ensemble` - `v1.1.22`
+
+ - **REFACTOR**: remove no internet widget. ([e03359b2](https://github.com/ensembleUI/ensemble/commit/e03359b2dd6b1290bea39c71c69e2a3d5ad27c13))
+ - **REFACTOR**: replace offline widget with error screen for no internet connection. ([b0163a1b](https://github.com/ensembleUI/ensemble/commit/b0163a1ba20eb72c7a459afb3dfa59e1729cf9bf))
+ - **FIX**: auto complete dropdown selected label. ([80b9c8f5](https://github.com/ensembleUI/ensemble/commit/80b9c8f54c753aca7884fd12ed449c5f019d981b))
+ - **FEAT**: reinitialize app state when internet connectivity is restored. ([e914e337](https://github.com/ensembleUI/ensemble/commit/e914e337e54bbe539f08aa192b0a50b118708a00))
+ - **FEAT**: implement internet connectivity check in runtime. ([30204d3b](https://github.com/ensembleUI/ensemble/commit/30204d3bb29324d9ae44380fc919b450cf30cfd0))
+
+
 ## 2025-02-07
 
 ### Changes
diff --git a/modules/auth/pubspec.yaml b/modules/auth/pubspec.yaml
@@ -28,7 +28,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
 
   ensemble_ts_interpreter:
diff --git a/modules/bracket/pubspec.yaml b/modules/bracket/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
 
 dev_dependencies:
diff --git a/modules/camera/pubspec.yaml b/modules/camera/pubspec.yaml
@@ -15,7 +15,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
   ensemble_ts_interpreter:
     git:
diff --git a/modules/chat/pubspec.yaml b/modules/chat/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
 
   ensemble_ts_interpreter:
diff --git a/modules/connect/pubspec.yaml b/modules/connect/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
 
   plaid_flutter: ^3.1.2
diff --git a/modules/contacts/pubspec.yaml b/modules/contacts/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
 
   flutter_contacts: ^1.1.7+1
diff --git a/modules/deeplink/pubspec.yaml b/modules/deeplink/pubspec.yaml
@@ -13,7 +13,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
 
   flutter_branch_sdk: ^7.0.1
diff --git a/modules/ensemble/CHANGELOG.md b/modules/ensemble/CHANGELOG.md
@@ -1,3 +1,11 @@
+## 1.1.22
+
+ - **REFACTOR**: remove no internet widget. ([e03359b2](https://github.com/ensembleUI/ensemble/commit/e03359b2dd6b1290bea39c71c69e2a3d5ad27c13))
+ - **REFACTOR**: replace offline widget with error screen for no internet connection. ([b0163a1b](https://github.com/ensembleUI/ensemble/commit/b0163a1ba20eb72c7a459afb3dfa59e1729cf9bf))
+ - **FIX**: auto complete dropdown selected label. ([80b9c8f5](https://github.com/ensembleUI/ensemble/commit/80b9c8f54c753aca7884fd12ed449c5f019d981b))
+ - **FEAT**: reinitialize app state when internet connectivity is restored. ([e914e337](https://github.com/ensembleUI/ensemble/commit/e914e337e54bbe539f08aa192b0a50b118708a00))
+ - **FEAT**: implement internet connectivity check in runtime. ([30204d3b](https://github.com/ensembleUI/ensemble/commit/30204d3bb29324d9ae44380fc919b450cf30cfd0))
+
 ## 1.1.21
 
 ## 1.1.20
diff --git a/modules/ensemble/lib/ensemble_app.dart b/modules/ensemble/lib/ensemble_app.dart
@@ -30,6 +30,7 @@ import 'package:flutter_localizations/flutter_localizations.dart';
 import 'package:flutter_localized_locales/flutter_localized_locales.dart';
 import 'package:workmanager/workmanager.dart';
 import 'package:yaml/yaml.dart';
+import 'package:connectivity_plus/connectivity_plus.dart';
 
 const String backgroundUploadTask = 'backgroundUploadTask';
 const String backgroundBluetoothSubscribeTask = 'backgroundBluetoothSubscribeTask';
@@ -141,11 +142,22 @@ class EnsembleAppState extends State<EnsembleApp> with WidgetsBindingObserver {
   // the entire App to reload (e.g. change Locale at runtime)
   Key? appKey;
 
+  bool _hasInternet = true;
+  late final StreamSubscription<List<ConnectivityResult>>
+      _connectivitySubscription;
+
   @override
   void initState() {
     super.initState();
     WidgetsBinding.instance.addObserver(this);
     config = initApp();
+
+    // Initialize connectivity listener.
+    _updateConnectivity();
+    _connectivitySubscription = Connectivity()
+        .onConnectivityChanged
+        .listen((_) => _updateConnectivity());
+
     // Initialize native features.
     if (!kIsWeb) {
       Workmanager().initialize(callbackDispatcher, isInDebugMode: false);
@@ -173,6 +185,23 @@ class EnsembleAppState extends State<EnsembleApp> with WidgetsBindingObserver {
     }
   }
 
+  /// Check the device’s connectivity and update the state.
+  Future<void> _updateConnectivity() async {
+    final result = await Connectivity().checkConnectivity();
+    final hasInternetNow = result.any((r) => r != ConnectivityResult.none);
+
+    // If connectivity has been restored, reinitialize the app
+    if (!_hasInternet && hasInternetNow) {
+      setState(() {
+        config = initApp();
+      });
+    }
+
+    setState(() {
+      _hasInternet = hasInternetNow;
+    });
+  }
+
   @override
   void didChangeAppLifecycleState(AppLifecycleState state) async {
     super.didChangeAppLifecycleState(state);
@@ -192,6 +221,7 @@ class EnsembleAppState extends State<EnsembleApp> with WidgetsBindingObserver {
 
   @override
   void dispose() {
+    _connectivitySubscription.cancel();
     WidgetsBinding.instance.removeObserver(this);
     super.dispose();
   }
diff --git a/modules/ensemble/lib/widget/input/dropdown.dart b/modules/ensemble/lib/widget/input/dropdown.dart
@@ -297,10 +297,26 @@ class SelectOneState extends FormFieldWidgetState<SelectOne>
     });*/
     widget.controller.textEditingController =
         TextEditingController(text: widget.getValue());
+    focusNode.addListener(_handleFocusChange);
 
     super.initState();
   }
 
+  void _handleFocusChange() {
+      // If gaining focus, scroll into view
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          final context = validatorKey.currentContext;
+          if (context != null) {
+            Scrollable.ensureVisible(
+              context,
+              duration: const Duration(milliseconds: 300),
+              curve: Curves.easeInOut,
+              alignment: 0.5,
+            );
+          }
+        });
+  }
+
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
@@ -477,6 +493,8 @@ class SelectOneState extends FormFieldWidgetState<SelectOne>
                 if (kDebugMode) {
                   print('Selected: ${selection.value}');
                 }
+                widget.controller.textEditingController.text =
+                    selection.label ?? selection.value;
               },
               optionsViewBuilder: (BuildContext context,
                   AutocompleteOnSelected<SelectOneItem> onSelected,
diff --git a/modules/ensemble/lib/widget/radio/radio_group.dart b/modules/ensemble/lib/widget/radio/radio_group.dart
@@ -41,7 +41,10 @@ class RadioGroup extends StatefulWidget
 
   @override
   Map<String, Function> methods() {
-    return {};
+    return {
+      'focus': () => _controller.radioGroupAction?.focusInputField(),
+      'unfocus': () => _controller.radioGroupAction?.unfocusInputField(),
+    };
   }
 
   @override
@@ -73,7 +76,12 @@ class RadioGroup extends StatefulWidget
   }
 }
 
+mixin RadioGroupAction on FormFieldWidgetState<RadioGroup> {
+  void focusInputField();
+  void unfocusInputField();
+}
 class RadioGroupController extends FormFieldController {
+  RadioGroupAction? radioGroupAction;
   dynamic selectedValue;
 
   // list of string for items
@@ -101,12 +109,43 @@ class RadioGroupController extends FormFieldController {
 }
 
 class RadioGroupState extends FormFieldWidgetState<RadioGroup>
-    with TemplatedWidgetState {
+    with RadioGroupAction, TemplatedWidgetState {
   List? itemTemplateData;
+  FocusNode focusNode = FocusNode();
+
+  @override
+  void initState() {
+    super.initState();
+    focusNode.addListener(_handleFocusChange);
+  }
+
+  @override
+  void dispose() {
+    focusNode.removeListener(_handleFocusChange);
+    focusNode.dispose();
+    super.dispose();
+  }
+
+  void _handleFocusChange() {
+      // If gaining focus, scroll into view
+        WidgetsBinding.instance.addPostFrameCallback((_) {
+          final context = validatorKey.currentContext;
+          if (context != null) {
+            Scrollable.ensureVisible(
+              context,
+              duration: const Duration(milliseconds: 300),
+              curve: Curves.easeInOut,
+              alignment: 0.5,
+            );
+          }
+        });
+      
+  }
 
   @override
   void didChangeDependencies() {
     super.didChangeDependencies();
+    widget.controller.radioGroupAction = this;
 
     if (widget._controller.itemTemplate != null) {
       registerItemTemplate(context, widget._controller.itemTemplate!,
@@ -116,6 +155,20 @@ class RadioGroupState extends FormFieldWidgetState<RadioGroup>
     }
   }
 
+  @override
+  void focusInputField() {
+    if (!focusNode.hasFocus) {
+      focusNode.requestFocus();
+    }
+  }
+
+  @override
+  void unfocusInputField() {
+    if (focusNode.hasFocus) {
+      focusNode.unfocus();
+    }
+  }
+
   @override
   Widget buildWidget(BuildContext context) {
     // build the children and gap if applicable
@@ -159,7 +212,9 @@ class RadioGroupState extends FormFieldWidgetState<RadioGroup>
           return null;
         },
         builder: (FormFieldState<String> field) {
-          return InputDecorator(
+          return Focus(
+            focusNode: focusNode,
+            child: InputDecorator(
               decoration: inputDecoration.copyWith(
                   contentPadding: EdgeInsets.zero,
                   filled: false,
@@ -169,7 +224,8 @@ class RadioGroupState extends FormFieldWidgetState<RadioGroup>
                   focusedBorder: InputBorder.none,
                   errorText: field.errorText,
                   errorStyle: widget._controller.errorStyle ?? Theme.of(context).inputDecorationTheme.errorStyle),
-              child: rtn);
+              child: rtn),
+          );
         },
       ),
     );
diff --git a/modules/ensemble/pubspec.yaml b/modules/ensemble/pubspec.yaml
@@ -15,7 +15,7 @@ description: Ensemble Runtime
 # This version is used _only_ for the Runner app, which is used if you just do
 # a `flutter run` or a `flutter make-host-app-editable`. It has no impact
 # on any other native host app that you embed your Flutter project into.
-version: 1.1.21
+version: 1.1.22
 
 environment:
   sdk: ">=3.5.0"
@@ -143,6 +143,7 @@ dependencies:
   flutter_slidable: ^3.1.1
   accordion: ^2.6.0
   session_storage: ^0.0.1
+  connectivity_plus: ^6.1.3
 
 dependency_overrides:
   http: ^0.13.5
diff --git a/modules/ensemble_bluetooth/pubspec.yaml b/modules/ensemble_bluetooth/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
   ensemble_ts_interpreter:
     git:
diff --git a/modules/ensemble_network_info/pubspec.yaml b/modules/ensemble_network_info/pubspec.yaml
@@ -12,7 +12,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
 
   network_info_plus: ^5.0.3
diff --git a/modules/file_manager/pubspec.yaml b/modules/file_manager/pubspec.yaml
@@ -14,7 +14,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
   ensemble_ts_interpreter:
     git:
diff --git a/modules/firebase_analytics/pubspec.yaml b/modules/firebase_analytics/pubspec.yaml
@@ -40,7 +40,7 @@ dependencies:
   ensemble:
     git:
       url: https://github.com/EnsembleUI/ensemble.git
-      ref: ensemble-v1.1.21
+      ref: ensemble-v1.1.22
       path: modules/ensemble
 
 dev_dependencies:
diff --git a/modules/location/pubspec.yaml b/modules/location/pubspec.yaml
diff --git a/modules/moengage/pubspec.yaml b/modules/moengage/pubspec.yaml
diff --git a/starter/pubspec.yaml b/starter/pubspec.yaml
