Merge branch 'collaboration_view' into fixes

lib/ui/components/bottom_action_bar/expanded_menu_widget.dart

@@ -11,11 +11,14 @@ class ExpandedMenuWidget extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    const double itemHeight = 48;
-    const double whiteSpaceBetweenSections = 16;
-    const double dividerHeightBetweenItems = 1;
-    int numberOfDividers = 0;
-    double combinedHeightOfItems = 0;
+    double textScaleFactor = MediaQuery.of(context).textScaleFactor;
+    textScaleFactor < 1.0 ? textScaleFactor = 1.0 : null;
+    //20 is height of font and 28 is total whitespace (top+bottom)
+    final double itemHeight = (20.0 * textScaleFactor) + 28.0;
+    const double whiteSpaceBetweenSections = 16.0;
+    const double dividerHeightBetweenItems = 1.0;
+    double numberOfDividers = 0.0;
+    double combinedHeightOfItems = 0.0;
 
     for (List<BlurMenuItemWidget> group in items) {
       //no divider if there is only one item in the section/group
@@ -30,7 +33,7 @@ class ExpandedMenuWidget extends StatelessWidget {
       child: SizedBox(
         height: combinedHeightOfItems +
             (dividerHeightBetweenItems * numberOfDividers) +
-            (whiteSpaceBetweenSections * (items.length - 1)),
+            (whiteSpaceBetweenSections * (items.length - 1.0)),
         child: ListView.separated(
           padding: const EdgeInsets.all(0),
           physics: const NeverScrollableScrollPhysics(),

lib/ui/viewer/actions/file_selection_overlay_bar.dart

@@ -93,7 +93,7 @@ class _FileSelectionOverlayBarState extends State<FileSelectionOverlayBar> {
     }
     iconsButton.add(
       IconButtonWidget(
-        icon: Icons.ios_share_outlined,
+        icon: Icons.adaptive.share_outlined,
         iconButtonType: IconButtonType.primary,
         iconColor: getEnteColorScheme(context).blurStrokeBase,
         onTap: () => shareSelected(

lib/utils/dialog_util.dart

@@ -7,11 +7,15 @@ import 'package:flutter/material.dart';
 import 'package:photos/ui/common/loading_widget.dart';
 import 'package:photos/ui/common/progress_dialog.dart';
 
-ProgressDialog createProgressDialog(BuildContext context, String message) {
+ProgressDialog createProgressDialog(
+  BuildContext context,
+  String message, {
+  isDismissible = false,
+}) {
   final dialog = ProgressDialog(
     context,
     type: ProgressDialogType.normal,
-    isDismissible: false,
+    isDismissible: isDismissible,
     barrierColor: Colors.black12,
   );
   dialog.style(

lib/utils/share_util.dart

@@ -24,7 +24,12 @@ Future<void> share(
   List<File> files, {
   GlobalKey shareButtonKey,
 }) async {
-  final dialog = createProgressDialog(context, "Preparing...");
+  final remoteFileCount = files.where((element) => element.isRemoteFile).length;
+  final dialog = createProgressDialog(
+    context,
+    "Preparing...",
+    isDismissible: remoteFileCount > 2,
+  );
   await dialog.show();
   try {
     final List<Future<String>> pathFutures = [];

pubspec.yaml

@@ -12,7 +12,7 @@ description: ente photos application
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 
-version: 0.6.78+398
+version: 0.6.79+399
 
 environment:
   sdk: '>=2.17.0 <3.0.0'