refactor(mobile): build context extensions (#4923)

* refactor: move all extensions to separate package * refactor(mobile): add BuildContext extension * refactor(mobile): use theme getters from context * refactor(mobile): use media query size from context * refactor(mobile): use auto router methods from context * refactor(mobile): use navigator methods from context --------- Co-authored-by: shalong-tanwen <139912620+shalong-tanwen@users.noreply.github.com>
2023-11-09 16:19:53 +00:00
parent a147dee4b6
commit bffc2cdf60
106 changed files with 660 additions and 628 deletions
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/album/services/album.service.dart';
 import 'package:immich_mobile/modules/asset_viewer/models/image_viewer_page_state.model.dart';
 import 'package:immich_mobile/modules/asset_viewer/services/image_viewer.service.dart';
@@ -67,7 +68,7 @@ class ImageViewerStateNotifier extends StateNotifier<ImageViewerPageState> {
                gravity: ToastGravity.BOTTOM,
              );
            }
-            Navigator.of(buildContext).pop();
+            context.pop();
          },
        );
        return const ShareDialog();
@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/shared/models/asset.dart';

 class AdvancedBottomSheet extends HookConsumerWidget {
@@ -11,8 +12,6 @@ class AdvancedBottomSheet extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    var isDarkMode = Theme.of(context).brightness == Brightness.dark;
-
    return SingleChildScrollView(
      child: Card(
        shape: const RoundedRectangleBorder(
@@ -40,7 +39,9 @@ class AdvancedBottomSheet extends HookConsumerWidget {
                  const SizedBox(height: 32.0),
                  Container(
                    decoration: BoxDecoration(
-                      color: isDarkMode ? Colors.grey[900] : Colors.grey[200],
+                      color: context.isDarkTheme
+                          ? Colors.grey[900]
+                          : Colors.grey[200],
                      borderRadius: BorderRadius.circular(15.0),
                    ),
                    child: Padding(
@@ -70,7 +71,7 @@ class AdvancedBottomSheet extends HookConsumerWidget {
                              icon: Icon(
                                Icons.copy,
                                size: 16.0,
-                                color: Theme.of(context).primaryColor,
+                                color: context.primaryColor,
                              ),
                            ),
                          ),
@@ -2,6 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_hooks/flutter_hooks.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/asset_description.provider.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/user.provider.dart';
@@ -19,8 +20,7 @@ class DescriptionInput extends HookConsumerWidget {

  @override
  Widget build(BuildContext context, WidgetRef ref) {
-    final isDarkTheme = Theme.of(context).brightness == Brightness.dark;
-    final textColor = isDarkTheme ? Colors.white : Colors.black;
+    final textColor = context.isDarkTheme ? Colors.white : Colors.black;
    final controller = useTextEditingController();
    final focusNode = useFocusNode();
    final isFocus = useState(false);
@@ -4,6 +4,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_map/flutter_map.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:timezone/timezone.dart';
 import 'package:immich_mobile/modules/asset_viewer/ui/description_input.dart';
 import 'package:immich_mobile/modules/map/ui/map_thumbnail.dart';
@@ -28,7 +29,7 @@ class ExifBottomSheet extends HookConsumerWidget {
      exifInfo.longitude != 0;

  String formatTimeZone(Duration d) =>
-      "GMT${d.isNegative ? '-': '+'}${d.inHours.abs().toString().padLeft(2, '0')}:${d.inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";
+      "GMT${d.isNegative ? '-' : '+'}${d.inHours.abs().toString().padLeft(2, '0')}:${d.inMinutes.abs().remainder(60).toString().padLeft(2, '0')}";

  String get formattedDateTime {
    DateTime dt = asset.fileCreatedAt.toLocal();
@@ -41,10 +42,16 @@ class ExifBottomSheet extends HookConsumerWidget {
          final location = getLocation(asset.exifInfo!.timeZone!);
          dt = TZDateTime.from(dt, location);
        } on LocationNotFoundException {
-          RegExp re = RegExp(r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$', caseSensitive: false);
+          RegExp re = RegExp(
+            r'^utc(?:([+-]\d{1,2})(?::(\d{2}))?)?$',
+            caseSensitive: false,
+          );
          final m = re.firstMatch(asset.exifInfo!.timeZone!);
          if (m != null) {
-            final duration = Duration(hours: int.parse(m.group(1) ?? '0'), minutes: int.parse(m.group(2) ?? '0'));
+            final duration = Duration(
+              hours: int.parse(m.group(1) ?? '0'),
+              minutes: int.parse(m.group(2) ?? '0'),
+            );
            dt = dt.add(duration);
            timeZone = formatTimeZone(duration);
          }
@@ -105,8 +112,7 @@ class ExifBottomSheet extends HookConsumerWidget {
  Widget build(BuildContext context, WidgetRef ref) {
    final assetWithExif = ref.watch(assetDetailProvider(asset));
    final exifInfo = (assetWithExif.value ?? asset).exifInfo;
-    var isDarkTheme = Theme.of(context).brightness == Brightness.dark;
-    var textColor = isDarkTheme ? Colors.white : Colors.black;
+    var textColor = context.isDarkTheme ? Colors.white : Colors.black;

    buildMap() {
      return Padding(
@@ -322,9 +328,14 @@ class ExifBottomSheet extends HookConsumerWidget {
                  fontWeight: FontWeight.bold,
                ),
              ),
-              subtitle: exifInfo.f != null || exifInfo.exposureSeconds != null || exifInfo.mm != null || exifInfo.iso != null ? Text(
-                "ƒ/${exifInfo.fNumber}   ${exifInfo.exposureTime}   ${exifInfo.focalLength} mm   ISO ${exifInfo.iso ?? ''} ",
-              ) : null,
+              subtitle: exifInfo.f != null ||
+                      exifInfo.exposureSeconds != null ||
+                      exifInfo.mm != null ||
+                      exifInfo.iso != null
+                  ? Text(
+                      "ƒ/${exifInfo.fNumber}   ${exifInfo.exposureTime}   ${exifInfo.focalLength} mm   ISO ${exifInfo.iso ?? ''} ",
+                    )
+                  : null,
            ),
        ],
      );
@@ -393,7 +404,7 @@ class ExifBottomSheet extends HookConsumerWidget {
                      data: (data) => DescriptionInput(asset: data),
                      error: (error, stackTrace) => Icon(
                        Icons.image_not_supported_outlined,
-                        color: Theme.of(context).primaryColor,
+                        color: context.primaryColor,
                      ),
                      loading: () => const SizedBox(
                        width: 75,
@@ -1,6 +1,6 @@
-import 'package:auto_route/auto_route.dart';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/activities/providers/activity.provider.dart';
 import 'package:immich_mobile/shared/models/asset.dart';
 import 'package:immich_mobile/shared/providers/asset.provider.dart';
@@ -147,7 +147,7 @@ class TopControlAppBar extends HookConsumerWidget {
    Widget buildBackButton() {
      return IconButton(
        onPressed: () {
-          AutoRouter.of(context).pop();
+          context.autoPop();
        },
        icon: Icon(
          Icons.arrow_back_ios_new_rounded,
@@ -8,6 +8,7 @@ import 'package:flutter/services.dart';
 import 'package:flutter_hooks/flutter_hooks.dart' hide Store;
 import 'package:fluttertoast/fluttertoast.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/asset_stack.provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/show_controls.provider.dart';
 import 'package:immich_mobile/modules/asset_viewer/providers/video_player_controls_provider.dart';
@@ -209,7 +210,7 @@ class GalleryViewerPage extends HookConsumerWidget {
        if (isDeleted && isParent) {
          if (totalAssets == 1) {
            // Handle only one asset
-            AutoRouter.of(context).pop();
+            context.autoPop();
          } else {
            // Go to next page otherwise
            controller.nextPage(
@@ -293,7 +294,7 @@ class GalleryViewerPage extends HookConsumerWidget {

      final ratio = d.dy / max(d.dx.abs(), 1);
      if (d.dy > sensitivity && ratio > ratioThreshold) {
-        AutoRouter.of(context).pop();
+        context.autoPop();
      } else if (d.dy < -sensitivity && ratio < -ratioThreshold) {
        showInfo();
      }
@@ -308,7 +309,7 @@ class GalleryViewerPage extends HookConsumerWidget {
          .watch(assetProvider.notifier)
          .toggleArchive([asset], !asset.isArchived);
      if (isParent) {
-        AutoRouter.of(context).pop();
+        context.autoPop();
        return;
      }
      removeAssetFromStack();
@@ -331,7 +332,7 @@ class GalleryViewerPage extends HookConsumerWidget {

    handleActivities() {
      if (sharedAlbumId != null) {
-        AutoRouter.of(context).push(
+        context.autoPush(
          ActivitiesRoute(
            albumId: sharedAlbumId!,
            assetId: asset().remoteId,
@@ -514,7 +515,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                              stackElements.elementAt(stackIndex.value),
                            );
                        Navigator.pop(ctx);
-                        AutoRouter.of(context).pop();
+                        context.autoPop();
                      },
                      title: const Text(
                        "viewer_stack_use_as_main_asset",
@@ -541,7 +542,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                          childrenToRemove: [currentAsset],
                        );
                        Navigator.pop(ctx);
-                        AutoRouter.of(context).pop();
+                        context.autoPop();
                      } else {
                        await ref.read(assetStackServiceProvider).updateStack(
                          currentAsset,
@@ -569,7 +570,7 @@ class GalleryViewerPage extends HookConsumerWidget {
                            childrenToRemove: stack,
                          );
                      Navigator.pop(ctx);
-                      AutoRouter.of(context).pop();
+                      context.autoPop();
                    },
                    title: const Text(
                      "viewer_unstack",
@@ -829,8 +830,8 @@ class GalleryViewerPage extends HookConsumerWidget {
                      placeholder: Image(
                        image: provider,
                        fit: BoxFit.fitWidth,
-                        height: MediaQuery.of(context).size.height,
-                        width: MediaQuery.of(context).size.width,
+                        height: context.height,
+                        width: context.width,
                        alignment: Alignment.center,
                      ),
                      onVideoEnded: () {
@@ -3,6 +3,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:hooks_riverpod/hooks_riverpod.dart';
 import 'package:chewie/chewie.dart';
+import 'package:immich_mobile/extensions/build_context_extensions.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/video_player_controls.dart';
@@ -44,7 +45,7 @@ class VideoViewerPage extends HookConsumerWidget {
        ),
        error: (error, stackTrace) => Icon(
          Icons.image_not_supported_outlined,
-          color: Theme.of(context).primaryColor,
+          color: context.primaryColor,
        ),
        loading: () => const Center(
          child: SizedBox(
@@ -74,8 +75,8 @@ class VideoViewerPage extends HookConsumerWidget {
        ),
        if (downloadAssetStatus == DownloadAssetStatus.loading)
          SizedBox(
-            height: MediaQuery.of(context).size.height,
-            width: MediaQuery.of(context).size.width,
+            height: context.height,
+            width: context.width,
            child: const Center(
              child: ImmichLoadingIndicator(),
            ),
@@ -205,8 +206,8 @@ class _VideoPlayerState extends State<VideoPlayer> {
      );
    } else {
      return SizedBox(
-        height: MediaQuery.of(context).size.height,
-        width: MediaQuery.of(context).size.width,
+        height: context.height,
+        width: context.width,
        child: Center(
          child: Stack(
            children: [