beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

UI: Move remove link option insided manage link

Browse source
This commit is contained in:
Neeraj Gupta 2022-11-20 16:32:14 +05:30
parent d73ef88b66
commit 9740c7f8b3
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
2 changed files with 44 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
lib/ui/sharing/manage_links_widget.dart
View file

@ -9,7 +9,9 @@ import 'package:flutter_sodium/flutter_sodium.dart';
import 'package:photos/ente_theme_data.dart';
import 'package:photos/models/collection.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/theme/colors.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
import 'package:photos/ui/common/dialogs.dart';
import 'package:photos/ui/components/captioned_text_widget.dart';
import 'package:photos/ui/components/divider_widget.dart';
@ -45,6 +47,8 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
Tuple3<int, String, int> _selectedExpiry;
int _selectedDeviceLimitIndex = 0;
final CollectionSharingActions sharingActions =
CollectionSharingActions(CollectionsService.instance);
@override
void initState() {
@ -55,7 +59,7 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
@override
Widget build(BuildContext context) {
final enteColorScheme = getEnteColorScheme(context);
final int validTill = widget.collection.publicURLs?.first?.validTill ?? 0;
final int validTill = widget.collection?.publicURLs?.first?.validTill ?? 0;
return Scaffold(
backgroundColor: Theme.of(context).backgroundColor,
appBar: AppBar(
@ -193,6 +197,30 @@ class _ManageSharedLinkWidgetState extends State<ManageSharedLinkWidget> {
},
),
),
const SizedBox(
height: 24,
),
MenuItemWidget(
captionedTextWidget: const CaptionedTextWidget(
title: "Remove link",
textColor: warning500,
),
leadingIcon: Icons.remove_circle_outline,
leadingIconColor: warning500,
menuItemColor: getEnteColorScheme(context).fillFaint,
pressedColor: getEnteColorScheme(context).fillFaint,
onTap: () async {
final bool result = await sharingActions.publicLinkToggle(
context,
widget.collection,
false,
);
if (result && mounted) {
Navigator.of(context).pop();
// setState(() => {});
}
},
),
],
),
),

72
lib/ui/sharing/share_collection_widget.dart
View file

@ -12,9 +12,8 @@ import 'package:photos/models/collection.dart';
import 'package:photos/models/public_key.dart';
import 'package:photos/services/collections_service.dart';
import 'package:photos/services/user_service.dart';
import 'package:photos/theme/colors.dart';
import 'package:photos/theme/ente_theme.dart';
import 'package:photos/ui/common/dialogs.dart';
import 'package:photos/ui/actions/collection/collection_sharing_actions.dart';
import 'package:photos/ui/common/gradient_button.dart';
import 'package:photos/ui/common/loading_widget.dart';
import 'package:photos/ui/components/captioned_text_widget.dart';
@ -43,6 +42,8 @@ class _SharingDialogState extends State<SharingDialog> {
List<User> _sharees;
String _email;
final Logger _logger = Logger("SharingDialogState");
final CollectionSharingActions sharingActions =
CollectionSharingActions(CollectionsService.instance);
@override
Widget build(BuildContext context) {
@ -155,26 +156,14 @@ class _SharingDialogState extends State<SharingDialog> {
routeToPage(
context,
ManageSharedLinkWidget(collection: widget.collection),
).then(
(value) => {
if (mounted) {setState(() => {})}
},
);
},
isTopBorderRadiusRemoved: true,
),
const SizedBox(
height: 24,
),
MenuItemWidget(
captionedTextWidget: const CaptionedTextWidget(
title: "Remove link",
textColor: warning500,
),
leadingIcon: Icons.remove_circle_outline,
leadingIconColor: warning500,
menuItemColor: getEnteColorScheme(context).fillFaint,
pressedColor: getEnteColorScheme(context).fillFaint,
onTap: () async {
await _publicLinkToggle(false);
},
),
],
);
} else {
@ -187,7 +176,14 @@ class _SharingDialogState extends State<SharingDialog> {
menuItemColor: getEnteColorScheme(context).fillFaint,
pressedColor: getEnteColorScheme(context).fillFaint,
onTap: () async {
await _publicLinkToggle(true);
final bool result = await sharingActions.publicLinkToggle(
context,
widget.collection,
true,
);
if (result && mounted) {
setState(() => {});
}
},
),
);
@ -211,44 +207,6 @@ class _SharingDialogState extends State<SharingDialog> {
);
}
Future<void> _publicLinkToggle(bool enable) async {
// confirm if user wants to disable the url
if (!enable) {
final choice = await showChoiceDialog(
context,
'Remove public link?',
'This will remove the public link for accessing "${widget.collection.name}".',
firstAction: 'Yes, remove',
secondAction: 'Cancel',
actionType: ActionType.critical,
);
if (choice != DialogUserChoice.firstChoice) {
return;
}
}
final dialog = createProgressDialog(
context,
enable ? "Creating link..." : "Disabling link...",
);
try {
await dialog.show();
enable
? await CollectionsService.instance.createShareUrl(widget.collection)
: await CollectionsService.instance
.disableShareUrl(widget.collection);
dialog.hide();
setState(() {});
} catch (e) {
dialog.hide();
if (e is SharingNotPermittedForFreeAccountsError) {
_showUnSupportedAlert();
} else {
_logger.severe("failed to share collection", e);
showGenericErrorDialog(context);
}
}
}
Widget _getEmailField() {
return Container(
padding: const EdgeInsets.fromLTRB(8, 0, 8, 0),