Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

[mob][photos] Standardize file viewer icons

ashilkn06424a4f4cbb
diff --git a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
index 13e29f8ce5..d249e7cff7 100644
--- a/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
+++ b/mobile/apps/photos/lib/ui/home/memories/full_screen_memory.dart
@@ -1087,7 +1087,7 @@ class _MemoryTopOverlay extends StatelessWidget {
icon: const HugeIcon(
icon: HugeIcons.strokeRoundedCancel01,
color: Colors.white,
- size: 32,
+ size: 24,
),
),
),
diff --git a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
index 50d34490a6..c1aeb8d065 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
@@ -395,7 +395,7 @@ class _BodyState extends State<_Body> {
icon: const Icon(
Icons.threesixty,
color: Colors.white,
- size: 26,
+ size: 24,
),
onPressed: () async {
await openPanoramaViewerPage(
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart b/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
index 30fca77ccb..0958382210 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_app_bar.dart
@@ -243,7 +243,10 @@ class FileAppBarState extends State<FileAppBar> {
behavior: HitTestBehavior.opaque,
child: const Padding(
padding: EdgeInsets.all(12.0),
- child: Icon(Icons.info_outline),
+ child: HugeIcon(
+ icon: HugeIcons.strokeRoundedInformationCircle,
+ color: Colors.white,
+ ),
),
),
),
@@ -278,7 +281,11 @@ class FileAppBarState extends State<FileAppBar> {
);
}
if (!isFileHidden && isFileUploaded && widget.file is! TrashFile) {
- _actions.add(Center(child: FavoriteWidget(widget.file)));
+ _actions.add(
+ Center(
+ child: FavoriteWidget(widget.file, iconSize: 24, tapTargetSize: 48),
+ ),
+ );
}
if (!isFileUploaded && !isLocalGalleryMode) {
_actions.add(
diff --git a/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart b/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart
index dde91c2739..80f8f644e6 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/file_bottom_bar.dart
@@ -1,10 +1,10 @@
import "dart:async";
import "dart:io";
-import "package:ente_icons/ente_icons.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/cupertino.dart";
import "package:flutter/material.dart";
+import "package:hugeicons/hugeicons.dart";
import "package:photos/core/event_bus.dart";
import "package:photos/events/guest_view_event.dart";
import "package:photos/models/collection/collection.dart";
@@ -122,10 +122,8 @@ class FileBottomBarState extends State<FileBottomBar> {
child: Padding(
padding: const EdgeInsets.only(top: 12),
child: IconButton(
- icon: Icon(
- Platform.isAndroid
- ? Icons.delete_outline
- : CupertinoIcons.delete,
+ icon: const HugeIcon(
+ icon: HugeIcons.strokeRoundedDelete02,
color: Colors.white,
),
onPressed: () async {
@@ -154,12 +152,12 @@ class FileBottomBarState extends State<FileBottomBar> {
padding: const EdgeInsets.only(top: 12),
child: IconButton(
key: shareButtonKey,
- icon: Icon(
- Platform.isAndroid
- ? Icons.share_outlined
- : CupertinoIcons.share,
- color: Colors.white,
- ),
+ icon: Platform.isAndroid
+ ? const HugeIcon(
+ icon: HugeIcons.strokeRoundedShare08,
+ color: Colors.white,
+ )
+ : const Icon(CupertinoIcons.share, color: Colors.white),
onPressed: () {
share(context, [widget.file], shareButtonKey: shareButtonKey);
},
@@ -175,10 +173,10 @@ class FileBottomBarState extends State<FileBottomBar> {
child: Padding(
padding: const EdgeInsets.only(top: 12),
child: IconButton(
- icon: const Icon(
- EnteIcons.addToAlbum,
+ icon: const HugeIcon(
+ icon: HugeIcons.strokeRoundedAddSquare,
color: Colors.white,
- size: 28,
+ size: 24,
),
onPressed: () {
final selectedFiles = SelectedFiles();
@@ -238,7 +236,7 @@ class FileBottomBarState extends State<FileBottomBar> {
child: Padding(
padding: const EdgeInsets.only(top: 12),
child: IconButton(
- icon: const Icon(Icons.restore_outlined, color: Colors.white),
+ icon: const Icon(CupertinoIcons.gobackward, color: Colors.white),
onPressed: () {
final selectedFiles = SelectedFiles();
selectedFiles.toggleSelection(widget.file);
@@ -259,8 +257,8 @@ class FileBottomBarState extends State<FileBottomBar> {
child: Padding(
padding: const EdgeInsets.only(top: 12),
child: IconButton(
- icon: const Icon(
- Icons.delete_forever_outlined,
+ icon: const HugeIcon(
+ icon: HugeIcons.strokeRoundedDelete02,
color: Colors.white,
),
onPressed: () async {
diff --git a/mobile/apps/photos/lib/ui/viewer/file_details/upload_icon_widget.dart b/mobile/apps/photos/lib/ui/viewer/file_details/upload_icon_widget.dart
index cbd297f7af..9cb41a8a3a 100644
--- a/mobile/apps/photos/lib/ui/viewer/file_details/upload_icon_widget.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file_details/upload_icon_widget.dart
@@ -4,6 +4,7 @@ import "package:ente_strings/ente_strings.dart";
import "package:flutter/foundation.dart";
import "package:flutter/material.dart";
import "package:flutter_animate/flutter_animate.dart";
+import "package:hugeicons/hugeicons.dart";
import "package:logging/logging.dart";
import "package:photos/core/event_bus.dart";
import "package:photos/db/files_db.dart";
@@ -74,14 +75,18 @@ class _UpdateIconWidgetState extends State<UploadIconWidget> {
if (isUploadedNow) {
return Padding(
padding: const EdgeInsets.all(8.0),
- child: const Icon(Icons.cloud_done_outlined, color: Colors.white)
- .animate()
- .fadeIn(duration: 500.ms, curve: Curves.easeInOutCubic)
- .fadeOut(
- delay: const Duration(seconds: 3),
- duration: 500.ms,
- curve: Curves.easeInOutCubic,
- ),
+ child:
+ const HugeIcon(
+ icon: HugeIcons.strokeRoundedCloudSavingDone01,
+ color: Colors.white,
+ )
+ .animate()
+ .fadeIn(duration: 500.ms, curve: Curves.easeInOutCubic)
+ .fadeOut(
+ delay: const Duration(seconds: 3),
+ duration: 500.ms,
+ curve: Curves.easeInOutCubic,
+ ),
);
}
return const SizedBox.shrink();
@@ -116,7 +121,10 @@ class _UpdateIconWidgetState extends State<UploadIconWidget> {
)
: context.strings.tapToUpload,
child: IconButton(
- icon: const Icon(Icons.upload_rounded, color: Colors.white),
+ icon: const HugeIcon(
+ icon: HugeIcons.strokeRoundedUpload01,
+ color: Colors.white,
+ ),
onPressed: () async {
if (isIgnored) {
await IgnoredFilesService.instance.removeIgnoredMappings([