Skip to content

High performance self-hosted photo and video management solution.

feat(mobile): Modified draggable area of detail modal (#14953)

Yaros2255f3e966d1
diff --git a/mobile/lib/pages/common/gallery_viewer.page.dart b/mobile/lib/pages/common/gallery_viewer.page.dart
index 5f77f28d8e..43ff43e573 100644
--- a/mobile/lib/pages/common/gallery_viewer.page.dart
+++ b/mobile/lib/pages/common/gallery_viewer.page.dart
@@ -127,18 +127,29 @@ class GalleryViewerPage extends HookConsumerWidget {
context: context,
useSafeArea: true,
builder: (context) {
- return FractionallySizedBox(
- heightFactor: 0.75,
- child: Padding(
- padding: EdgeInsets.only(
- bottom: context.viewInsets.bottom,
- ),
- child: ref
- .watch(appSettingsServiceProvider)
- .getSetting<bool>(AppSettingsEnum.advancedTroubleshooting)
- ? AdvancedBottomSheet(assetDetail: asset)
- : DetailPanel(asset: asset),
- ),
+ return DraggableScrollableSheet(
+ minChildSize: 0.5,
+ maxChildSize: 1,
+ initialChildSize: 0.75,
+ expand: false,
+ builder: (context, scrollController) {
+ return Padding(
+ padding: EdgeInsets.only(
+ bottom: context.viewInsets.bottom,
+ ),
+ child: ref.watch(appSettingsServiceProvider).getSetting<bool>(
+ AppSettingsEnum.advancedTroubleshooting,
+ )
+ ? AdvancedBottomSheet(
+ assetDetail: asset,
+ scrollController: scrollController,
+ )
+ : DetailPanel(
+ asset: asset,
+ scrollController: scrollController,
+ ),
+ );
+ },
);
},
);
diff --git a/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart b/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
index 367519fead..1e6aba2bda 100644
--- a/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
+++ b/mobile/lib/widgets/asset_viewer/advanced_bottom_sheet.dart
@@ -6,12 +6,18 @@ import 'package:immich_mobile/entities/asset.entity.dart';
class AdvancedBottomSheet extends HookConsumerWidget {
final Asset assetDetail;
+ final ScrollController? scrollController;
- const AdvancedBottomSheet({super.key, required this.assetDetail});
+ const AdvancedBottomSheet({
+ super.key,
+ required this.assetDetail,
+ this.scrollController,
+ });
@override
Widget build(BuildContext context, WidgetRef ref) {
return SingleChildScrollView(
+ controller: scrollController,
child: Container(
margin: const EdgeInsets.symmetric(horizontal: 8.0),
child: LayoutBuilder(
diff --git a/mobile/lib/widgets/asset_viewer/detail_panel/detail_panel.dart b/mobile/lib/widgets/asset_viewer/detail_panel/detail_panel.dart
index db9dafebcb..8ad2cdc687 100644
--- a/mobile/lib/widgets/asset_viewer/detail_panel/detail_panel.dart
+++ b/mobile/lib/widgets/asset_viewer/detail_panel/detail_panel.dart
@@ -9,12 +9,14 @@ import 'package:immich_mobile/entities/asset.entity.dart';
class DetailPanel extends HookConsumerWidget {
final Asset asset;
+ final ScrollController? scrollController;
- const DetailPanel({super.key, required this.asset});
+ const DetailPanel({super.key, required this.asset, this.scrollController});
@override
Widget build(BuildContext context, WidgetRef ref) {
return ListView(
+ controller: scrollController,
shrinkWrap: true,
children: [
Padding(