Skip to content

armgit / ente

Public Imported from GitHub
0

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

[mob][photos] Refine file viewer icons

ashilkn991d8a1558e9
diff --git a/mobile/apps/photos/assets/icons/delete-01.svg b/mobile/apps/photos/assets/icons/delete-01.svg
new file mode 100644
index 0000000000..3629d2e25b
--- /dev/null
+++ b/mobile/apps/photos/assets/icons/delete-01.svg
@@ -0,0 +1,6 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M19.5 5.5L18.8803 15.5251C18.7219 18.0864 18.6428 19.3671 18.0008 20.2879C17.6833 20.7431 17.2747 21.1273 16.8007 21.416C15.8421 22 14.559 22 11.9927 22C9.42312 22 8.1383 22 7.17905 21.4149C6.7048 21.1257 6.296 20.7408 5.97868 20.2848C5.33688 19.3626 5.25945 18.0801 5.10461 15.5152L4.5 5.5" stroke="white" style="stroke:white;stroke-opacity:1;" stroke-width="1.5" stroke-linecap="round"/>
+<path d="M11.9998 17H12.0088" stroke="white" style="stroke:white;stroke-opacity:1;" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M12 14L12 9" stroke="white" style="stroke:white;stroke-opacity:1;" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+<path d="M3 5.5H21M16.0557 5.5L15.3731 4.09173C14.9196 3.15626 14.6928 2.68852 14.3017 2.39681C14.215 2.3321 14.1231 2.27454 14.0268 2.2247C13.5939 2 13.0741 2 12.0345 2C10.9688 2 10.436 2 9.99568 2.23412C9.8981 2.28601 9.80498 2.3459 9.71729 2.41317C9.32164 2.7167 9.10063 3.20155 8.65861 4.17126L8.05292 5.5" stroke="white" style="stroke:white;stroke-opacity:1;" stroke-width="1.5" stroke-linecap="round"/>
+</svg>
diff --git a/mobile/apps/photos/assets/icons/live-photo.svg b/mobile/apps/photos/assets/icons/live-photo.svg
new file mode 100644
index 0000000000..9afbdfde7e
--- /dev/null
+++ b/mobile/apps/photos/assets/icons/live-photo.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+ <circle cx="12" cy="12" r="9" stroke="#000000" stroke-width="1.5"/>
+ <circle cx="12" cy="12" r="2.75" stroke="#000000" stroke-width="2.625"/>
+</svg>
diff --git a/mobile/apps/photos/assets/icons/panorama.svg b/mobile/apps/photos/assets/icons/panorama.svg
new file mode 100644
index 0000000000..1c4637c361
--- /dev/null
+++ b/mobile/apps/photos/assets/icons/panorama.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none">
+ <path d="M9 15.75C5.45 15.2 3 13.7 3 12C3 9.65 7.03 7.75 12 7.75C16.97 7.75 21 9.65 21 12C21 13.55 19.25 14.9 16.5 15.55" stroke="#000000" stroke-width="1.5"/>
+ <path d="M9 12.75L12.25 16L9 19.25" stroke="#000000" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/>
+</svg>
diff --git a/mobile/apps/photos/changes/file-viewer-icons.md b/mobile/apps/photos/changes/file-viewer-icons.md
new file mode 100644
index 0000000000..15a907c170
--- /dev/null
+++ b/mobile/apps/photos/changes/file-viewer-icons.md
@@ -0,0 +1 @@
+- Refresh the file viewer icons for a more consistent appearance.
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 c1aeb8d065..95719ffa1c 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/detail_page.dart
@@ -9,6 +9,7 @@ import 'package:extended_image/extended_image.dart';
import "package:flutter/foundation.dart";
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
+import "package:flutter_svg/flutter_svg.dart";
import 'package:logging/logging.dart';
import 'package:photos/core/configuration.dart';
import 'package:photos/core/errors.dart';
@@ -392,10 +393,14 @@ class _BodyState extends State<_Body> {
backgroundColor: const Color(0xAA252525),
fixedSize: const Size(44, 44),
),
- icon: const Icon(
- Icons.threesixty,
- color: Colors.white,
- size: 24,
+ icon: SvgPicture.asset(
+ "assets/icons/panorama.svg",
+ width: 24,
+ height: 24,
+ colorFilter: const ColorFilter.mode(
+ Colors.white,
+ BlendMode.srcIn,
+ ),
),
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 0958382210..a5efb8449e 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
@@ -6,6 +6,7 @@ import "package:ente_lock_screen/local_authentication_service.dart";
import "package:ente_strings/ente_strings.dart";
import 'package:flutter/material.dart';
import "package:flutter/services.dart";
+import "package:flutter_svg/flutter_svg.dart";
import "package:hugeicons/hugeicons.dart";
import "package:local_auth/local_auth.dart";
import 'package:logging/logging.dart';
@@ -270,7 +271,12 @@ class FileAppBarState extends State<FileAppBar> {
if (widget.file.isLiveOrMotionPhoto) {
_actions.add(
IconButton(
- icon: const Icon(Icons.album_outlined),
+ icon: SvgPicture.asset(
+ "assets/icons/live-photo.svg",
+ width: 24,
+ height: 24,
+ colorFilter: const ColorFilter.mode(Colors.white, BlendMode.srcIn),
+ ),
onPressed: () {
showShortToast(
context,
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 80f8f644e6..84f961cc36 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
@@ -4,6 +4,7 @@ import "dart:io";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/cupertino.dart";
import "package:flutter/material.dart";
+import "package:flutter_svg/flutter_svg.dart";
import "package:hugeicons/hugeicons.dart";
import "package:photos/core/event_bus.dart";
import "package:photos/events/guest_view_event.dart";
@@ -281,7 +282,11 @@ class FileBottomBarState extends State<FileBottomBar> {
child: Padding(
padding: const EdgeInsets.only(top: 12),
child: IconButton(
- icon: const Icon(Icons.flag_outlined, color: Colors.white),
+ icon: SvgPicture.asset(
+ "assets/icons/delete-01.svg",
+ width: 24,
+ height: 24,
+ ),
onPressed: () => _onSuggestDelete(collection),
),
),
diff --git a/mobile/apps/photos/lib/ui/viewer/file/panorama_viewer_screen.dart b/mobile/apps/photos/lib/ui/viewer/file/panorama_viewer_screen.dart
index 29913971ac..2df0dc94d8 100644
--- a/mobile/apps/photos/lib/ui/viewer/file/panorama_viewer_screen.dart
+++ b/mobile/apps/photos/lib/ui/viewer/file/panorama_viewer_screen.dart
@@ -6,6 +6,7 @@ import "package:ente_panorama_viewer/ente_panorama_viewer.dart";
import "package:ente_strings/ente_strings.dart";
import "package:flutter/material.dart";
import "package:flutter/services.dart";
+import "package:hugeicons/hugeicons.dart";
import "package:logging/logging.dart";
import "package:photos/src/rust/api/motion_photo_api.dart";
import "package:photos/ui/viewer/file/panorama_view_data.dart";
@@ -202,12 +203,12 @@ class _PanoramaViewerScreenState extends State<PanoramaViewerScreen> {
backgroundColor: const Color(0xFF252525),
fixedSize: const Size(44, 44),
),
- icon: Icon(
- !motionEnabled
- ? Icons.explore_outlined
- : Icons.explore_off_outlined,
+ icon: HugeIcon(
+ icon: !motionEnabled
+ ? HugeIcons.strokeRoundedNavigation05
+ : HugeIcons.strokeRoundedNavigationOff,
color: Colors.white,
- size: 26,
+ size: 24,
),
onPressed: () {
setState(() {