sevenhill/Immich
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(mobile): border radius on list tiles in library page (#32476) (#32503)

Browse Source 
* fix(mobile): standardize list tile radius in Quick Access Button List when pressed (#32476)

* fix(mobile): adjust list tile border radius based on partner presence in Quick Access Button List

* refactor(mobile): improve way to handle border radius of items in the QuickAccessButtonList

(cherry picked from commit fff2bd73f9b38a5a5b510ea69a77a470dd1acf56)
This commit is contained in:
Mateus Navarro
2026-10-22 05:18:40 +03:00
committed by Codex
parent 814cc14f88
commit 434b7efd66
1 changed files with 54 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/lib/presentation/pages/library.page.dart
+54 -68
View File
@@ -417,21 +417,57 @@ final sharedWithPartnerProvider = StreamProvider.autoDispose<Iterable<Partner>>(
return ref.watch(partnerServiceProvider).search(currentUser.id, .sharedWith);
});
class _QuickAccessItem {
final Widget leading;
final String title;
final VoidCallback onTap;
final EdgeInsetsGeometry? contentPadding;
const _QuickAccessItem({required this.leading, required this.title, required this.onTap, this.contentPadding});
}
class _QuickAccessButtonList extends ConsumerWidget {
const _QuickAccessButtonList();
static const _tileRadius = 20.0;
@override
Widget build(BuildContext context, WidgetRef ref) {
final partnerSharedWithAsync = ref.watch(sharedWithPartnerProvider);
final partners = partnerSharedWithAsync.valueOrNull ?? [];
final items = [
_QuickAccessItem(
leading: const Icon(Icons.folder_outlined, size: 26),
title: context.t.folders,
onTap: () => context.pushRoute(FolderRoute()),
),
_QuickAccessItem(
leading: const Icon(Icons.lock_outline_rounded, size: 26),
title: context.t.locked_folder,
onTap: () => context.pushRoute(const LockedFolderRoute()),
),
_QuickAccessItem(
leading: const Icon(Icons.group_outlined, size: 26),
title: context.t.partners,
onTap: () => context.pushRoute(const PartnerRoute()),
),
for (final partner in partners)
_QuickAccessItem(
contentPadding: const EdgeInsets.only(left: 12.0, right: 18.0),
leading: PartnerUserAvatar(userId: partner.id, name: partner.name),
title: context.t.partner_list_user_photos(user: partner.name),
onTap: () => context.pushRoute(PartnerDetailRoute(partner: partner)),
),
];
return SliverPadding(
padding: const EdgeInsets.only(left: 16, top: 12, right: 16, bottom: 32),
sliver: SliverToBoxAdapter(
child: DecoratedBox(
decoration: BoxDecoration(
border: Border.all(color: context.colorScheme.onSurface.withAlpha(10), width: 1),
borderRadius: const BorderRadius.all(Radius.circular(20)),
borderRadius: const BorderRadius.all(Radius.circular(_tileRadius)),
gradient: LinearGradient(
colors: [
context.colorScheme.primary.withAlpha(10),
@@ -442,83 +478,33 @@ class _QuickAccessButtonList extends ConsumerWidget {
end: Alignment.bottomCenter,
),
),
child: ListView(
child: ListView.builder(
shrinkWrap: true,
padding: EdgeInsets.zero,
physics: const NeverScrollableScrollPhysics(),
children: [
ListTile(
itemCount: items.length,
itemBuilder: (context, index) {
final item = items[index];
final isFirst = index == 0;
final isLast = index == items.length - 1;
return ListTile(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
topLeft: const Radius.circular(20),
topRight: const Radius.circular(20),
bottomLeft: Radius.circular(partners.isEmpty ? 20 : 0),
bottomRight: Radius.circular(partners.isEmpty ? 20 : 0),
topLeft: Radius.circular(isFirst ? _tileRadius : 0),
topRight: Radius.circular(isFirst ? _tileRadius : 0),
bottomLeft: Radius.circular(isLast ? _tileRadius : 0),
bottomRight: Radius.circular(isLast ? _tileRadius : 0),
),
),
leading: const Icon(Icons.folder_outlined, size: 26),
title: Text(
context.t.folders,
style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500),
),
onTap: () => context.pushRoute(FolderRoute()),
),
ListTile(
leading: const Icon(Icons.lock_outline_rounded, size: 26),
title: Text(
context.t.locked_folder,
style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500),
),
onTap: () => context.pushRoute(const LockedFolderRoute()),
),
ListTile(
leading: const Icon(Icons.group_outlined, size: 26),
title: Text(
context.t.partners,
style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500),
),
onTap: () => context.pushRoute(const PartnerRoute()),
),
_PartnerList(partners: partners.toList()),
],
contentPadding: item.contentPadding,
leading: item.leading,
title: Text(item.title, style: context.textTheme.titleSmall?.copyWith(fontWeight: FontWeight.w500)),
onTap: item.onTap,
);
},
),
),
),
);
}
}
class _PartnerList extends StatelessWidget {
const _PartnerList({required this.partners});
final List<Partner> partners;
@override
Widget build(BuildContext context) {
return ListView.builder(
padding: EdgeInsets.zero,
physics: const NeverScrollableScrollPhysics(),
itemCount: partners.length,
shrinkWrap: true,
itemBuilder: (context, index) {
final partner = partners[index];
final isLastItem = index == partners.length - 1;
return ListTile(
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.only(
bottomLeft: Radius.circular(isLastItem ? 20 : 0),
bottomRight: Radius.circular(isLastItem ? 20 : 0),
),
),
contentPadding: const EdgeInsets.only(left: 12.0, right: 18.0),
leading: PartnerUserAvatar(userId: partner.id, name: partner.name),
title: Text(
context.t.partner_list_user_photos(user: partner.name),
style: const TextStyle(fontWeight: FontWeight.w500),
),
onTap: () => context.pushRoute(PartnerDetailRoute(partner: partner)),
);
},
);
}
}