github/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich synced 2025-06-09 00:17:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(mobile): group settings not respected without restart (#18823)

Browse Source 
Co-authored-by: shenlong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
shenlong 2025-06-02 07:23:45 +05:30 committed by GitHub
parent d118b46c3f
commit 091a101f39
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 43 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mobile/lib/services/app_settings.service.dart
View File

@ -104,7 +104,7 @@ class AppSettingsService {
return Store.get(setting.storeKey, setting.defaultValue); return Store.get(setting.storeKey, setting.defaultValue);
} }
void setSetting<T>(AppSettingsEnum<T> setting, T value) { Future<void> setSetting<T>(AppSettingsEnum<T> setting, T value) {
Store.put(setting.storeKey, value); return Store.put(setting.storeKey, value);
} }
} }

20
mobile/lib/widgets/settings/asset_list_settings/asset_list_group_settings.dart
View File

@ -1,12 +1,14 @@
import 'dart:async';
import 'package:easy_localization/easy_localization.dart'; import 'package:easy_localization/easy_localization.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
import 'package:immich_mobile/providers/app_settings.provider.dart'; import 'package:immich_mobile/providers/app_settings.provider.dart';
import 'package:immich_mobile/services/app_settings.service.dart'; import 'package:immich_mobile/services/app_settings.service.dart';
import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
import 'package:immich_mobile/widgets/asset_grid/asset_grid_data_structure.dart';
import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart'; import 'package:immich_mobile/widgets/settings/settings_radio_list_tile.dart';
import 'package:immich_mobile/widgets/settings/settings_sub_title.dart'; import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
class GroupSettings extends HookConsumerWidget { class GroupSettings extends HookConsumerWidget {
const GroupSettings({ const GroupSettings({
@ -18,14 +20,18 @@ class GroupSettings extends HookConsumerWidget {
final groupByIndex = useAppSettingsState(AppSettingsEnum.groupAssetsBy); final groupByIndex = useAppSettingsState(AppSettingsEnum.groupAssetsBy);
final groupBy = GroupAssetsBy.values[groupByIndex.value]; final groupBy = GroupAssetsBy.values[groupByIndex.value];
Future<void> updateAppSettings(GroupAssetsBy groupBy) async {
await ref.watch(appSettingsServiceProvider).setSetting(
AppSettingsEnum.groupAssetsBy,
groupBy.index,
);
ref.invalidate(appSettingsServiceProvider);
}
void changeGroupValue(GroupAssetsBy? value) { void changeGroupValue(GroupAssetsBy? value) {
if (value != null) { if (value != null) {
groupByIndex.value = value.index; groupByIndex.value = value.index;
ref.watch(appSettingsServiceProvider).setSetting( unawaited(updateAppSettings(groupBy));
AppSettingsEnum.groupAssetsBy,
value.index,
);
ref.invalidate(appSettingsServiceProvider);
} }
} }

30
mobile/test/modules/album/album_sort_by_options_provider_test.dart
View File

@ -1,10 +1,10 @@
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart'; import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/entities/album.entity.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart'; import 'package:immich_mobile/providers/album/album_sort_by_options.provider.dart';
import 'package:immich_mobile/providers/app_settings.provider.dart'; import 'package:immich_mobile/providers/app_settings.provider.dart';
import 'package:immich_mobile/services/app_settings.service.dart'; import 'package:immich_mobile/services/app_settings.service.dart';
import 'package:immich_mobile/entities/album.entity.dart';
import 'package:immich_mobile/entities/asset.entity.dart';
import 'package:isar/isar.dart'; import 'package:isar/isar.dart';
import 'package:mocktail/mocktail.dart'; import 'package:mocktail/mocktail.dart';
@ -225,6 +225,18 @@ void main() {
appSettingsServiceProvider.overrideWith((ref) => settingsMock), appSettingsServiceProvider.overrideWith((ref) => settingsMock),
], ],
); );
when(
() => settingsMock.setSetting<bool>(
AppSettingsEnum.selectedAlbumSortReverse,
any(),
),
).thenAnswer((_) async => {});
when(
() => settingsMock.setSetting<int>(
AppSettingsEnum.selectedAlbumSortOrder,
any(),
),
).thenAnswer((_) async => {});
}); });
test('Returns the default sort mode when none set', () { test('Returns the default sort mode when none set', () {
@ -298,6 +310,8 @@ void main() {
late AppSettingsService settingsMock; late AppSettingsService settingsMock;
late ProviderContainer container; late ProviderContainer container;
registerFallbackValue(AppSettingsEnum.selectedAlbumSortReverse);
setUp(() async { setUp(() async {
settingsMock = MockAppSettingsService(); settingsMock = MockAppSettingsService();
container = TestUtils.createContainer( container = TestUtils.createContainer(
@ -305,6 +319,18 @@ void main() {
appSettingsServiceProvider.overrideWith((ref) => settingsMock), appSettingsServiceProvider.overrideWith((ref) => settingsMock),
], ],
); );
when(
() => settingsMock.setSetting<bool>(
AppSettingsEnum.selectedAlbumSortReverse,
any(),
),
).thenAnswer((_) async => {});
when(
() => settingsMock.setSetting<int>(
AppSettingsEnum.selectedAlbumSortOrder,
any(),
),
).thenAnswer((_) async => {});
}); });
test('Returns the default sort order when none set - false', () { test('Returns the default sort order when none set - false', () {