This commit is contained in:
Alex 2024-09-07 16:07:31 -05:00
parent 3417330bdf
commit 9266197cd2
No known key found for this signature in database
GPG Key ID: 53CD082B3A5E1082
4 changed files with 8 additions and 6 deletions

View File

@ -26,7 +26,8 @@ class AlbumsCollectionPage extends HookConsumerWidget {
const AlbumsCollectionPage({super.key}); const AlbumsCollectionPage({super.key});
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final albums = ref.watch(albumProviderV2); final albums =
ref.watch(albumProviderV2).where((album) => album.isRemote).toList();
final albumSortOption = ref.watch(albumSortByOptionsProvider); final albumSortOption = ref.watch(albumSortByOptionsProvider);
final albumSortIsReverse = ref.watch(albumSortOrderProvider); final albumSortIsReverse = ref.watch(albumSortOrderProvider);
final sorted = albumSortOption.sortFn(albums, albumSortIsReverse); final sorted = albumSortOption.sortFn(albums, albumSortIsReverse);

View File

@ -4,6 +4,7 @@ import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/extensions/asyncvalue_extensions.dart'; import 'package:immich_mobile/extensions/asyncvalue_extensions.dart';
import 'package:immich_mobile/extensions/build_context_extensions.dart'; import 'package:immich_mobile/extensions/build_context_extensions.dart';
import 'package:immich_mobile/providers/album/album.provider.dart'; import 'package:immich_mobile/providers/album/album.provider.dart';
import 'package:immich_mobile/providers/album/albumv2.provider.dart';
import 'package:immich_mobile/providers/search/people.provider.dart'; import 'package:immich_mobile/providers/search/people.provider.dart';
import 'package:immich_mobile/providers/server_info.provider.dart'; import 'package:immich_mobile/providers/server_info.provider.dart';
import 'package:immich_mobile/routing/router.dart'; import 'package:immich_mobile/routing/router.dart';
@ -141,8 +142,8 @@ class AlbumsCollectionCard extends ConsumerWidget {
@override @override
Widget build(BuildContext context, WidgetRef ref) { Widget build(BuildContext context, WidgetRef ref) {
final albums = isLocal final albums = isLocal
? ref.watch(albumProvider).where((album) => album.isLocal) ? ref.watch(albumProviderV2).where((album) => album.isLocal)
: ref.watch(albumProvider).where((album) => album.isRemote); : ref.watch(albumProviderV2).where((album) => album.isRemote);
final size = MediaQuery.of(context).size.width * 0.5 - 20; final size = MediaQuery.of(context).size.width * 0.5 - 20;
return GestureDetector( return GestureDetector(
onTap: () => context.pushRoute( onTap: () => context.pushRoute(

View File

@ -12,7 +12,7 @@ import 'package:isar/isar.dart';
class AlbumNotifierV2 extends StateNotifier<List<Album>> { class AlbumNotifierV2 extends StateNotifier<List<Album>> {
AlbumNotifierV2(this._albumService, this.db) : super([]) { AlbumNotifierV2(this._albumService, this.db) : super([]) {
final query = db.albums.filter().remoteIdIsNotNull(); final query = db.albums.where();
query.findAll().then((value) { query.findAll().then((value) {
if (mounted) { if (mounted) {

View File

@ -112,9 +112,9 @@ class AlbumThumbnailCard extends StatelessWidget {
child: Text( child: Text(
album.name, album.name,
overflow: TextOverflow.ellipsis, overflow: TextOverflow.ellipsis,
style: context.textTheme.labelLarge?.copyWith( style: context.textTheme.titleSmall?.copyWith(
color: context.colorScheme.onSurface, color: context.colorScheme.onSurface,
fontSize: 16, fontWeight: FontWeight.w500,
), ),
), ),
), ),