From 39d50d24f0f9dbcbcb1d433d96e7552a0e919fc6 Mon Sep 17 00:00:00 2001 From: Aman Raj Singh Mourya Date: Mon, 3 Jun 2024 13:15:09 +0530 Subject: [PATCH] [mob][photos] send link button changed --- .../selection_action_button_widget.dart | 48 ++++++++- .../file_selection_actions_widget.dart | 97 ++++++++++--------- 2 files changed, 92 insertions(+), 53 deletions(-) diff --git a/mobile/lib/ui/components/bottom_action_bar/selection_action_button_widget.dart b/mobile/lib/ui/components/bottom_action_bar/selection_action_button_widget.dart index 5ca6a25dcc..662eb3d936 100644 --- a/mobile/lib/ui/components/bottom_action_bar/selection_action_button_widget.dart +++ b/mobile/lib/ui/components/bottom_action_bar/selection_action_button_widget.dart @@ -1,3 +1,5 @@ +import 'dart:math' as math; + import "package:flutter/material.dart"; import "package:photos/theme/ente_theme.dart"; @@ -89,11 +91,47 @@ class __BodyState extends State<_Body> { mainAxisAlignment: MainAxisAlignment.center, mainAxisSize: MainAxisSize.min, children: [ - Icon( - widget.icon, - size: 24, - color: getEnteColorScheme(context).textMuted, - ), + if (widget.icon == Icons.navigation_rounded) + Transform.rotate( + angle: math.pi / 2, + child: Icon( + widget.icon, + size: 24, + color: getEnteColorScheme(context).primary300, + shadows: const [ + BoxShadow( + color: Color.fromARGB(30, 0, 179, 60), + offset: Offset(0, 2.51), + blurRadius: 5.02, + spreadRadius: 0, + ), + BoxShadow( + color: Color.fromARGB(61, 0, 179, 60), + offset: Offset(0, 1.25), + blurRadius: 3.76, + spreadRadius: 0, + ), + BoxShadow( + color: Color.fromARGB(61, 0, 179, 60), + offset: Offset(0, 0.63), + blurRadius: 1.88, + spreadRadius: 0, + ), + BoxShadow( + color: Color.fromARGB(61, 255, 255, 255), + offset: Offset(0.63, 0.63), + blurRadius: 1.25, + spreadRadius: 0, + ), + ], + ), + ) + else + Icon( + widget.icon, + size: 24, + color: getEnteColorScheme(context).textMuted, + ), const SizedBox(height: 4), Text( widget.labelText, diff --git a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart index ac9cdfc38b..112d0dc50a 100644 --- a/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart +++ b/mobile/lib/ui/viewer/actions/file_selection_actions_widget.dart @@ -34,7 +34,7 @@ import 'package:photos/ui/components/action_sheet_widget.dart'; import "package:photos/ui/components/bottom_action_bar/selection_action_button_widget.dart"; import 'package:photos/ui/components/buttons/button_widget.dart'; import 'package:photos/ui/components/models/button_type.dart'; -import 'package:photos/ui/sharing/manage_links_widget.dart'; +// import 'package:photos/ui/sharing/manage_links_widget.dart'; import "package:photos/ui/sharing/show_images_prevew.dart"; import "package:photos/ui/tools/collage/collage_creator_page.dart"; import "package:photos/ui/viewer/location/update_location_data_widget.dart"; @@ -168,7 +168,7 @@ class _FileSelectionActionsWidgetState } else { items.add( SelectionActionButton( - icon: Icons.link_outlined, + icon: Icons.navigation_rounded, labelText: S.of(context).shareLink, onTap: anyUploadedFiles ? _onCreateLinkTapped : null, shouldShow: ownedFilesCount > 0, @@ -655,52 +655,53 @@ class _FileSelectionActionsWidgetState .createSharedCollectionLink(context, split.ownedByCurrentUser); final List ownedSelectedFiles = split.ownedByCurrentUser; - - final actionResult = await showActionSheet( - context: context, - buttons: [ - ButtonWidget( - labelText: S.of(context).shareLink, - buttonType: ButtonType.neutral, - buttonSize: ButtonSize.large, - shouldStickToDarkTheme: true, - buttonAction: ButtonAction.first, - isInAlert: true, - ), - ButtonWidget( - labelText: S.of(context).manageLink, - buttonType: ButtonType.secondary, - buttonSize: ButtonSize.large, - buttonAction: ButtonAction.second, - shouldStickToDarkTheme: true, - isInAlert: true, - ), - ButtonWidget( - labelText: S.of(context).done, - buttonType: ButtonType.secondary, - buttonSize: ButtonSize.large, - buttonAction: ButtonAction.third, - shouldStickToDarkTheme: true, - isInAlert: true, - ), - ], - title: S.of(context).publicLinkCreated, - body: S.of(context).youCanManageYourLinksInTheShareTab, - actionSheetType: ActionSheetType.defaultActionSheet, - ); - if (actionResult?.action != null) { - if (actionResult!.action == ButtonAction.first) { - placeholderPath = - await _selectedFilesPlaceholderPath(ownedSelectedFiles); - await _sendLink(); - } - if (actionResult.action == ButtonAction.second) { - await routeToPage( - context, - ManageSharedLinkWidget(collection: _cachedCollectionForSharedLink), - ); - } - } + placeholderPath = await _selectedFilesPlaceholderPath(ownedSelectedFiles); + await _sendLink(); + // final actionResult = await showActionSheet( + // context: context, + // buttons: [ + // ButtonWidget( + // labelText: S.of(context).shareLink, + // buttonType: ButtonType.neutral, + // buttonSize: ButtonSize.large, + // shouldStickToDarkTheme: true, + // buttonAction: ButtonAction.first, + // isInAlert: true, + // ), + // ButtonWidget( + // labelText: S.of(context).manageLink, + // buttonType: ButtonType.secondary, + // buttonSize: ButtonSize.large, + // buttonAction: ButtonAction.second, + // shouldStickToDarkTheme: true, + // isInAlert: true, + // ), + // ButtonWidget( + // labelText: S.of(context).done, + // buttonType: ButtonType.secondary, + // buttonSize: ButtonSize.large, + // buttonAction: ButtonAction.third, + // shouldStickToDarkTheme: true, + // isInAlert: true, + // ), + // ], + // title: S.of(context).publicLinkCreated, + // body: S.of(context).youCanManageYourLinksInTheShareTab, + // actionSheetType: ActionSheetType.defaultActionSheet, + // ); + // if (actionResult?.action != null) { + // if (actionResult!.action == ButtonAction.first) { + // placeholderPath = + // await _selectedFilesPlaceholderPath(ownedSelectedFiles); + // await _sendLink(); + // } + // if (actionResult.action == ButtonAction.second) { + // await routeToPage( + // context, + // ManageSharedLinkWidget(collection: _cachedCollectionForSharedLink), + // ); + // } + // } widget.selectedFiles.clearAll(); if (mounted) { setState(() => {});