button style

mobile/lib/domain/models/asset/base_asset.model.dart

@@ -56,6 +56,8 @@ sealed class BaseAsset {
 
   // Overridden in subclasses
   AssetState get storage;
+  String? get localId;
+  String? get remoteId;
   String get heroTag;
 
   @override

mobile/lib/domain/models/asset/local_asset.model.dart

@@ -2,12 +2,12 @@ part of 'base_asset.model.dart';
 
 class LocalAsset extends BaseAsset {
   final String id;
-  final String? remoteId;
+  final String? remoteAssetId;
   final int orientation;
 
   const LocalAsset({
     required this.id,
-    this.remoteId,
+    String? remoteId,
     required super.name,
     super.checksum,
     required super.type,
@@ -19,7 +19,13 @@ class LocalAsset extends BaseAsset {
     super.isFavorite = false,
     super.livePhotoVideoId,
     this.orientation = 0,
-  });
+  }) : remoteAssetId = remoteId;
+
+  @override
+  String? get localId => id;
+
+  @override
+  String? get remoteId => remoteAssetId;
 
   @override
   AssetState get storage => remoteId == null ? AssetState.local : AssetState.merged;

mobile/lib/domain/models/asset/remote_asset.model.dart

@@ -5,7 +5,7 @@ enum AssetVisibility { timeline, hidden, archive, locked }
 // Model for an asset stored in the server
 class RemoteAsset extends BaseAsset {
   final String id;
-  final String? localId;
+  final String? localAssetId;
   final String? thumbHash;
   final AssetVisibility visibility;
   final String ownerId;
@@ -13,7 +13,7 @@ class RemoteAsset extends BaseAsset {
 
   const RemoteAsset({
     required this.id,
-    this.localId,
+    String? localId,
     required super.name,
     required this.ownerId,
     required super.checksum,
@@ -28,7 +28,13 @@ class RemoteAsset extends BaseAsset {
     this.visibility = AssetVisibility.timeline,
     super.livePhotoVideoId,
     this.stackId,
-  });
+  }) : localAssetId = localId;
+
+  @override
+  String? get localId => localAssetId;
+
+  @override
+  String? get remoteId => id;
 
   @override
   AssetState get storage => localId == null ? AssetState.remote : AssetState.merged;

mobile/lib/presentation/widgets/action_buttons/delete_local_action_button.widget.dart

@@ -8,6 +8,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/base_action_bu
 import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';
 import 'package:immich_mobile/providers/infrastructure/action.provider.dart';
 import 'package:immich_mobile/providers/timeline/multiselect.provider.dart';
+import 'package:immich_mobile/widgets/asset_grid/delete_dialog.dart';
 import 'package:immich_mobile/widgets/common/immich_toast.dart';
 
 /// This delete action has the following behavior:
@@ -22,7 +23,17 @@ class DeleteLocalActionButton extends ConsumerWidget {
       return;
     }
 
-    final result = await ref.read(actionProvider.notifier).deleteLocal(source);
+    bool? backedUpOnly = await showDialog<bool>(
+      context: context,
+      builder: (BuildContext context) => DeleteLocalOnlyDialog(onDeleteLocal: (_) {}),
+    );
+
+    if (backedUpOnly == null) {
+      // User cancelled the dialog
+      return;
+    }
+
+    final result = await ref.read(actionProvider.notifier).deleteLocal(source, backedUpOnly);
     ref.read(multiSelectProvider.notifier).reset();
 
     if (source == ActionSource.viewer) {

mobile/lib/providers/infrastructure/action.provider.dart

@@ -257,8 +257,15 @@ class ActionNotifier extends Notifier<void> {
     }
   }
 
-  Future<ActionResult> deleteLocal(ActionSource source) async {
+  Future<ActionResult> deleteLocal(ActionSource source, bool backedUpOnly) async {
-    final ids = _getLocalIdsForSource(source);
+    final List<String> ids;
+    if (backedUpOnly) {
+      final assets = _getAssets(source);
+      ids = assets.where((asset) => asset.storage == AssetState.merged).map((asset) => asset.localId!).toList();
+    } else {
+      ids = _getLocalIdsForSource(source);
+    }
+
     try {
       final deletedCount = await _service.deleteLocal(ids);
       return ActionResult(count: deletedCount, success: true);

mobile/lib/repositories/asset_media.repository.dart

@@ -1,5 +1,6 @@
 import 'dart:io';
 
+import 'package:device_info_plus/device_info_plus.dart';
 import 'package:flutter/widgets.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/domain/models/asset/base_asset.model.dart';
@@ -21,11 +22,26 @@ final assetMediaRepositoryProvider = Provider((ref) => AssetMediaRepository(ref.
 
 class AssetMediaRepository {
   final AssetApiRepository _assetApiRepository;
+
   static final Logger _log = Logger("AssetMediaRepository");
 
   const AssetMediaRepository(this._assetApiRepository);
 
-  Future<List<String>> deleteAll(List<String> ids) => PhotoManager.editor.deleteWithIds(ids);
+  Future<List<String>> deleteAll(List<String> ids) async {
+    if (CurrentPlatform.isIOS) {
+      return PhotoManager.editor.deleteWithIds(ids);
+    } else if (CurrentPlatform.isAndroid) {
+      final androidInfo = await DeviceInfoPlugin().androidInfo;
+      if (androidInfo.version.sdkInt < 30) {
+        return PhotoManager.editor.deleteWithIds(ids);
+      }
+      return PhotoManager.editor.android.moveToTrash(
+        // Only the id is needed
+        ids.map((id) => AssetEntity(id: id, width: 1, height: 1, typeInt: 0)).toList(),
+      );
+    }
+    return [];
+  }
 
   Future<asset_entity.Asset?> get(String id) async {
     final entity = await AssetEntity.fromId(id);

mobile/lib/widgets/asset_grid/delete_dialog.dart

@@ -22,12 +22,12 @@ class DeleteLocalOnlyDialog extends StatelessWidget {
   @override
   Widget build(BuildContext context) {
     void onDeleteBackedUpOnly() {
-      context.pop();
+      context.pop(true);
       onDeleteLocal(true);
     }
 
     void onForceDelete() {
-      context.pop();
+      context.pop(false);
       onDeleteLocal(false);
     }
 
@@ -36,26 +36,44 @@ class DeleteLocalOnlyDialog extends StatelessWidget {
       title: const Text("delete_dialog_title").tr(),
       content: const Text("delete_dialog_alert_local_non_backed_up").tr(),
       actions: [
-        TextButton(
+        SizedBox(
-          onPressed: () => context.pop(),
+          width: double.infinity,
-          child: Text(
+          height: 48,
-            "cancel",
+          child: FilledButton(
-            style: TextStyle(color: context.primaryColor, fontWeight: FontWeight.bold),
+            onPressed: () => context.pop(),
-          ).tr(),
+            style: FilledButton.styleFrom(
+              backgroundColor: context.colorScheme.surfaceDim,
+              foregroundColor: context.primaryColor,
+            ),
+            child: const Text("cancel", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
+          ),
         ),
-        TextButton(
+        const SizedBox(height: 8),
-          onPressed: onDeleteBackedUpOnly,
+        SizedBox(
-          child: Text(
+          width: double.infinity,
-            "delete_local_dialog_ok_backed_up_only",
+          height: 48,
-            style: TextStyle(color: context.colorScheme.tertiary, fontWeight: FontWeight.bold),
+
-          ).tr(),
+          child: FilledButton(
+            onPressed: onDeleteBackedUpOnly,
+            style: FilledButton.styleFrom(
+              backgroundColor: context.colorScheme.errorContainer,
+              foregroundColor: context.colorScheme.onErrorContainer,
+            ),
+            child: const Text(
+              "delete_local_dialog_ok_backed_up_only",
+              style: TextStyle(fontWeight: FontWeight.bold),
+            ).tr(),
+          ),
         ),
-        TextButton(
+        const SizedBox(height: 8),
-          onPressed: onForceDelete,
+        SizedBox(
-          child: Text(
+          width: double.infinity,
-            "delete_local_dialog_ok_force",
+          height: 48,
-            style: TextStyle(color: Colors.red[400], fontWeight: FontWeight.bold),
+          child: FilledButton(
-          ).tr(),
+            onPressed: onForceDelete,
+            style: FilledButton.styleFrom(backgroundColor: Colors.red[400], foregroundColor: Colors.white),
+            child: const Text("delete_local_dialog_ok_force", style: TextStyle(fontWeight: FontWeight.bold)).tr(),
+          ),
         ),
       ],
     );