High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
chore(mobile): const platform checks (#21878)
Mertb79a2eb6b928
diff --git a/mobile/lib/domain/services/asset.service.dart b/mobile/lib/domain/services/asset.service.dartindex 875dc80702..a5fb5dd70e 100644--- a/mobile/lib/domain/services/asset.service.dart+++ b/mobile/lib/domain/services/asset.service.dart@@ -1,22 +1,20 @@import 'package:immich_mobile/domain/models/album/local_album.model.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';import 'package:immich_mobile/domain/models/exif.model.dart';+import 'package:immich_mobile/extensions/platform_extensions.dart';import 'package:immich_mobile/infrastructure/repositories/local_asset.repository.dart';import 'package:immich_mobile/infrastructure/repositories/remote_asset.repository.dart';import 'package:immich_mobile/infrastructure/utils/exif.converter.dart';-import 'package:platform/platform.dart';class AssetService {final RemoteAssetRepository _remoteAssetRepository;final DriftLocalAssetRepository _localAssetRepository;- final Platform _platform;const AssetService({required RemoteAssetRepository remoteAssetRepository,required DriftLocalAssetRepository localAssetRepository,}) : _remoteAssetRepository = remoteAssetRepository,- _localAssetRepository = localAssetRepository,- _platform = const LocalPlatform();+ _localAssetRepository = localAssetRepository;Future<BaseAsset?> getAsset(BaseAsset asset) {final id = asset is LocalAsset ? asset.id : (asset as RemoteAsset).id;@@ -71,7 +69,7 @@ class AssetService {width = exif?.width ?? asset.width?.toDouble();height = exif?.height ?? asset.height?.toDouble();} else if (asset is LocalAsset) {- isFlipped = _platform.isAndroid && (asset.orientation == 90 || asset.orientation == 270);+ isFlipped = CurrentPlatform.isAndroid && (asset.orientation == 90 || asset.orientation == 270);width = asset.width?.toDouble();height = asset.height?.toDouble();} else {diff --git a/mobile/lib/domain/services/local_sync.service.dart b/mobile/lib/domain/services/local_sync.service.dartindex 5ab10bdf09..d333af7481 100644--- a/mobile/lib/domain/services/local_sync.service.dart+++ b/mobile/lib/domain/services/local_sync.service.dart@@ -1,29 +1,24 @@import 'dart:async';import 'package:collection/collection.dart';-import 'package:flutter/widgets.dart';+import 'package:flutter/foundation.dart';import 'package:immich_mobile/domain/models/album/local_album.model.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:immich_mobile/extensions/platform_extensions.dart';import 'package:immich_mobile/infrastructure/repositories/local_album.repository.dart';import 'package:immich_mobile/platform/native_sync_api.g.dart';import 'package:immich_mobile/utils/datetime_helpers.dart';import 'package:immich_mobile/utils/diff.dart';import 'package:logging/logging.dart';-import 'package:platform/platform.dart';class LocalSyncService {final DriftLocalAlbumRepository _localAlbumRepository;final NativeSyncApi _nativeSyncApi;- final Platform _platform;final Logger _log = Logger("DeviceSyncService");- LocalSyncService({- required DriftLocalAlbumRepository localAlbumRepository,- required NativeSyncApi nativeSyncApi,- Platform? platform,- }) : _localAlbumRepository = localAlbumRepository,- _nativeSyncApi = nativeSyncApi,- _platform = platform ?? const LocalPlatform();+ LocalSyncService({required DriftLocalAlbumRepository localAlbumRepository, required NativeSyncApi nativeSyncApi})+ : _localAlbumRepository = localAlbumRepository,+ _nativeSyncApi = nativeSyncApi;Future<void> sync({bool full = false}) async {final Stopwatch stopwatch = Stopwatch()..start();@@ -53,14 +48,14 @@ class LocalSyncService {final dbAlbums = await _localAlbumRepository.getAll();// On Android, we need to sync all albums since it is not possible to// detect album deletions from the native side- if (_platform.isAndroid) {+ if (CurrentPlatform.isAndroid) {for (final album in dbAlbums) {final deviceIds = await _nativeSyncApi.getAssetIdsForAlbum(album.id);await _localAlbumRepository.syncDeletes(album.id, deviceIds);}}- if (_platform.isIOS) {+ if (CurrentPlatform.isIOS) {// On iOS, we need to full sync albums that are marked as cloud as the delta sync// does not include changes for cloud albums. If ignoreIcloudAssets is enabled,// remove the albums from the local database from the previous syncdiff --git a/mobile/lib/extensions/platform_extensions.dart b/mobile/lib/extensions/platform_extensions.dartnew file mode 100644index 0000000000..7353fbc6f6--- /dev/null+++ b/mobile/lib/extensions/platform_extensions.dart@@ -0,0 +1,9 @@+import 'package:flutter/foundation.dart';++extension CurrentPlatform on TargetPlatform {+ @pragma('vm:prefer-inline')+ static bool get isIOS => defaultTargetPlatform == TargetPlatform.iOS;++ @pragma('vm:prefer-inline')+ static bool get isAndroid => defaultTargetPlatform == TargetPlatform.android;+}diff --git a/mobile/lib/infrastructure/repositories/local_album.repository.dart b/mobile/lib/infrastructure/repositories/local_album.repository.dartindex 923d6e0a68..b97884c27f 100644--- a/mobile/lib/infrastructure/repositories/local_album.repository.dart+++ b/mobile/lib/infrastructure/repositories/local_album.repository.dart@@ -1,22 +1,20 @@import 'package:drift/drift.dart';import 'package:immich_mobile/domain/models/album/local_album.model.dart';import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';+import 'package:immich_mobile/extensions/platform_extensions.dart';import 'package:immich_mobile/infrastructure/entities/local_album.entity.dart';import 'package:immich_mobile/infrastructure/entities/local_album.entity.drift.dart';import 'package:immich_mobile/infrastructure/entities/local_album_asset.entity.drift.dart';import 'package:immich_mobile/infrastructure/entities/local_asset.entity.dart';import 'package:immich_mobile/infrastructure/entities/local_asset.entity.drift.dart';import 'package:immich_mobile/infrastructure/repositories/db.repository.dart';-import 'package:platform/platform.dart';enum SortLocalAlbumsBy { id, backupSelection, isIosSharedAlbum, name, assetCount, newestAsset }class DriftLocalAlbumRepository extends DriftDatabaseRepository {final Drift _db;- final Platform _platform;- const DriftLocalAlbumRepository(this._db, {Platform? platform})- : _platform = platform ?? const LocalPlatform(),- super(_db);++ const DriftLocalAlbumRepository(this._db) : super(_db);Future<List<LocalAlbum>> getAll({Set<SortLocalAlbumsBy> sortBy = const {}}) {final assetCount = _db.localAlbumAssetEntity.assetId.count();@@ -61,7 +59,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {// Remove all assets that are only in this particular album// We cannot remove all assets in the album because they might be in other albums in iOS// That is not the case on Android since asset <-> album has one:one mapping- final assetsToDelete = _platform.isIOS ? await _getUniqueAssetsInAlbum(albumId) : await getAssetIds(albumId);+ final assetsToDelete = CurrentPlatform.isIOS ? await _getUniqueAssetsInAlbum(albumId) : await getAssetIds(albumId);await _deleteAssets(assetsToDelete);await _db.managers.localAlbumEntity@@ -144,7 +142,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {}});- if (_platform.isAndroid) {+ if (CurrentPlatform.isAndroid) {// On Android, an asset can only be in one album// So, get the albums that are marked for deletion// and delete all the assets that are in those albums@@ -265,7 +263,7 @@ class DriftLocalAlbumRepository extends DriftDatabaseRepository {return Future.value();}- if (_platform.isAndroid) {+ if (CurrentPlatform.isAndroid) {return _deleteAssets(assetIds);}diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dartindex 899b6ed545..f57186d800 100644--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart@@ -10,6 +10,7 @@ import 'package:immich_mobile/domain/models/timeline.model.dart';import 'package:immich_mobile/domain/services/timeline.service.dart';import 'package:immich_mobile/domain/utils/event_stream.dart';import 'package:immich_mobile/extensions/build_context_extensions.dart';+import 'package:immich_mobile/extensions/platform_extensions.dart';import 'package:immich_mobile/extensions/scroll_extensions.dart';import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.provider.dart';import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_stack.widget.dart';@@ -30,7 +31,6 @@ import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';import 'package:immich_mobile/widgets/common/immich_loading_indicator.dart';import 'package:immich_mobile/widgets/photo_view/photo_view.dart';import 'package:immich_mobile/widgets/photo_view/photo_view_gallery.dart';-import 'package:platform/platform.dart';@RoutePage()class AssetViewerPage extends StatelessWidget {@@ -53,10 +53,9 @@ class AssetViewerPage extends StatelessWidget {class AssetViewer extends ConsumerStatefulWidget {final int initialIndex;- final Platform? platform;final int? heroOffset;- const AssetViewer({super.key, required this.initialIndex, this.platform, this.heroOffset});+ const AssetViewer({super.key, required this.initialIndex, this.heroOffset});@overrideConsumerState createState() => _AssetViewerState();@@ -86,7 +85,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {PhotoViewControllerBase? viewController;StreamSubscription? reloadSubscription;- late Platform platform;late final int heroOffset;late PhotoViewControllerValue initialPhotoViewState;bool? hasDraggedDown;@@ -114,7 +112,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {super.initState();assert(ref.read(currentAssetNotifier) != null, "Current asset should not be null when opening the AssetViewer");pageController = PageController(initialPage: widget.initialIndex);- platform = widget.platform ?? const LocalPlatform();totalAssets = ref.read(timelineServiceProvider).totalAssets;bottomSheetController = DraggableScrollableController();WidgetsBinding.instance.addPostFrameCallback(_onAssetInit);@@ -638,7 +635,7 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {gaplessPlayback: true,loadingBuilder: _placeholderBuilder,pageController: pageController,- scrollPhysics: platform.isIOS+ scrollPhysics: CurrentPlatform.isIOS? const FastScrollPhysics() // Use bouncing physics for iOS: const FastClampingScrollPhysics(), // Use heavy physics for AndroiditemCount: totalAssets,diff --git a/mobile/pubspec.lock b/mobile/pubspec.lockindex e9dec3e5b9..35513cca35 100644--- a/mobile/pubspec.lock+++ b/mobile/pubspec.lock@@ -1429,7 +1429,7 @@ packages:source: hostedversion: "5.0.1"platform:- dependency: "direct main"+ dependency: transitivedescription:name: platformsha256: "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984"diff --git a/mobile/pubspec.yaml b/mobile/pubspec.yamlindex 8219581998..ca98a9a78e 100644--- a/mobile/pubspec.yaml+++ b/mobile/pubspec.yaml@@ -57,7 +57,6 @@ dependencies:photo_manager: ^3.6.4photo_manager_image_provider: ^2.2.0pinput: ^5.0.1- platform: ^3.1.6punycode: ^1.0.0riverpod_annotation: ^2.6.1scrollable_positioned_list: ^0.3.8