π End-to-end encrypted cloud for everything.
Dart 2faandroidauthye2eeencryptionend-to-end-encryptionfluttergolanggoogle-photosgoogle-photos-alternativeiosopensourcephotosprivacyprivacy-toolstypescriptzero-knowledge
Consolidate album sharing scrollbars
AmanRajSinghMourya729ea7274a90
diff --git a/mobile/apps/photos/lib/ui/sharing/add_people_sheet.dart b/mobile/apps/photos/lib/ui/sharing/add_people_sheet.dartindex e56f49d33e..7af5c3ab1d 100644--- a/mobile/apps/photos/lib/ui/sharing/add_people_sheet.dart+++ b/mobile/apps/photos/lib/ui/sharing/add_people_sheet.dart@@ -599,18 +599,10 @@ class _ContactSuggestions extends StatelessWidget {return SizedBox(height: viewportHeight,child: showScrollbar- ? RawScrollbar(+ ? shareScrollbar(+ context,key: const ValueKey("contact-suggestions-scrollbar"),controller: scrollController,- thumbVisibility: true,- trackVisibility: true,- interactive: true,- thickness: 5,- radius: const Radius.circular(3),- trackRadius: const Radius.circular(3),- thumbColor: context.componentColors.fillDarkest,- trackColor: context.componentColors.fillDark,- padding: EdgeInsets.zero,child: grid,): grid,diff --git a/mobile/apps/photos/lib/ui/sharing/share_components.dart b/mobile/apps/photos/lib/ui/sharing/share_components.dartindex 7051d58ffe..5b11573cab 100644--- a/mobile/apps/photos/lib/ui/sharing/share_components.dart+++ b/mobile/apps/photos/lib/ui/sharing/share_components.dart@@ -223,6 +223,29 @@ class ShareMenuItem extends StatelessWidget {}}+RawScrollbar shareScrollbar(+ BuildContext context, {+ Key? key,+ required ScrollController controller,+ required Widget child,+}) {+ final colors = context.componentColors;+ return RawScrollbar(+ key: key,+ controller: controller,+ thumbVisibility: true,+ trackVisibility: true,+ interactive: true,+ thickness: 5,+ radius: const Radius.circular(3),+ trackRadius: const Radius.circular(3),+ thumbColor: colors.fillDarkest,+ trackColor: colors.fillDark,+ padding: EdgeInsets.zero,+ child: child,+ );+}+Widget shareChevron(BuildContext context) {return Icon(Icons.chevron_right_rounded,diff --git a/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart b/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dartindex 7c04c9b59c..0f97218f33 100644--- a/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart+++ b/mobile/apps/photos/lib/ui/sharing/widgets/participant_row.dart@@ -50,18 +50,10 @@ class _ScrollableParticipantRosterStatereturn SizedBox(height: viewportHeight,child: showScrollbar- ? RawScrollbar(+ ? shareScrollbar(+ context,key: const ValueKey("participant-roster-scrollbar"),controller: _scrollController,- thumbVisibility: true,- trackVisibility: true,- interactive: true,- thickness: 5,- radius: const Radius.circular(3),- trackRadius: const Radius.circular(3),- thumbColor: context.componentColors.fillDarkest,- trackColor: context.componentColors.fillDark,- padding: EdgeInsets.zero,child: Padding(padding: const EdgeInsetsDirectional.only(end: Spacing.sm + 5),child: roster,diff --git a/mobile/apps/photos/lib/ui/sharing/widgets/selected_person_chip.dart b/mobile/apps/photos/lib/ui/sharing/widgets/selected_person_chip.dartindex 772e94ad6c..0a77fe5d00 100644--- a/mobile/apps/photos/lib/ui/sharing/widgets/selected_person_chip.dart+++ b/mobile/apps/photos/lib/ui/sharing/widgets/selected_person_chip.dart@@ -5,6 +5,7 @@ import "package:flutter/material.dart";import "package:hugeicons/hugeicons.dart";import "package:photos/models/api/collection/user.dart";import "package:photos/services/contacts/contact_identity_resolver.dart";+import "package:photos/ui/sharing/share_components.dart";import "package:photos/ui/sharing/user_avator_widget.dart";class SelectedRecipientChips extends StatelessWidget {@@ -49,24 +50,15 @@ class SelectedRecipientChips extends StatelessWidget {if (viewportMaxHeight <= 0) {return const SizedBox.shrink();}- final colors = context.componentColors;return ConstrainedBox(constraints: BoxConstraints(minWidth: constraints.maxWidth,maxHeight: viewportMaxHeight,),- child: RawScrollbar(+ child: shareScrollbar(+ context,key: const ValueKey("selected-people-scrollbar"),controller: scrollController,- thumbVisibility: true,- trackVisibility: true,- interactive: true,- thickness: 5,- radius: const Radius.circular(3),- trackRadius: const Radius.circular(3),- thumbColor: colors.fillDarkest,- trackColor: colors.fillDark,- padding: EdgeInsets.zero,child: SingleChildScrollView(key: const ValueKey("selected-people-scroll"),controller: scrollController,