chore: update to upstream 543c885bc118726b5d56f39ddc6179f4304c1f65

ZebraDevs · Jun 3, 2024 · c3ea29b · c3ea29b
1 parent 2f49efb
commit c3ea29b
Show file tree

Hide file tree

Showing 12 changed files with 484 additions and 460 deletions.
diff --git a/example/android/app/src/profile/AndroidManifest.xml b/example/android/app/src/profile/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.example">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Flutter needs it to communicate with the running application
          to allow setting breakpoints, to provide hot reload, etc.
     -->

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -2,6 +2,7 @@ allprojects {
     repositories {
         google()
         jcenter()
+        mavenCentral()
     }
 
     subprojects {

diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-all.zip
diff --git a/example/android/settings.gradle b/example/android/settings.gradle
@@ -5,21 +5,23 @@ pluginManagement {
         def flutterSdkPath = properties.getProperty("flutter.sdk")
         assert flutterSdkPath != null, "flutter.sdk not set in local.properties"
         return flutterSdkPath
-    }()
+    }
+    settings.ext.flutterSdkPath = flutterSdkPath()
 
-    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+    includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")
 
     repositories {
         google()
+        jcenter()
         mavenCentral()
         gradlePluginPortal()
     }
 }
 
 plugins {
     id "dev.flutter.flutter-plugin-loader" version "1.0.0"
-    id "com.android.application" version "7.4.2" apply false
-    id "org.jetbrains.kotlin.android" version "1.7.21" apply false
+    id "com.android.application" version "7.3.0" apply false
+    id "org.jetbrains.kotlin.android" version "1.7.10" apply false
 }
 
 include ":app"
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -6,35 +6,35 @@ PODS:
     - JPSVolumeButtonHandler
   - device_info_plus (0.0.1):
     - Flutter
-  - DKImagePickerController/Core (4.3.4):
+  - DKImagePickerController/Core (4.3.9):
     - DKImagePickerController/ImageDataManager
     - DKImagePickerController/Resource
-  - DKImagePickerController/ImageDataManager (4.3.4)
-  - DKImagePickerController/PhotoGallery (4.3.4):
+  - DKImagePickerController/ImageDataManager (4.3.9)
+  - DKImagePickerController/PhotoGallery (4.3.9):
     - DKImagePickerController/Core
     - DKPhotoGallery
-  - DKImagePickerController/Resource (4.3.4)
-  - DKPhotoGallery (0.0.17):
-    - DKPhotoGallery/Core (= 0.0.17)
-    - DKPhotoGallery/Model (= 0.0.17)
-    - DKPhotoGallery/Preview (= 0.0.17)
-    - DKPhotoGallery/Resource (= 0.0.17)
+  - DKImagePickerController/Resource (4.3.9)
+  - DKPhotoGallery (0.0.19):
+    - DKPhotoGallery/Core (= 0.0.19)
+    - DKPhotoGallery/Model (= 0.0.19)
+    - DKPhotoGallery/Preview (= 0.0.19)
+    - DKPhotoGallery/Resource (= 0.0.19)
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Core (0.0.17):
+  - DKPhotoGallery/Core (0.0.19):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Preview
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Model (0.0.17):
+  - DKPhotoGallery/Model (0.0.19):
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Preview (0.0.17):
+  - DKPhotoGallery/Preview (0.0.19):
     - DKPhotoGallery/Model
     - DKPhotoGallery/Resource
     - SDWebImage
     - SwiftyGif
-  - DKPhotoGallery/Resource (0.0.17):
+  - DKPhotoGallery/Resource (0.0.19):
     - SDWebImage
     - SwiftyGif
   - file_picker (0.0.1):
@@ -62,17 +62,17 @@ PODS:
   - JPSVolumeButtonHandler (1.0.5)
   - just_audio (0.0.1):
     - Flutter
-  - libwebp (1.3.1):
-    - libwebp/demux (= 1.3.1)
-    - libwebp/mux (= 1.3.1)
-    - libwebp/sharpyuv (= 1.3.1)
-    - libwebp/webp (= 1.3.1)
-  - libwebp/demux (1.3.1):
+  - libwebp (1.3.2):
+    - libwebp/demux (= 1.3.2)
+    - libwebp/mux (= 1.3.2)
+    - libwebp/sharpyuv (= 1.3.2)
+    - libwebp/webp (= 1.3.2)
+  - libwebp/demux (1.3.2):
     - libwebp/webp
-  - libwebp/mux (1.3.1):
+  - libwebp/mux (1.3.2):
     - libwebp/demux
-  - libwebp/sharpyuv (1.3.1)
-  - libwebp/webp (1.3.1):
+  - libwebp/sharpyuv (1.3.2)
+  - libwebp/webp (1.3.2):
     - libwebp/sharpyuv
   - Mantle (2.2.0):
     - Mantle/extobjc (= 2.2.0)
@@ -90,10 +90,10 @@ PODS:
   - record_darwin (1.0.0):
     - Flutter
     - FlutterMacOS
-  - SDWebImage (5.17.0):
-    - SDWebImage/Core (= 5.17.0)
-  - SDWebImage/Core (5.17.0)
-  - SDWebImageWebPCoder (0.13.0):
+  - SDWebImage (5.19.2):
+    - SDWebImage/Core (= 5.19.2)
+  - SDWebImage/Core (5.19.2)
+  - SDWebImageWebPCoder (0.14.6):
     - libwebp (~> 1.0)
     - SDWebImage/Core (~> 5.17)
   - share_plus (0.0.1):
@@ -106,7 +106,7 @@ PODS:
     - FlutterMacOS
   - super_native_extensions (0.0.1):
     - Flutter
-  - SwiftyGif (5.4.4)
+  - SwiftyGif (5.4.5)
   - url_launcher_ios (0.0.1):
     - Flutter
   - video_compress (0.3.0):
@@ -209,8 +209,8 @@ SPEC CHECKSUMS:
   audio_session: 088d2483ebd1dc43f51d253d4a1c517d9a2e7207
   camerawesome: 1e06540f60158809bc70f398ed1ac2cf93fe4188
   device_info_plus: 97af1d7e84681a90d0693e63169a5d50e0839a0d
-  DKImagePickerController: b512c28220a2b8ac7419f21c491fc8534b7601ac
-  DKPhotoGallery: fdfad5125a9fdda9cc57df834d49df790dbb4179
+  DKImagePickerController: 946cec48c7873164274ecc4624d19e3da4c1ef3c
+  DKPhotoGallery: b3834fecb755ee09a593d7c9e389d8b5d6deed60
   file_picker: 09aa5ec1ab24135ccd7a1621c46c84134bfd6655
   Flutter: e0871f40cf51350855a761d2e70bf5af5b9b5de7
   flutter_image_compress_common: ec1d45c362c9d30a3f6a0426c297f47c52007e3e
@@ -220,26 +220,26 @@ SPEC CHECKSUMS:
   irondash_engine_context: 3458bf979b90d616ffb8ae03a150bafe2e860cc9
   JPSVolumeButtonHandler: 53110330c9168ed325def93eabff39f0fe3e8082
   just_audio: baa7252489dbcf47a4c7cc9ca663e9661c99aafa
-  libwebp: 33dc822fbbf4503668d09f7885bbfedc76c45e96
+  libwebp: 1786c9f4ff8a279e4dac1e8f385004d5fc253009
   Mantle: c5aa8794a29a022dfbbfc9799af95f477a69b62d
   open_filex: 6e26e659846ec990262224a12ef1c528bb4edbe4
   OrderedSet: aaeb196f7fef5a9edf55d89760da9176ad40b93c
   package_info_plus: 58f0028419748fad15bf008b270aaa8e54380b1c
   path_provider_foundation: 2b6b4c569c0fb62ec74538f866245ac84301af46
   permission_handler_apple: 9878588469a2b0d0fc1e048d9f43605f92e6cec2
   record_darwin: 1f6619f2abac4d1ca91d3eeab038c980d76f1517
-  SDWebImage: 750adf017a315a280c60fde706ab1e552a3ae4e9
-  SDWebImageWebPCoder: af09429398d99d524cae2fe00f6f0f6e491ed102
+  SDWebImage: dfe95b2466a9823cf9f0c6d01217c06550d7b29a
+  SDWebImageWebPCoder: e38c0a70396191361d60c092933e22c20d5b1380
   share_plus: 8875f4f2500512ea181eef553c3e27dba5135aad
   shared_preferences_foundation: fcdcbc04712aee1108ac7fda236f363274528f78
   sqflite: 673a0e54cc04b7d6dba8d24fb8095b31c3a99eec
   super_native_extensions: 4916b3c627a9c7fffdc48a23a9eca0b1ac228fa7
-  SwiftyGif: 93a1cc87bf3a51916001cf8f3d63835fb64c819f
+  SwiftyGif: 706c60cf65fa2bc5ee0313beece843c8eb8194d4
   url_launcher_ios: 5334b05cef931de560670eeae103fd3e431ac3fe
   video_compress: fce97e4fb1dfd88175aa07d2ffc8a2f297f87fbe
   video_player_avfoundation: 7c6c11d8470e1675df7397027218274b6d2360b3
   wakelock_plus: 78ec7c5b202cab7761af8e2b2b3d0671be6c4ae1
 
 PODFILE CHECKSUM: ef2759a31e8883d6b534c00ef22a7f4104f8de0d
 
-COCOAPODS: 1.15.1
+COCOAPODS: 1.15.2
diff --git a/lib/src/components/molecules/block_table.dart b/lib/src/components/molecules/block_table.dart
@@ -122,7 +122,6 @@ class ZdsBlockTable extends StatefulWidget {
 
 class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
   final LinkedScrollControllerGroup _controllers = LinkedScrollControllerGroup();
-  late final double headerHeight;
 
   late ScrollController _tableHeader;
   late ScrollController _tableBody;
@@ -139,13 +138,20 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
     _tableBody = _controllers.addAndGet();
 
     WidgetsBinding.instance.addPostFrameCallback((Duration timeStamp) {
-      headerHeight = widget.rowHeaderHeight;
       buildTable();
     });
 
     WidgetsBinding.instance.addObserver(this);
   }
 
+  TextScaler get _textScaler => MediaQuery.of(context).textScaler;
+
+  double get _headerHeight => _textScaler.scale(widget.rowHeaderHeight);
+
+  double get _columnWidth => _textScaler.scale(widget.columnWidth);
+
+  double get _cellHeight => _textScaler.scale(widget.cellHeight);
+
   @override
   void didChangeMetrics() {
     WidgetsBinding.instance.addPostFrameCallback((Duration timeStamp) {
@@ -252,7 +258,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
               ),
               alignment: Alignment.center,
               width: _getDayColumnWidth(),
-              height: 28,
+              height: _textScaler.scale(28),
               child: Text(
                 items[index].text,
                 style: themeData.textTheme.bodySmall?.copyWith(
@@ -285,7 +291,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
               children: <Widget>[
                 if (row.header != null)
                   Container(
-                    height: headerHeight,
+                    height: _headerHeight,
                     width: _getAssocColumnWidth(),
                     decoration: BoxDecoration(
                       color: zetaColors.borderDisabled,
@@ -327,7 +333,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
                   ),
                   alignment: Alignment.center,
                   width: _getAssocColumnWidth(),
-                  height: widget.cellHeight + widget.cellPadding,
+                  height: _cellHeight + widget.cellPadding,
                   margin: const EdgeInsets.only(bottom: 1),
                   child: cellItem.child ??
                       Text(
@@ -355,15 +361,15 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
   List<Widget> _buildRowElements(int index) {
     final List<Widget> cells = <Widget>[];
     final List<ZdsBlockTableRow> rows = widget.rows;
-    final double cellHeight = widget.cellHeight + widget.cellPadding;
+    final double cellHeight = _cellHeight + widget.cellPadding;
     final zetaColors = Zeta.of(context).colors;
     for (int j = 0; j < rows[index].data.length; j++) {
       final List<Widget> columnWidgets = <Widget>[];
 
       if (rows[index].header != null) {
         columnWidgets.add(
           Container(
-            height: headerHeight,
+            height: _headerHeight,
             decoration: BoxDecoration(
               color: zetaColors.borderDisabled,
               border: Border(
@@ -447,7 +453,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
           Container(
             alignment: Alignment.center,
             width: _getDayColumnWidth(),
-            height: cellHeight + (rows[index].header != null ? headerHeight : 0),
+            height: cellHeight + (rows[index].header != null ? _headerHeight : 0),
             child: cells[indx],
           ),
           const SizedBox(
@@ -489,7 +495,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
       ),
       alignment: Alignment.center,
       width: _getAssocColumnWidth(),
-      height: 28,
+      height: _textScaler.scale(28),
     ).paddingOnly(right: 1);
   }
 
@@ -503,7 +509,7 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
   }
 
   double _firstColMinWidth() {
-    return widget.columnWidth + 40;
+    return _columnWidth + 40;
   }
 
   double _screenWidthSafe() {
@@ -515,17 +521,17 @@ class _BlockTable extends State<ZdsBlockTable> with WidgetsBindingObserver {
   double _getDayColumnWidth() {
     final bool isLandscape = MediaQuery.of(context).orientation == Orientation.landscape;
     if (!isLandscape && (!context.isTablet())) {
-      return widget.columnWidth;
+      return _columnWidth;
     }
     double screenWidth = _screenWidthSafe().floorToDouble();
     screenWidth -= _firstColMinWidth(); // remove first column
     final double suggestedWidth = (screenWidth / 7).floorToDouble();
-    return suggestedWidth > widget.columnWidth ? suggestedWidth : widget.columnWidth;
+    return suggestedWidth > _columnWidth ? suggestedWidth : _columnWidth;
   }
 
   @override
   void debugFillProperties(DiagnosticPropertiesBuilder properties) {
     super.debugFillProperties(properties);
-    properties.add(DoubleProperty('headerHeight', headerHeight));
+    properties.add(DoubleProperty('headerHeight', _headerHeight));
   }
 }
diff --git a/lib/src/components/molecules/slidable_list_tile.dart b/lib/src/components/molecules/slidable_list_tile.dart
@@ -49,6 +49,7 @@ class ZdsSlidableListTile extends StatelessWidget {
     this.onTap,
     this.slideEnabled = true,
     this.semanticDescription,
+    this.excludeSemantics = false,
   }) : assert(actions == null || slideButtonWidth * actions.length <= width, '');
 
   /// The tile's main content. Usually a [Row]
@@ -86,6 +87,8 @@ class ZdsSlidableListTile extends StatelessWidget {
   /// Typically will contain all the text displayed on the card UI.
   final String? semanticDescription;
 
+  /// Flag to exclude child component semantics.
+  final bool excludeSemantics;
   @override
   Widget build(BuildContext context) {
     final Map<CustomSemanticsAction, VoidCallback> semanticActions = <CustomSemanticsAction, VoidCallback>{};
@@ -99,7 +102,7 @@ class ZdsSlidableListTile extends StatelessWidget {
     return Semantics(
       label: semanticDescription,
       customSemanticsActions: semanticActions,
-      excludeSemantics: semanticDescription != null,
+      excludeSemantics: excludeSemantics,
       child: Slidable(
         enabled: slideEnabled,
         startActionPane: leadingActions != null && leadingActions!.isNotEmpty
@@ -147,7 +150,8 @@ class ZdsSlidableListTile extends StatelessWidget {
       ..add(ObjectFlagProperty<VoidCallback?>.has('onTap', onTap))
       ..add(DiagnosticsProperty<bool>('slideEnabled', slideEnabled))
       ..add(DoubleProperty('minHeight', minHeight))
-      ..add(StringProperty('semanticDescription', semanticDescription));
+      ..add(StringProperty('semanticDescription', semanticDescription))
+      ..add(DiagnosticsProperty<bool>('excludeSemantics', excludeSemantics));
   }
 }
 

diff --git a/lib/src/components/organisms/camera/camera_page.dart b/lib/src/components/organisms/camera/camera_page.dart
@@ -147,7 +147,7 @@ class ZdsCamera extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     return PopScope(
-      onPopInvoked: (_) => Future.value(false),
+      canPop: false,
       child: Scaffold(
         backgroundColor: Colors.black,
         body: SafeArea(