self-hosted/immich
1
0
Fork 0
mirror of https://github.com/immich-app/immich.git synced 2025-07-16 07:24:40 +02:00
Code Issues Releases Activity

refactor(mobile): server info to use data classes instead of dtos (#4591)

Browse Source 
* refactor: server info model to use data classes instead of dtos

* mobile: add return types and refactor private variables in map / stack

---------

Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
This commit is contained in:
shenlong
2023-10-22 20:15:34 +00:00
committed by GitHub
parent 9b418642a6
commit b05132a01a
15 changed files with 294 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/lib/modules/asset_viewer/providers/asset_stack.provider.dart
View File

@ -20,7 +20,7 @@ class AssetStackNotifier extends StateNotifier<List<Asset>> {
}
}
removeChild(int index) {
void removeChild(int index) {
if (index < state.length) {
state.removeAt(index);
}

4
mobile/lib/modules/asset_viewer/services/asset_stack.service.dart
View File

@ -10,7 +10,7 @@ class AssetStackService {
final ApiService _api;
updateStack(
Future<void> updateStack(
Asset parentAsset, {
List<Asset>? childrenToAdd,
List<Asset>? childrenToRemove,
@ -46,7 +46,7 @@ class AssetStackService {
}
}
updateStackParent(Asset oldParent, Asset newParent) async {
Future<void> updateStackParent(Asset oldParent, Asset newParent) async {
// Guard [local asset]
if (oldParent.remoteId == null || newParent.remoteId == null) {
return;

6
mobile/lib/modules/backup/models/backup_state.model.dart
View File

@ -1,6 +1,6 @@
import 'package:cancellation_token_http/http.dart';
import 'package:collection/collection.dart';
import 'package:openapi/api.dart';
import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart';
import 'package:photo_manager/photo_manager.dart';
import 'package:immich_mobile/modules/backup/models/available_album.model.dart';
@ -20,7 +20,7 @@ class BackUpState {
final List<String> allAssetsInDatabase;
final double progressInPercentage;
final CancellationToken cancelToken;
final ServerInfoResponseDto serverInfo;
final ServerDiskInfo serverInfo;
final bool autoBackup;
final bool backgroundBackup;
final bool backupRequireWifi;
@ -65,7 +65,7 @@ class BackUpState {
List<String>? allAssetsInDatabase,
double? progressInPercentage,
CancellationToken? cancelToken,
ServerInfoResponseDto? serverInfo,
ServerDiskInfo? serverInfo,
bool? autoBackup,
bool? backgroundBackup,
bool? backupRequireWifi,

9
mobile/lib/modules/backup/providers/backup.provider.dart
View File

@ -13,6 +13,7 @@ import 'package:immich_mobile/modules/backup/services/backup.service.dart';
import 'package:immich_mobile/modules/login/models/authentication_state.model.dart';
import 'package:immich_mobile/modules/login/providers/authentication.provider.dart';
import 'package:immich_mobile/modules/onboarding/providers/gallery_permission.provider.dart';
import 'package:immich_mobile/shared/models/server_info/server_disk_info.model.dart';
import 'package:immich_mobile/shared/models/store.dart';
import 'package:immich_mobile/shared/providers/app_state.provider.dart';
import 'package:immich_mobile/shared/providers/db.provider.dart';
@ -20,7 +21,6 @@ import 'package:immich_mobile/shared/services/server_info.service.dart';
import 'package:immich_mobile/utils/diff.dart';
import 'package:isar/isar.dart';
import 'package:logging/logging.dart';
import 'package:openapi/api.dart';
import 'package:permission_handler/permission_handler.dart';
import 'package:photo_manager/photo_manager.dart';
@ -45,14 +45,11 @@ class BackupNotifier extends StateNotifier<BackUpState> {
backupRequireCharging:
Store.get(StoreKey.backupRequireCharging, false),
backupTriggerDelay: Store.get(StoreKey.backupTriggerDelay, 5000),
serverInfo: ServerInfoResponseDto(
serverInfo: const ServerDiskInfo(
diskAvailable: "0",
diskAvailableRaw: 0,
diskSize: "0",
diskSizeRaw: 0,
diskUsagePercentage: 0,
diskUse: "0",
diskUseRaw: 0,
diskUsagePercentage: 0,
),
availableAlbums: const [],
selectedBackupAlbums: const {},

4
mobile/lib/modules/home/ui/home_page_app_bar.dart
View File

@ -8,7 +8,7 @@ import 'package:immich_mobile/modules/login/providers/authentication.provider.da
import 'package:immich_mobile/routing/router.dart';
import 'package:immich_mobile/modules/backup/models/backup_state.model.dart';
import 'package:immich_mobile/shared/models/server_info_state.model.dart';
import 'package:immich_mobile/shared/models/server_info/server_info.model.dart';
import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
@ -28,7 +28,7 @@ class HomePageAppBar extends ConsumerWidget implements PreferredSizeWidget {
final BackUpState backupState = ref.watch(backupProvider);
final bool isEnableAutoBackup =
backupState.backgroundBackup || backupState.autoBackup;
final ServerInfoState serverInfoState = ref.watch(serverInfoProvider);
final ServerInfo serverInfoState = ref.watch(serverInfoProvider);
AuthenticationState authState = ref.watch(authenticationProvider);
final user = Store.tryGet(StoreKey.currentUser);
buildProfilePhoto() {

6
mobile/lib/modules/home/ui/profile_drawer/server_info_box.dart
View File

@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:hooks_riverpod/hooks_riverpod.dart';
import 'package:immich_mobile/shared/models/server_info_state.model.dart';
import 'package:immich_mobile/shared/models/server_info/server_info.model.dart';
import 'package:easy_localization/easy_localization.dart';
import 'package:immich_mobile/shared/providers/server_info.provider.dart';
import 'package:package_info_plus/package_info_plus.dart';
@ -13,7 +13,7 @@ class ServerInfoBox extends HookConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
ServerInfoState serverInfoState = ref.watch(serverInfoProvider);
ServerInfo serverInfoState = ref.watch(serverInfoProvider);
final appInfo = useState({});
@ -107,7 +107,7 @@ class ServerInfoBox extends HookConsumerWidget {
),
Text(
serverInfoState.serverVersion.major > 0
? "${serverInfoState.serverVersion.major}.${serverInfoState.serverVersion.minor}.${serverInfoState.serverVersion.patch_}"
? "${serverInfoState.serverVersion.major}.${serverInfoState.serverVersion.minor}.${serverInfoState.serverVersion.patch}"
: "?",
style: TextStyle(
fontSize: 11,

22
mobile/lib/modules/map/providers/map_state.provider.dart
View File

@ -4,26 +4,24 @@ import 'package:immich_mobile/modules/settings/providers/app_settings.provider.d
import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
class MapStateNotifier extends StateNotifier<MapState> {
MapStateNotifier(this.appSettingsProvider)
MapStateNotifier(this._appSettingsProvider)
: super(
MapState(
isDarkTheme: appSettingsProvider
isDarkTheme: _appSettingsProvider
.getSetting<bool>(AppSettingsEnum.mapThemeMode),
showFavoriteOnly: appSettingsProvider
showFavoriteOnly: _appSettingsProvider
.getSetting<bool>(AppSettingsEnum.mapShowFavoriteOnly),
includeArchived: appSettingsProvider
includeArchived: _appSettingsProvider
.getSetting<bool>(AppSettingsEnum.mapIncludeArchived),
relativeTime: appSettingsProvider
relativeTime: _appSettingsProvider
.getSetting<int>(AppSettingsEnum.mapRelativeDate),
),
);
final AppSettingsService appSettingsProvider;
bool get isDarkTheme => state.isDarkTheme;
final AppSettingsService _appSettingsProvider;
void switchTheme(bool isDarkTheme) {
appSettingsProvider.setSetting(
_appSettingsProvider.setSetting(
AppSettingsEnum.mapThemeMode,
isDarkTheme,
);
@ -31,7 +29,7 @@ class MapStateNotifier extends StateNotifier<MapState> {
}
void switchFavoriteOnly(bool isFavoriteOnly) {
appSettingsProvider.setSetting(
_appSettingsProvider.setSetting(
AppSettingsEnum.mapShowFavoriteOnly,
isFavoriteOnly,
);
@ -39,7 +37,7 @@ class MapStateNotifier extends StateNotifier<MapState> {
}
void switchIncludeArchived(bool isIncludeArchived) {
appSettingsProvider.setSetting(
_appSettingsProvider.setSetting(
AppSettingsEnum.mapIncludeArchived,
isIncludeArchived,
);
@ -47,7 +45,7 @@ class MapStateNotifier extends StateNotifier<MapState> {
}
void setRelativeTime(int relativeTime) {
appSettingsProvider.setSetting(
_appSettingsProvider.setSetting(
AppSettingsEnum.mapRelativeDate,
relativeTime,
);

6
mobile/lib/modules/map/services/map.service.dart
View File

@ -17,7 +17,7 @@ final mapServiceProvider = Provider(
class MapSerivce {
final ApiService _apiService;
final Isar _db;
final log = Logger("MapService");
final _log = Logger("MapService");
MapSerivce(this._apiService, this._db);
@ -37,7 +37,7 @@ class MapSerivce {
return markers ?? [];
} catch (error, stack) {
log.severe("Cannot get map markers ${error.toString()}", error, stack);
_log.severe("Cannot get map markers ${error.toString()}", error, stack);
return [];
}
}
@ -53,7 +53,7 @@ class MapSerivce {
}
return Asset.remote(dto);
} catch (error, stack) {
log.severe(
_log.severe(
"Cannot get asset for marker ${error.toString()}",
error,
stack,