TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[mob][photos] Refractor code

Browse Source
This commit is contained in:
Aman Raj Singh Mourya
2024-09-10 13:44:00 +05:30
parent e1feb8bcd5
commit 2a0c7d1e56
3 changed files with 54 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
mobile/lib/ui/tabs/shared/empty_state.dart
View File

@@ -1,66 +1,19 @@
import "package:flutter/material.dart";
import "package:intl/intl.dart";
import "package:logging/logging.dart";
import "package:photos/core/event_bus.dart";
import "package:photos/events/tab_changed_event.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/collection/collection.dart";
import "package:photos/models/collection/collection_items.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/theme/ente_theme.dart";
import 'package:photos/ui/collections/collection_action_sheet.dart';
import 'package:photos/ui/components/buttons/button_widget.dart';
import "package:photos/ui/components/empty_state_item_widget.dart";
import "package:photos/ui/components/models/button_type.dart";
import "package:photos/ui/viewer/gallery/collection_page.dart";
import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/navigation_util.dart";
import "package:photos/utils/collection_util.dart";
import "package:photos/utils/share_util.dart";
import "package:photos/utils/toast_util.dart";
class SharedEmptyStateWidget extends StatelessWidget {
const SharedEmptyStateWidget({super.key});
Future<void> _onTapCollectEventPhotos(BuildContext context) async {
final String currentDate =
DateFormat('MMMM d, yyyy').format(DateTime.now());
final result = await showTextInputDialog(
context,
title: "Name the album",
submitButtonLabel: S.of(context).create,
hintText: S.of(context).enterAlbumName,
alwaysShowSuccessState: false,
initialValue: currentDate,
textCapitalization: TextCapitalization.words,
onSubmit: (String text) async {
// indicates user cancelled the rename request
if (text.trim() == "") {
return;
}
try {
final Collection c =
await CollectionsService.instance.createAlbum(text);
// ignore: unawaited_futures
routeToPage(
context,
CollectionPage(
isFromCollectPhotos: true,
CollectionWithThumbnail(c, null),
),
);
} catch (e, s) {
Logger("Collect event photos from CollectPhotosCardWidget")
.severe("Failed to rename album", e, s);
rethrow;
}
},
);
if (result is Exception) {
await showGenericErrorDialog(context: context, error: result);
}
}
@override
Widget build(BuildContext context) {
final textTheme = getEnteTextTheme(context);
@@ -128,7 +81,7 @@ class SharedEmptyStateWidget extends StatelessWidget {
labelText: S.of(context).collectEventPhotos,
icon: Icons.add_photo_alternate_outlined,
onTap: () async {
await _onTapCollectEventPhotos(context);
await onTapCollectEventPhotos(context);
},
),
const SizedBox(height: 6),

54
mobile/lib/ui/viewer/gallery/collect_photos_card_widget.dart
View File

@@ -1,17 +1,9 @@
import "package:figma_squircle/figma_squircle.dart";
import 'package:flutter/material.dart';
import "package:intl/intl.dart";
import "package:logging/logging.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/collection/collection.dart";
import "package:photos/models/collection/collection_items.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/theme/ente_theme.dart";
import "package:photos/ui/components/buttons/button_widget.dart";
import "package:photos/ui/components/models/button_type.dart";
import "package:photos/ui/viewer/gallery/collection_page.dart";
import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/navigation_util.dart";
import "package:photos/utils/collection_util.dart";
class CollectPhotosCardWidget extends StatefulWidget {
const CollectPhotosCardWidget({super.key});
@@ -22,46 +14,6 @@ class CollectPhotosCardWidget extends StatefulWidget {
}
class _CollectPhotosCardWidgetState extends State<CollectPhotosCardWidget> {
Future<void> _onTapCreateAlbum() async {
final String currentDate =
DateFormat('MMMM d, yyyy').format(DateTime.now());
final result = await showTextInputDialog(
context,
title: "Name the album",
submitButtonLabel: S.of(context).create,
hintText: S.of(context).enterAlbumName,
alwaysShowSuccessState: false,
initialValue: currentDate,
textCapitalization: TextCapitalization.words,
onSubmit: (String text) async {
// indicates user cancelled the rename request
if (text.trim() == "") {
return;
}
try {
final Collection c =
await CollectionsService.instance.createAlbum(text);
// ignore: unawaited_futures
routeToPage(
context,
CollectionPage(
isFromCollectPhotos: true,
CollectionWithThumbnail(c, null),
),
);
} catch (e, s) {
Logger("CollectPhotosCardWidget")
.severe("Failed to rename album", e, s);
rethrow;
}
},
);
if (result is Exception) {
await showGenericErrorDialog(context: context, error: result);
}
}
@override
Widget build(BuildContext context) {
final textTheme = getEnteTextTheme(context);
@@ -94,7 +46,7 @@ class _CollectPhotosCardWidgetState extends State<CollectPhotosCardWidget> {
),
),
GestureDetector(
onTap: () => _onTapCreateAlbum(),
onTap: () => onTapCollectEventPhotos(context),
child: Padding(
padding: const EdgeInsets.fromLTRB(16, 16, 16, 24),
child: Container(
@@ -144,7 +96,7 @@ class _CollectPhotosCardWidgetState extends State<CollectPhotosCardWidget> {
icon: Icons.add_photo_alternate_outlined,
shouldShowSuccessConfirmation: false,
shouldSurfaceExecutionStates: false,
onTap: () => _onTapCreateAlbum(),
onTap: () => onTapCollectEventPhotos(context),
),
],
),

49
mobile/lib/utils/collection_util.dart Normal file
View File

@@ -0,0 +1,49 @@
import "package:flutter/material.dart";
import "package:intl/intl.dart";
import "package:logging/logging.dart";
import "package:photos/generated/l10n.dart";
import "package:photos/models/collection/collection.dart";
import "package:photos/models/collection/collection_items.dart";
import "package:photos/services/collections_service.dart";
import "package:photos/ui/viewer/gallery/collection_page.dart";
import "package:photos/utils/dialog_util.dart";
import "package:photos/utils/navigation_util.dart";
Future<void> onTapCollectEventPhotos(BuildContext context) async {
final String currentDate = DateFormat('MMMM d, yyyy').format(DateTime.now());
final result = await showTextInputDialog(
context,
title: "Name the album",
submitButtonLabel: S.of(context).create,
hintText: S.of(context).enterAlbumName,
alwaysShowSuccessState: false,
initialValue: currentDate,
textCapitalization: TextCapitalization.words,
onSubmit: (String text) async {
// indicates user cancelled the rename request
if (text.trim() == "") {
return;
}
try {
final Collection c =
await CollectionsService.instance.createAlbum(text);
// ignore: unawaited_futures
routeToPage(
context,
CollectionPage(
isFromCollectPhotos: true,
CollectionWithThumbnail(c, null),
),
);
} catch (e, s) {
Logger("Collect event photos from CollectPhotosCardWidget")
.severe("Failed to rename album", e, s);
rethrow;
}
},
);
if (result is Exception) {
await showGenericErrorDialog(context: context, error: result);
}
}