Skip to content

High performance self-hosted photo and video management solution.

feat: tap to see next/previous image (#20286)

Alex Balgavy8ba20cbd44e3
diff --git a/i18n/en.json b/i18n/en.json
index 95e9584032..440f9beb64 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2026,6 +2026,9 @@
"set_profile_picture": "Set profile picture",
"set_slideshow_to_fullscreen": "Set Slideshow to fullscreen",
"set_stack_primary_asset": "Set as primary asset",
+ "setting_image_navigation_enable_subtitle": "If enabled, you can navigate to the previous/next image by tapping the leftmost/rightmost quarter of the screen.",
+ "setting_image_navigation_enable_title": "Tap to Navigate",
+ "setting_image_navigation_title": "Image Navigation",
"setting_image_viewer_help": "The detail viewer loads the small thumbnail first, then loads the medium-size preview (if enabled), finally loads the original (if enabled).",
"setting_image_viewer_original_subtitle": "Enable to load the original full-resolution image (large!). Disable to reduce data usage (both network and on device cache).",
"setting_image_viewer_original_title": "Load original image",
diff --git a/mobile/lib/domain/models/store.model.dart b/mobile/lib/domain/models/store.model.dart
index f6bed7cf61..00545aa01a 100644
--- a/mobile/lib/domain/models/store.model.dart
+++ b/mobile/lib/domain/models/store.model.dart
@@ -73,6 +73,9 @@ enum StoreKey<T> {
autoPlayVideo<bool>._(139),
albumGridView<bool>._(140),
+ // Image viewer navigation settings
+ tapToNavigate<bool>._(141),
+
// Experimental stuff
photoManagerCustomFilter<bool>._(1000),
betaPromptShown<bool>._(1001),
diff --git a/mobile/lib/pages/common/gallery_viewer.page.dart b/mobile/lib/pages/common/gallery_viewer.page.dart
index 9a7e78ddb8..0ef27f854b 100644
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -221,8 +221,37 @@ class GalleryViewerPage extends HookConsumerWidget {
onDragUpdate: (_, details, __) {
handleSwipeUpDown(details);
},
- onTapDown: (_, __, ___) {
- ref.read(showControlsProvider.notifier).toggle();
+ onTapDown: (ctx, tapDownDetails, _) {
+ final tapToNavigate = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.tapToNavigate);
+ if (!tapToNavigate) {
+ ref.read(showControlsProvider.notifier).toggle();
+ return;
+ }
+
+ double tapX = tapDownDetails.globalPosition.dx;
+ double screenWidth = ctx.width;
+
+ // We want to change images if the user taps in the leftmost or
+ // rightmost quarter of the screen
+ bool tappedLeftSide = tapX < screenWidth / 4;
+ bool tappedRightSide = tapX > screenWidth * (3 / 4);
+
+ int? currentPage = controller.page?.toInt();
+ int maxPage = renderList.totalAssets - 1;
+
+ if (tappedLeftSide && currentPage != null) {
+ // Nested if because we don't want to fallback to show/hide controls
+ if (currentPage != 0) {
+ controller.jumpToPage(currentPage - 1);
+ }
+ } else if (tappedRightSide && currentPage != null) {
+ // Nested if because we don't want to fallback to show/hide controls
+ if (currentPage != maxPage) {
+ controller.jumpToPage(currentPage + 1);
+ }
+ } else {
+ ref.read(showControlsProvider.notifier).toggle();
+ }
},
onLongPressStart: asset.isMotionPhoto
? (_, __, ___) {
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart
index a294adb669..ba52b67dfd 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart
@@ -16,8 +16,10 @@ import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.sta
import 'package:immich_mobile/presentation/widgets/asset_viewer/video_viewer.widget.dart';
import 'package:immich_mobile/presentation/widgets/images/image_provider.dart';
import 'package:immich_mobile/presentation/widgets/images/thumbnail.widget.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
import 'package:immich_mobile/providers/asset_viewer/is_motion_video_playing.provider.dart';
import 'package:immich_mobile/providers/asset_viewer/video_player_controls_provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
import 'package:immich_mobile/providers/infrastructure/asset.provider.dart';
import 'package:immich_mobile/providers/infrastructure/asset_viewer/asset.provider.dart';
import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';
@@ -29,8 +31,9 @@ enum _DragIntent { none, scroll, dismiss }
class AssetPage extends ConsumerStatefulWidget {
final int index;
final int heroOffset;
+ final void Function(int direction)? onTapNavigate;
- const AssetPage({super.key, required this.index, required this.heroOffset});
+ const AssetPage({super.key, required this.index, required this.heroOffset, this.onTapNavigate});
@override
ConsumerState createState() => _AssetPageState();
@@ -224,7 +227,28 @@ class _AssetPageState extends ConsumerState<AssetPage> {
}
void _onTapUp(BuildContext context, TapUpDetails details, PhotoViewControllerValue controllerValue) {
- if (!_showingDetails && _dragStart == null) _viewer.toggleControls();
+ if (_showingDetails || _dragStart != null) return;
+
+ final tapToNavigate = ref.read(appSettingsServiceProvider).getSetting<bool>(AppSettingsEnum.tapToNavigate);
+ if (!tapToNavigate) {
+ _viewer.toggleControls();
+ return;
+ }
+
+ final tapX = details.globalPosition.dx;
+ final screenWidth = context.width;
+
+ // Navigate if the user taps in the leftmost or rightmost quarter of the screen
+ final tappedLeftSide = tapX < screenWidth / 4;
+ final tappedRightSide = tapX > screenWidth * (3 / 4);
+
+ if (tappedLeftSide) {
+ widget.onTapNavigate?.call(-1);
+ } else if (tappedRightSide) {
+ widget.onTapNavigate?.call(1);
+ } else {
+ _viewer.toggleControls();
+ }
}
void _onLongPress(BuildContext context, LongPressStartDetails details, PhotoViewControllerValue controllerValue) =>
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
index 515f635493..3ed5fb2034 100644
--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart
@@ -96,6 +96,16 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
bool _assetReloadRequested = false;
+ void _onTapNavigate(int direction) {
+ final page = _pageController.page?.toInt();
+ if (page == null) return;
+ final target = page + direction;
+ final maxPage = ref.read(timelineServiceProvider).totalAssets - 1;
+ if (target >= 0 && target <= maxPage) {
+ _pageController.jumpToPage(target);
+ }
+ }
+
@override
void initState() {
super.initState();
@@ -270,7 +280,8 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {
: const FastClampingScrollPhysics(),
itemCount: ref.read(timelineServiceProvider).totalAssets,
onPageChanged: (index) => _onAssetChanged(index),
- itemBuilder: (context, index) => AssetPage(index: index, heroOffset: _heroOffset),
+ itemBuilder: (context, index) =>
+ AssetPage(index: index, heroOffset: _heroOffset, onTapNavigate: _onTapNavigate),
),
),
if (!CurrentPlatform.isIOS)
diff --git a/mobile/lib/services/app_settings.service.dart b/mobile/lib/services/app_settings.service.dart
index 4e740ebfe5..db4fc9965a 100644
--- a/mobile/lib/services/app_settings.service.dart
+++ b/mobile/lib/services/app_settings.service.dart
@@ -35,6 +35,7 @@ enum AppSettingsEnum<T> {
loopVideo<bool>(StoreKey.loopVideo, "loopVideo", true),
loadOriginalVideo<bool>(StoreKey.loadOriginalVideo, "loadOriginalVideo", false),
autoPlayVideo<bool>(StoreKey.autoPlayVideo, "autoPlayVideo", true),
+ tapToNavigate<bool>(StoreKey.tapToNavigate, "tapToNavigate", false),
mapThemeMode<int>(StoreKey.mapThemeMode, null, 0),
mapShowFavoriteOnly<bool>(StoreKey.mapShowFavoriteOnly, null, false),
mapIncludeArchived<bool>(StoreKey.mapIncludeArchived, null, false),
diff --git a/mobile/lib/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart b/mobile/lib/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart
index 5dea38d85e..1555790ff9 100644
--- a/mobile/lib/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart
+++ b/mobile/lib/widgets/settings/asset_viewer_settings/asset_viewer_settings.dart
@@ -1,5 +1,6 @@
import 'package:flutter/material.dart';
import 'package:immich_mobile/widgets/settings/asset_viewer_settings/image_viewer_quality_setting.dart';
+import 'package:immich_mobile/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart';
import 'package:immich_mobile/widgets/settings/settings_sub_page_scaffold.dart';
import 'video_viewer_settings.dart';
@@ -8,7 +9,11 @@ class AssetViewerSettings extends StatelessWidget {
@override
Widget build(BuildContext context) {
- final assetViewerSetting = [const ImageViewerQualitySetting(), const VideoViewerSettings()];
+ final assetViewerSetting = [
+ const ImageViewerQualitySetting(),
+ const ImageViewerTapToNavigateSetting(),
+ const VideoViewerSettings(),
+ ];
return SettingsSubPageScaffold(settings: assetViewerSetting, showDivider: true);
}
diff --git a/mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart b/mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart
new file mode 100644
index 0000000000..759162cab8
--- /dev/null
+++ b/mobile/lib/widgets/settings/asset_viewer_settings/image_viewer_tap_to_navigate_setting.dart
@@ -0,0 +1,30 @@
+import 'package:easy_localization/easy_localization.dart';
+import 'package:flutter/material.dart';
+import 'package:hooks_riverpod/hooks_riverpod.dart';
+import 'package:immich_mobile/providers/app_settings.provider.dart';
+import 'package:immich_mobile/services/app_settings.service.dart';
+import 'package:immich_mobile/widgets/settings/settings_sub_title.dart';
+import 'package:immich_mobile/widgets/settings/settings_switch_list_tile.dart';
+import 'package:immich_mobile/utils/hooks/app_settings_update_hook.dart';
+
+class ImageViewerTapToNavigateSetting extends HookConsumerWidget {
+ const ImageViewerTapToNavigateSetting({super.key});
+
+ @override
+ Widget build(BuildContext context, WidgetRef ref) {
+ final tapToNavigate = useAppSettingsState(AppSettingsEnum.tapToNavigate);
+
+ return Column(
+ crossAxisAlignment: CrossAxisAlignment.start,
+ children: [
+ SettingsSubTitle(title: "setting_image_navigation_title".tr()),
+ SettingsSwitchListTile(
+ valueNotifier: tapToNavigate,
+ title: "setting_image_navigation_enable_title".tr(),
+ subtitle: "setting_image_navigation_enable_subtitle".tr(),
+ onChanged: (_) => ref.invalidate(appSettingsServiceProvider),
+ ),
+ ],
+ );
+ }
+}
diff --git a/mobile/packages/ui/showcase/pubspec.lock b/mobile/packages/ui/showcase/pubspec.lock
index 4d8ec62b90..b0725051d3 100644
--- a/mobile/packages/ui/showcase/pubspec.lock
+++ b/mobile/packages/ui/showcase/pubspec.lock
@@ -227,10 +227,10 @@ packages:
dependency: transitive
description:
name: meta
- sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+ sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
url: "https://pub.dev"
source: hosted
- version: "1.16.0"
+ version: "1.17.0"
path:
dependency: transitive
description:
@@ -328,10 +328,10 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+ sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
url: "https://pub.dev"
source: hosted
- version: "0.7.6"
+ version: "0.7.7"
typed_data:
dependency: transitive
description:
diff --git a/mobile/pubspec.lock b/mobile/pubspec.lock
index 28adfc2ab7..077544b4f7 100644
--- a/mobile/pubspec.lock
+++ b/mobile/pubspec.lock
@@ -1217,10 +1217,10 @@ packages:
dependency: transitive
description:
name: meta
- sha256: e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c
+ sha256: "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394"
url: "https://pub.dev"
source: hosted
- version: "1.16.0"
+ version: "1.17.0"
mime:
dependency: transitive
description:
@@ -1910,10 +1910,10 @@ packages:
dependency: transitive
description:
name: test_api
- sha256: "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00"
+ sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55
url: "https://pub.dev"
source: hosted
- version: "0.7.6"
+ version: "0.7.7"
thumbhash:
dependency: "direct main"
description: