Merge branch 'refs/heads/design_3.0_TM_Module' into design_3.0_task_module_new

# Conflicts:
#	lib/views/widgets/images/multi_image_picker.dart

lib/controllers/api_routes/urls.dart

@@ -1,7 +1,7 @@
 class URLs {
   URLs._();
 
-  static const String appReleaseBuildNumber = "18";
+  static const String appReleaseBuildNumber = "19";
 
   // static const host1 = "https://atomsm.hmg.com"; // production url
   // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url

lib/views/widgets/images/multi_image_picker.dart

@@ -115,7 +115,7 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
       return;
     }
 
-    ImageSource source = (await showModalBottomSheet(
+    ImageSource? source = (await showModalBottomSheet(
       context: context,
       shape: const RoundedRectangleBorder(
         borderRadius: BorderRadius.vertical(
@@ -146,8 +146,8 @@ class _MultiFilesPickerState extends State<MultiFilesPicker> {
           12.height,
         ],
       ).paddingAll(21),
-    )) as ImageSource;
-
+    )) as ImageSource?;
+    if (source == null) return;
     final pickedFile = await ImagePicker().pickImage(source: source, imageQuality: 70, maxWidth: 800, maxHeight: 800);
 
     if (pickedFile != null) {

pubspec.yaml

@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 1.3.2+21
+version: 1.3.3+22
 
 environment:
   sdk: ">=3.5.0 <4.0.0"