refactor(mobile): tidy-up dependencies, remove unused, replace rarely used ones (#948)

2025-10-29 17:40:28 +00:00 · 2022-11-11 18:52:02 +01:00
parent 33ded2a174
commit 8d0ff974e1
13 changed files with 76 additions and 303 deletions
--- a/mobile/lib/modules/asset_viewer/ui/download_loading_indicator.dart
+++ b/mobile/lib/modules/asset_viewer/ui/download_loading_indicator.dart
@@ -1,24 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_spinkit/flutter_spinkit.dart';
-
-class DownloadLoadingIndicator extends StatelessWidget {
-  const DownloadLoadingIndicator({
-    Key? key,
-  }) : super(key: key);
-
-  @override
-  Widget build(BuildContext context) {
-    return Container(
-      height: 60,
-      width: 60,
-      decoration: BoxDecoration(
-        color: Theme.of(context).primaryColor,
-        borderRadius: BorderRadius.circular(10),
-      ),
-      child: const SpinKitDancingSquare(
-        color: Colors.white,
-        size: 30.0,
-      ),
-    );
-  }
-}
--- a/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart
+++ b/mobile/lib/modules/asset_viewer/views/gallery_viewer.dart
@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:flutter_swipe_detector/flutter_swipe_detector.dart';
 import 'package:hive/hive.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
@@ -129,12 +128,16 @@ class GalleryViewerPage extends HookConsumerWidget {
                threeStageLoading: threeStageLoading.value,
              );
            } else {
-              return SwipeDetector(
-                onSwipeDown: (_) {
-                  AutoRouter.of(context).pop();
-                },
-                onSwipeUp: (_) {
-                  showInfo();
+              return GestureDetector(
+                onVerticalDragUpdate: (details) {
+                  const int sensitivity = 10;
+                  if (details.delta.dy > sensitivity) {
+                    // swipe down
+                    AutoRouter.of(context).pop();
+                  } else if (details.delta.dy < -sensitivity) {
+                    // swipe up
+                    showInfo();
+                  }
                },
                child: Hero(
                  tag: assetList[index].id,
--- a/mobile/lib/modules/asset_viewer/views/image_viewer_page.dart
+++ b/mobile/lib/modules/asset_viewer/views/image_viewer_page.dart
@@ -4,11 +4,11 @@ import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/image_viewer_page_state.provider.dart';
-import 'package:immich_mobile/modules/asset_viewer/ui/download_loading_indicator.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/exif_bottom_sheet.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/remote_photo_view.dart';
 import 'package:immich_mobile/modules/home/services/asset.service.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';

 // ignore: must_be_immutable
 class ImageViewerPage extends HookConsumerWidget {
@@ -84,7 +84,7 @@ class ImageViewerPage extends HookConsumerWidget {
        ),
        if (downloadAssetStatus == DownloadAssetStatus.loading)
          const Center(
-            child: DownloadLoadingIndicator(),
+            child: ImmichLoadingIndicator(),
          ),
      ],
    );
--- a/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart
+++ b/mobile/lib/modules/asset_viewer/views/video_viewer_page.dart
@@ -7,8 +7,8 @@ import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:chewie/chewie.dart';
 import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/image_viewer_page_state.provider.dart';
-import 'package:immich_mobile/modules/asset_viewer/ui/download_loading_indicator.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';
 import 'package:photo_manager/photo_manager.dart';
 import 'package:video_player/video_player.dart';

@@ -52,7 +52,7 @@ class VideoViewerPage extends HookConsumerWidget {
        ),
        if (downloadAssetStatus == DownloadAssetStatus.loading)
          const Center(
-            child: DownloadLoadingIndicator(),
+            child: ImmichLoadingIndicator(),
          ),
      ],
    );
--- a/mobile/lib/modules/backup/models/error_upload_asset.model.dart
+++ b/mobile/lib/modules/backup/models/error_upload_asset.model.dart
@@ -1,7 +1,6 @@
-import 'package:equatable/equatable.dart';
 import 'package:photo_manager/photo_manager.dart';

-class ErrorUploadAsset extends Equatable {
+class ErrorUploadAsset {
  final String id;
  final DateTime createdAt;
  final String fileName;
@@ -42,14 +41,25 @@ class ErrorUploadAsset extends Equatable {
  }

  @override
-  List<Object> get props {
-    return [
-      id,
-      createdAt,
-      fileName,
-      fileType,
-      asset,
-      errorMessage,
-    ];
+  bool operator ==(Object other) {
+    if (identical(this, other)) return true;
+
+    return other is ErrorUploadAsset &&
+        other.id == id &&
+        other.createdAt == createdAt &&
+        other.fileName == fileName &&
+        other.fileType == fileType &&
+        other.asset == asset &&
+        other.errorMessage == errorMessage;
+  }
+
+  @override
+  int get hashCode {
+    return id.hashCode ^
+        createdAt.hashCode ^
+        fileName.hashCode ^
+        fileType.hashCode ^
+        asset.hashCode ^
+        errorMessage.hashCode;
  }
 }
--- a/mobile/lib/modules/backup/views/backup_controller_page.dart
+++ b/mobile/lib/modules/backup/views/backup_controller_page.dart
@@ -13,7 +13,6 @@ import 'package:immich_mobile/modules/backup/providers/backup.provider.dart';
 import 'package:immich_mobile/routing/router.dart';
 import 'package:immich_mobile/shared/providers/websocket.provider.dart';
 import 'package:immich_mobile/modules/backup/ui/backup_info_card.dart';
-import 'package:percent_indicator/linear_percent_indicator.dart';
 import 'package:url_launcher/url_launcher.dart';

 class BackupControllerPage extends HookConsumerWidget {
@@ -63,14 +62,11 @@ class BackupControllerPage extends HookConsumerWidget {
            children: [
              Padding(
                padding: const EdgeInsets.only(top: 8.0),
-                child: LinearPercentIndicator(
-                  padding:
-                      const EdgeInsets.symmetric(horizontal: 0, vertical: 0),
-                  barRadius: const Radius.circular(2),
-                  lineHeight: 10.0,
-                  percent: backupState.serverInfo.diskUsagePercentage / 100.0,
+                child: LinearProgressIndicator(
+                  minHeight: 10.0,
+                  value: backupState.serverInfo.diskUsagePercentage / 100.0,
                  backgroundColor: Colors.grey,
-                  progressColor: Theme.of(context).primaryColor,
+                  color: Theme.of(context).primaryColor,
                ),
              ),
              Padding(
@@ -444,17 +440,21 @@ class BackupControllerPage extends HookConsumerWidget {
          children: [
            Padding(
              padding: const EdgeInsets.only(top: 8.0),
-              child: LinearPercentIndicator(
-                padding: const EdgeInsets.symmetric(horizontal: 0, vertical: 0),
-                barRadius: const Radius.circular(2),
-                lineHeight: 10.0,
-                trailing: Text(
-                  " ${backupState.progressInPercentage.toStringAsFixed(0)}%",
-                  style: const TextStyle(fontSize: 12),
-                ),
-                percent: backupState.progressInPercentage / 100.0,
-                backgroundColor: Colors.grey,
-                progressColor: Theme.of(context).primaryColor,
+              child: Row(
+                children: [
+                  Expanded(
+                    child: LinearProgressIndicator(
+                      minHeight: 10.0,
+                      value: backupState.progressInPercentage / 100.0,
+                      backgroundColor: Colors.grey,
+                      color: Theme.of(context).primaryColor,
+                    ),
+                  ),
+                  Text(
+                    " ${backupState.progressInPercentage.toStringAsFixed(0)}%",
+                    style: const TextStyle(fontSize: 12),
+                  )
+                ],
              ),
            ),
            Padding(
--- a/mobile/lib/modules/search/views/search_result_page.dart
+++ b/mobile/lib/modules/search/views/search_result_page.dart
@@ -2,7 +2,6 @@ import 'package:auto_route/auto_route.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
-import 'package:flutter_spinkit/flutter_spinkit.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:immich_mobile/modules/home/ui/asset_grid/immich_asset_grid.dart';
 import 'package:immich_mobile/modules/search/providers/search_page_state.provider.dart';
@@ -10,6 +9,7 @@ import 'package:immich_mobile/modules/search/providers/search_result_page.provid
 import 'package:immich_mobile/modules/search/ui/search_suggestion_list.dart';
 import 'package:immich_mobile/modules/settings/providers/app_settings.provider.dart';
 import 'package:immich_mobile/modules/settings/services/app_settings.service.dart';
+import 'package:immich_mobile/shared/ui/immich_loading_indicator.dart';

 class SearchResultPage extends HookConsumerWidget {
  const SearchResultPage({Key? key, required this.searchTerm})
@@ -122,11 +122,7 @@ class SearchResultPage extends HookConsumerWidget {
      }

      if (searchResultPageState.isLoading) {
-        return Center(
-          child: SpinKitDancingSquare(
-            color: Theme.of(context).primaryColor,
-          ),
-        );
+        return const Center(child: ImmichLoadingIndicator());
      }

      if (searchResultPageState.isSuccess) {
--- a/mobile/lib/shared/providers/release_info.provider.dart
+++ b/mobile/lib/shared/providers/release_info.provider.dart
@@ -1,7 +1,9 @@
-import 'package:dio/dio.dart';
+import 'dart:convert';
+
 import 'package:flutter/material.dart';
 import 'package:hive_flutter/hive_flutter.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:http/http.dart';
 import 'package:immich_mobile/constants/hive_box.dart';
 import 'package:immich_mobile/shared/views/version_announcement_overlay.dart';

@@ -9,21 +11,20 @@ class ReleaseInfoNotifier extends StateNotifier<String> {
  ReleaseInfoNotifier() : super("");

  void checkGithubReleaseInfo() async {
-    var dio = Dio();
+    final Client client = Client();
    var box = Hive.box(hiveGithubReleaseInfoBox);

    try {
      String? localReleaseVersion = box.get(githubReleaseInfoKey);
-
-      var res = await dio.get(
-        "https://api.github.com/repos/alextran1502/immich/releases/latest",
-        options: Options(
-          headers: {"Accept": "application/vnd.github.v3+json"},
-        ),
-      );
+      final res = await client.get(
+          Uri.parse(
+            "https://api.github.com/repos/alextran1502/immich/releases/latest",
+          ),
+          headers: {"Accept": "application/vnd.github.v3+json"});

      if (res.statusCode == 200) {
-        String latestTagVersion = res.data["tag_name"];
+        final data = jsonDecode(res.body);
+        String latestTagVersion = data["tag_name"];
        state = latestTagVersion;

        debugPrint("Local release version $localReleaseVersion");
--- a/mobile/lib/shared/services/network.service.dart
+++ b/mobile/lib/shared/services/network.service.dart
@@ -1,140 +0,0 @@
-import 'dart:async';
-import 'dart:convert';
-
-import 'package:dio/dio.dart';
-import 'package:flutter/cupertino.dart';
-import 'package:hive/hive.dart';
-import 'package:hooks_riverpod/hooks_riverpod.dart';
-import 'package:immich_mobile/constants/hive_box.dart';
-import 'package:immich_mobile/utils/dio_http_interceptor.dart';
-
-final networkServiceProvider = Provider((_) => NetworkService());
-
-class NetworkService {
-  late final Dio dio;
-
-  NetworkService() {
-    dio = Dio();
-    dio.interceptors.add(AuthenticatedRequestInterceptor());
-  }
-
-  Future<dynamic> deleteRequest({required String url, dynamic data}) async {
-    try {
-      var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
-      Response res = await dio.delete('$savedEndpoint/$url', data: data);
-
-      if (res.statusCode == 200) {
-        return res;
-      }
-    } on DioError catch (e) {
-      debugPrint("DioError: ${e.response}");
-    } catch (e) {
-      debugPrint("ERROR deleteRequest: ${e.toString()}");
-    }
-  }
-
-  Future<dynamic> getRequest({
-    required String url,
-    bool isByteResponse = false,
-    bool isStreamReponse = false,
-  }) async {
-    try {
-      var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
-
-      if (isByteResponse) {
-        Response<List<int>> res = await dio.get<List<int>>(
-          '$savedEndpoint/$url',
-          options: Options(responseType: ResponseType.bytes),
-        );
-
-        if (res.statusCode == 200) {
-          return res;
-        }
-      } else if (isStreamReponse) {
-        Response<ResponseBody> res = await dio.get<ResponseBody>(
-          '$savedEndpoint/$url',
-          options: Options(responseType: ResponseType.stream),
-        );
-
-        if (res.statusCode == 200) {
-          return res;
-        }
-      } else {
-        Response res = await dio.get('$savedEndpoint/$url');
-        if (res.statusCode == 200) {
-          return res;
-        }
-      }
-    } on DioError catch (e) {
-      debugPrint("DioError: ${e.response}");
-    } catch (e) {
-      debugPrint("ERROR getRequest: ${e.toString()}");
-    }
-  }
-
-  Future<dynamic> postRequest({required String url, dynamic data}) async {
-    try {
-      var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
-      var validUrl = Uri.parse('$savedEndpoint/$url').toString();
-      var res = await dio.post(validUrl, data: data);
-
-      return res;
-    } on DioError catch (e) {
-      debugPrint("[postRequest] DioError: ${e.response}");
-      return null;
-    } catch (e) {
-      debugPrint("ERROR PostRequest: $e");
-      return null;
-    }
-  }
-
-  Future<dynamic> putRequest({required String url, dynamic data}) async {
-    try {
-      var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
-      var validUrl = Uri.parse('$savedEndpoint/$url').toString();
-      var res = await dio.put(validUrl, data: data);
-
-      return res;
-    } on DioError catch (e) {
-      debugPrint("DioError: ${e.response}");
-      return null;
-    } catch (e) {
-      debugPrint("ERROR PutRequest: $e");
-      return null;
-    }
-  }
-
-  Future<dynamic> patchRequest({required String url, dynamic data}) async {
-    try {
-      var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
-      var validUrl = Uri.parse('$savedEndpoint/$url').toString();
-      var res = await dio.patch(validUrl, data: data);
-
-      return res;
-    } on DioError catch (e) {
-      debugPrint("DioError: ${e.response}");
-    } catch (e) {
-      debugPrint("ERROR PatchRequest: $e");
-    }
-  }
-
-  Future<bool> pingServer() async {
-    try {
-      var savedEndpoint = Hive.box(userInfoBox).get(serverEndpointKey);
-      var validUrl = Uri.parse('$savedEndpoint/server-info/ping').toString();
-
-      debugPrint("ping server at url $validUrl");
-
-      var res = await dio.get(validUrl);
-      var jsonRespsonse = jsonDecode(res.toString());
-
-      return jsonRespsonse["res"] == "pong";
-    } on DioError catch (e) {
-      debugPrint("[PING SERVER] DioError: ${e.response} - $e");
-      return false;
-    } catch (e) {
-      debugPrint("ERROR PingServer: $e");
-      return false;
-    }
-  }
-}
--- a/mobile/lib/shared/ui/immich_loading_indicator.dart
+++ b/mobile/lib/shared/ui/immich_loading_indicator.dart
@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:flutter_spinkit/flutter_spinkit.dart';

 class ImmichLoadingIndicator extends StatelessWidget {
  const ImmichLoadingIndicator({
@@ -15,10 +14,8 @@ class ImmichLoadingIndicator extends StatelessWidget {
        color: Theme.of(context).primaryColor.withAlpha(200),
        borderRadius: BorderRadius.circular(10),
      ),
-      child: const SpinKitDancingSquare(
-        color: Colors.white,
-        size: 30.0,
-      ),
+      padding: const EdgeInsets.all(15),
+      child: const CircularProgressIndicator(color: Colors.white),
    );
  }
 }
--- a/mobile/lib/utils/dio_http_interceptor.dart
+++ b/mobile/lib/utils/dio_http_interceptor.dart
@@ -1,16 +0,0 @@
-import 'package:dio/dio.dart';
-import 'package:hive_flutter/hive_flutter.dart';
-import 'package:immich_mobile/constants/hive_box.dart';
-
-class AuthenticatedRequestInterceptor extends Interceptor {
-  @override
-  void onRequest(RequestOptions options, RequestInterceptorHandler handler) {
-    // debugPrint('REQUEST[${options.method}] => PATH: ${options.path}');
-
-    var box = Hive.box(userInfoBox);
-
-    options.headers["Authorization"] = "Bearer ${box.get(accessTokenKey)}";
-    options.responseType = ResponseType.plain;
-    return super.onRequest(options, handler);
-  }
-}