diff --git a/lib/ui/fading_app_bar.dart b/lib/ui/fading_app_bar.dart index 9e109d702..36d5eb3ed 100644 --- a/lib/ui/fading_app_bar.dart +++ b/lib/ui/fading_app_bar.dart @@ -117,7 +117,7 @@ class FadingAppBarState extends State { Padding( padding: EdgeInsets.all(8), ), - Text("download"), + Text("Download"), ], ), ), @@ -141,7 +141,7 @@ class FadingAppBarState extends State { Padding( padding: EdgeInsets.all(8), ), - Text("edit time"), + Text("Edit time"), ], ), ), @@ -162,7 +162,7 @@ class FadingAppBarState extends State { Padding( padding: EdgeInsets.all(8), ), - Text("delete"), + Text("Delete"), ], ), ), @@ -211,7 +211,7 @@ class FadingAppBarState extends State { final shouldBlockUser = file.uploadedFileID == null; ProgressDialog dialog; if (shouldBlockUser) { - dialog = createProgressDialog(context, "adding to favorites..."); + dialog = createProgressDialog(context, "Ddding to favorites..."); await dialog.show(); } try { @@ -279,7 +279,7 @@ class FadingAppBarState extends State { final List actions = []; if (file.uploadedFileID == null || file.localID == null) { actions.add(CupertinoActionSheetAction( - child: Text("everywhere"), + child: Text("Everywhere"), isDestructiveAction: true, onPressed: () async { await deleteFilesFromEverywhere(context, [file]); @@ -290,11 +290,11 @@ class FadingAppBarState extends State { } else { // uploaded file which is present locally too actions.add(CupertinoActionSheetAction( - child: Text("device"), + child: Text("Device"), isDestructiveAction: true, onPressed: () async { await deleteFilesOnDeviceOnly(context, [file]); - showToast("file deleted from device"); + showToast("File deleted from device"); Navigator.of(context, rootNavigator: true).pop(); // TODO: Fix behavior when inside a device folder }, @@ -305,14 +305,14 @@ class FadingAppBarState extends State { isDestructiveAction: true, onPressed: () async { await deleteFilesFromRemoteOnly(context, [file]); - showShortToast("moved to trash"); + showShortToast("Moved to trash"); Navigator.of(context, rootNavigator: true).pop(); // TODO: Fix behavior when inside a collection }, )); actions.add(CupertinoActionSheetAction( - child: Text("everywhere"), + child: Text("Everywhere"), isDestructiveAction: true, onPressed: () async { await deleteFilesFromEverywhere(context, [file]); @@ -322,10 +322,10 @@ class FadingAppBarState extends State { )); } final action = CupertinoActionSheet( - title: Text("delete file?"), + title: Text("Delete file?"), actions: actions, cancelButton: CupertinoActionSheetAction( - child: Text("cancel"), + child: Text("Cancel"), onPressed: () { Navigator.of(context, rootNavigator: true).pop(); }, @@ -335,7 +335,7 @@ class FadingAppBarState extends State { } Future _download(File file) async { - final dialog = createProgressDialog(context, "downloading..."); + final dialog = createProgressDialog(context, "Downloading..."); await dialog.show(); FileType type = file.fileType; // save and track image for livePhoto/image and video for FileType.video @@ -364,9 +364,9 @@ class FadingAppBarState extends State { Bus.instance.fire(LocalPhotosUpdatedEvent([file])); await dialog.hide(); if (file.fileType == FileType.livePhoto) { - showToast("photo and video saved to gallery"); + showToast("Photo and video saved to gallery"); } else { - showToast("file saved to gallery"); + showToast("File saved to gallery"); } } } diff --git a/lib/ui/file_info_dialog.dart b/lib/ui/file_info_dialog.dart index 99d3e2600..47ac563b2 100644 --- a/lib/ui/file_info_dialog.dart +++ b/lib/ui/file_info_dialog.dart @@ -232,7 +232,7 @@ class _FileInfoWidgetState extends State { Icon(Icons.feed_outlined, color: infoColor), Padding(padding: EdgeInsets.all(4)), Text( - "view raw EXIF", + "View raw EXIF", style: TextStyle(color: infoColor), ), ], @@ -260,7 +260,7 @@ class _FileInfoWidgetState extends State { ), Padding(padding: EdgeInsets.all(4)), Text( - "no exif", + "No exif", style: TextStyle( color: Colors.white.withOpacity(0.5), ), @@ -268,7 +268,7 @@ class _FileInfoWidgetState extends State { ], ), onPressed: () { - showToast("this image has no exif data"); + showShortToast("This image has no exif data"); }, ), ); @@ -277,7 +277,7 @@ class _FileInfoWidgetState extends State { actions.add( TextButton( child: Text( - "close", + "Close", style: TextStyle( color: infoColor, ), diff --git a/lib/ui/gallery_overlay_widget.dart b/lib/ui/gallery_overlay_widget.dart index 868eac41e..98009103d 100644 --- a/lib/ui/gallery_overlay_widget.dart +++ b/lib/ui/gallery_overlay_widget.dart @@ -287,7 +287,7 @@ class _OverlayWidgetState extends State { widget.collection.type != CollectionType.favorites) { actions.add( Tooltip( - message: "move", + message: "Move", child: IconButton( color: Colors.black, //same for both themes icon: Icon(Platform.isAndroid @@ -302,7 +302,7 @@ class _OverlayWidgetState extends State { } actions.add( Tooltip( - message: "share", + message: "Share", child: IconButton( color: Colors.black, //same for both themes key: shareButtonKey, @@ -318,7 +318,7 @@ class _OverlayWidgetState extends State { widget.type == GalleryType.local_folder) { actions.add( Tooltip( - message: "delete", + message: "Delete", child: IconButton( color: Colors.black, //same for both themes icon: @@ -333,7 +333,7 @@ class _OverlayWidgetState extends State { if (widget.collection.type == CollectionType.folder) { actions.add( Tooltip( - message: "delete", + message: "Delete", child: IconButton( color: Colors.black, //same for both themes icon: Icon( @@ -348,7 +348,7 @@ class _OverlayWidgetState extends State { } else { actions.add( Tooltip( - message: "remove", + message: "Remove", child: IconButton( color: Colors.black, //same for both themes icon: Icon( @@ -406,7 +406,7 @@ class _OverlayWidgetState extends State { )); actions.add( Tooltip( - message: "delete permanently", + message: "Delete permanently", child: IconButton( color: Colors.black, //same for both themes icon: Icon( @@ -455,14 +455,14 @@ class _OverlayWidgetState extends State { final actions = []; if (containsUploadedFile && containsLocalFile) { actions.add(CupertinoActionSheetAction( - child: Text("device"), + child: Text("Device"), isDestructiveAction: true, onPressed: () async { Navigator.of(context, rootNavigator: true).pop(); await deleteFilesOnDeviceOnly( context, widget.selectedFiles.files.toList()); _clearSelectedFiles(); - showToast("files deleted from device"); + showToast("Files deleted from device"); }, )); actions.add(CupertinoActionSheetAction( @@ -473,11 +473,11 @@ class _OverlayWidgetState extends State { await deleteFilesFromRemoteOnly( context, widget.selectedFiles.files.toList()); _clearSelectedFiles(); - showShortToast("moved to trash"); + showShortToast("Moved to trash"); }, )); actions.add(CupertinoActionSheetAction( - child: Text("everywhere"), + child: Text("Everywhere"), isDestructiveAction: true, onPressed: () async { Navigator.of(context, rootNavigator: true).pop(); @@ -499,14 +499,14 @@ class _OverlayWidgetState extends State { )); } final action = CupertinoActionSheet( - title: Text("delete " + + title: Text("Delete " + count.toString() + " file" + (count == 1 ? "" : "s") + (containsUploadedFile && containsLocalFile ? " from" : "?")), actions: actions, cancelButton: CupertinoActionSheetAction( - child: Text("cancel"), + child: Text("Cancel"), onPressed: () { Navigator.of(context, rootNavigator: true).pop(); }, @@ -518,7 +518,7 @@ class _OverlayWidgetState extends State { void _showRemoveFromCollectionSheet(BuildContext context) { final count = widget.selectedFiles.files.length; final action = CupertinoActionSheet( - title: Text("remove " + + title: Text("Remove " + count.toString() + " file" + (count == 1 ? "" : "s") + @@ -527,11 +527,11 @@ class _OverlayWidgetState extends State { "?"), actions: [ CupertinoActionSheetAction( - child: Text("remove"), + child: Text("Remove"), isDestructiveAction: true, onPressed: () async { Navigator.of(context, rootNavigator: true).pop(); - final dialog = createProgressDialog(context, "removing files..."); + final dialog = createProgressDialog(context, "Removing files..."); await dialog.show(); try { await CollectionsService.instance.removeFromCollection( @@ -547,7 +547,7 @@ class _OverlayWidgetState extends State { ), ], cancelButton: CupertinoActionSheetAction( - child: Text("cancel"), + child: Text("Cancel"), onPressed: () { Navigator.of(context, rootNavigator: true).pop(); }, diff --git a/lib/utils/share_util.dart b/lib/utils/share_util.dart index a5b32d9e9..8479eff63 100644 --- a/lib/utils/share_util.dart +++ b/lib/utils/share_util.dart @@ -18,7 +18,7 @@ final _logger = Logger("ShareUtil"); // share is used to share media/files from ente to other apps Future share(BuildContext context, List files, {GlobalKey shareButtonKey}) async { - final dialog = createProgressDialog(context, "preparing..."); + final dialog = createProgressDialog(context, "Preparing..."); await dialog.show(); final List> pathFutures = []; for (File file in files) {