Skip to content

armgit / ente

Public Imported from GitHub
0

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

Smaller pin for smaller face thumbnail

laurenspriemfc3aaf625ed2
diff --git a/mobile/apps/photos/lib/ui/collections/album/row_item.dart b/mobile/apps/photos/lib/ui/collections/album/row_item.dart
index 552ccbe730..28a71a5d3f 100644
--- a/mobile/apps/photos/lib/ui/collections/album/row_item.dart
+++ b/mobile/apps/photos/lib/ui/collections/album/row_item.dart
@@ -383,7 +383,7 @@ class AlbumRowItemWidget extends StatelessWidget {
final chips = <Widget>[
if (isFavoriteAlbum) const CollectionFavoriteBadge(),
- if (showPin) const CollectionPinnedBadge(),
+ if (showPin) const PinnedBadge(),
if (showArchive) const CollectionArchivedBadge(),
];
diff --git a/mobile/apps/photos/lib/ui/components/collection_share_badge.dart b/mobile/apps/photos/lib/ui/components/collection_share_badge.dart
index 7feacdd721..f2aa4be2f2 100644
--- a/mobile/apps/photos/lib/ui/components/collection_share_badge.dart
+++ b/mobile/apps/photos/lib/ui/components/collection_share_badge.dart
@@ -11,14 +11,19 @@ const double kCollectionBadgeBorderWidth = 1.0;
class CollectionStatusBadge extends StatelessWidget {
final Widget child;
+ final double size;
- const CollectionStatusBadge({super.key, required this.child});
+ const CollectionStatusBadge({
+ super.key,
+ required this.child,
+ this.size = kCollectionBadgeSize,
+ });
@override
Widget build(BuildContext context) {
return Container(
- width: kCollectionBadgeSize,
- height: kCollectionBadgeSize,
+ width: size,
+ height: size,
decoration: const BoxDecoration(shape: BoxShape.circle),
child: Center(child: child),
);
@@ -57,15 +62,18 @@ class CollectionFavoriteBadge extends StatelessWidget {
}
}
-class CollectionPinnedBadge extends StatelessWidget {
- const CollectionPinnedBadge({super.key});
+class PinnedBadge extends StatelessWidget {
+ final double size;
+
+ const PinnedBadge({super.key, this.size = kCollectionBadgeSize});
@override
Widget build(BuildContext context) {
- return const CollectionStatusBadge(
+ return CollectionStatusBadge(
+ size: size,
child: ImageIcon(
- AssetImage("assets/collection_pin.png"),
- size: kCollectionBadgeIconSize,
+ const AssetImage("assets/collection_pin.png"),
+ size: size * kCollectionBadgeIconSize / kCollectionBadgeSize,
color: Colors.white,
),
);
diff --git a/mobile/apps/photos/lib/ui/viewer/people/pinned_person_badge.dart b/mobile/apps/photos/lib/ui/viewer/people/pinned_person_badge.dart
deleted file mode 100644
index 1bd73a9d77..0000000000
--- a/mobile/apps/photos/lib/ui/viewer/people/pinned_person_badge.dart
+++ /dev/null
@@ -1,11 +0,0 @@
-import "package:flutter/material.dart";
-import "package:photos/ui/components/collection_share_badge.dart";
-
-class PinnedPersonBadge extends StatelessWidget {
- const PinnedPersonBadge({super.key});
-
- @override
- Widget build(BuildContext context) {
- return const CollectionPinnedBadge();
- }
-}
diff --git a/mobile/apps/photos/lib/ui/viewer/search/result/people_section_all_page.dart b/mobile/apps/photos/lib/ui/viewer/search/result/people_section_all_page.dart
index 0d8932f9bd..9c7411d03e 100644
--- a/mobile/apps/photos/lib/ui/viewer/search/result/people_section_all_page.dart
+++ b/mobile/apps/photos/lib/ui/viewer/search/result/people_section_all_page.dart
@@ -27,13 +27,13 @@ import "package:photos/theme/text_style.dart";
import "package:photos/ui/common/loading_widget.dart";
import "package:photos/ui/components/banners/save_faces_banner.dart";
import "package:photos/ui/components/bottom_action_bar/people_bottom_action_bar_widget.dart";
+import "package:photos/ui/components/collection_share_badge.dart";
import "package:photos/ui/viewer/actions/select_all_status_icon.dart";
import "package:photos/ui/viewer/file/no_thumbnail_widget.dart";
import "package:photos/ui/viewer/file/thumbnail_widget.dart";
import "package:photos/ui/viewer/people/face_thumbnail_squircle.dart";
import "package:photos/ui/viewer/people/person_face_widget.dart";
import "package:photos/ui/viewer/people/person_gallery_suggestion.dart";
-import "package:photos/ui/viewer/people/pinned_person_badge.dart";
import "package:photos/ui/viewer/search/result/search_result_page.dart";
import "package:photos/ui/viewer/search_tab/people_section.dart";
import "package:photos/utils/people_sort_util.dart";
@@ -265,7 +265,7 @@ class SelectablePersonSearchExample extends StatelessWidget {
const Positioned(
left: 8,
bottom: 8,
- child: PinnedPersonBadge(),
+ child: PinnedBadge(size: 16),
),
],
),
diff --git a/mobile/apps/photos/lib/ui/viewer/search_tab/people_section.dart b/mobile/apps/photos/lib/ui/viewer/search_tab/people_section.dart
index 79ca0d1be0..89c9c37dd2 100644
--- a/mobile/apps/photos/lib/ui/viewer/search_tab/people_section.dart
+++ b/mobile/apps/photos/lib/ui/viewer/search_tab/people_section.dart
@@ -15,6 +15,7 @@ import "package:photos/models/search/search_types.dart";
import "package:photos/models/selected_people.dart";
import "package:photos/service_locator.dart" show isLocalGalleryMode;
import "package:photos/theme/ente_theme.dart";
+import "package:photos/ui/components/collection_share_badge.dart";
import "package:photos/ui/settings/ml/machine_learning_settings_page.dart";
import "package:photos/ui/viewer/actions/select_all_status_icon.dart";
import "package:photos/ui/viewer/file/no_thumbnail_widget.dart";
@@ -23,7 +24,6 @@ import "package:photos/ui/viewer/people/add_person_action_sheet.dart";
import "package:photos/ui/viewer/people/face_thumbnail_squircle.dart";
import "package:photos/ui/viewer/people/people_page.dart";
import 'package:photos/ui/viewer/people/person_face_widget.dart';
-import "package:photos/ui/viewer/people/pinned_person_badge.dart";
import "package:photos/ui/viewer/search/result/people_section_all_page.dart";
import "package:photos/ui/viewer/search/result/search_result_page.dart";
import "package:photos/ui/viewer/search_tab/search_tab_horizontal_scroll.dart";
@@ -280,11 +280,7 @@ class PersonSearchExample extends StatelessWidget {
),
),
if (isPinnedPerson)
- const Positioned(
- left: 8,
- bottom: 8,
- child: PinnedPersonBadge(),
- ),
+ const Positioned(left: 8, bottom: 8, child: PinnedBadge()),
],
),
isCluster