High performance self-hosted photo and video management solution.
TypeScript backup-toolfluttergoogle-photosgoogle-photos-alternativejavascriptmobile-appnestjsnodejsphoto-galleryphotosphotos-managementself-hostedsveltesveltekittypescriptvideos
fix(mobile): show video controls when in locked view (#20707)
Brandon Wees0d9ebdc46a33
diff --git a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dartindex d7e83e72ec..a56c778e48 100644--- a/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/asset_viewer.page.dart@@ -25,7 +25,6 @@ import 'package:immich_mobile/providers/asset_viewer/video_player_value_providerimport 'package:immich_mobile/providers/cast.provider.dart';import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';import 'package:immich_mobile/providers/infrastructure/timeline.provider.dart';-import 'package:immich_mobile/providers/routes.provider.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';@@ -594,8 +593,6 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {});});- final isInLockedView = ref.watch(inLockedViewProvider);-// Currently it is not possible to scroll the asset when the bottom sheet is open all the way.// Issue: https://github.com/flutter/flutter/issues/109037// TODO: Add a custom scrum builder once the fix lands on stable@@ -623,11 +620,11 @@ class _AssetViewerState extends ConsumerState<AssetViewer> {),bottomNavigationBar: showingBottomSheet? const SizedBox.shrink()- : Column(+ : const Column(mainAxisSize: MainAxisSize.min,mainAxisAlignment: MainAxisAlignment.end,crossAxisAlignment: CrossAxisAlignment.stretch,- children: [const AssetStackRow(), if (!isInLockedView) const ViewerBottomBar()],+ children: [AssetStackRow(), ViewerBottomBar()],),),);diff --git a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dartindex 881ed4d150..b220d4e6a5 100644--- a/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart+++ b/mobile/lib/presentation/widgets/asset_viewer/bottom_bar.widget.dart@@ -10,6 +10,7 @@ import 'package:immich_mobile/presentation/widgets/action_buttons/share_action_bimport 'package:immich_mobile/presentation/widgets/action_buttons/upload_action_button.widget.dart';import 'package:immich_mobile/presentation/widgets/asset_viewer/asset_viewer.state.dart';import 'package:immich_mobile/providers/infrastructure/asset_viewer/current_asset.provider.dart';+import 'package:immich_mobile/providers/routes.provider.dart';import 'package:immich_mobile/providers/user.provider.dart';import 'package:immich_mobile/widgets/asset_viewer/video_controls.dart';@@ -28,6 +29,7 @@ class ViewerBottomBar extends ConsumerWidget {final isSheetOpen = ref.watch(assetViewerProvider.select((s) => s.showingBottomSheet));int opacity = ref.watch(assetViewerProvider.select((state) => state.backgroundOpacity));final showControls = ref.watch(assetViewerProvider.select((s) => s.showingControls));+ final isInLockedView = ref.watch(inLockedViewProvider);if (!showControls) {opacity = 0;@@ -66,7 +68,7 @@ class ViewerBottomBar extends ConsumerWidget {mainAxisAlignment: MainAxisAlignment.end,children: [if (asset.isVideo) const VideoControls(),- Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),+ if (!isInLockedView) Row(mainAxisAlignment: MainAxisAlignment.spaceEvenly, children: actions),],),),