Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(mobile): scroll thumb is hidden behind the tab navigation bar #12512

Merged
merged 3 commits into from
Sep 9, 2024
Merged

fix(mobile): scroll thumb is hidden behind the tab navigation bar #12512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2daf5e1
fix(mobile): scroll thumb is hidden behind the tab navigation bar
alextran1502 Sep 9, 2024
6427763
better variable names
alextran1502 Sep 9, 2024
3fd6509
fix rounding error
alextran1502 Sep 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions mobile/lib/widgets/asset_grid/draggable_scrollbar_custom.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,6 @@ class DraggableScrollbar extends StatefulWidget {

final Function(bool scrolling) scrollStateListener;

final double viewPortHeight;

DraggableScrollbar.semicircle({
super.key,
Key? scrollThumbKey,
Expand All @@ -69,7 +67,6 @@ class DraggableScrollbar extends StatefulWidget {
required this.controller,
required this.itemPositionsListener,
required this.scrollStateListener,
required this.viewPortHeight,
this.heightScrollThumb = 48.0,
this.backgroundColor = Colors.white,
this.padding,
Expand Down Expand Up @@ -254,7 +251,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
}

double get barMaxScrollExtent =>
widget.viewPortHeight -
(context.size?.height ?? 0) -
widget.heightScrollThumb -
(widget.heightOffset ?? 0);

Expand Down Expand Up @@ -340,8 +337,8 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
_thumbAnimationController.forward();
}

if (itemPos < maxItemCount) {
_currentItem = itemPos;
if (itemPosition < maxItemCount) {
_currentItem = itemPosition;
}

_fadeoutTimer?.cancel();
Expand All @@ -365,25 +362,35 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
widget.scrollStateListener(true);
}

int get itemPos {
int get itemPosition {
int numberOfItems = widget.child.itemCount;
return ((_barOffset / barMaxScrollExtent) * numberOfItems).toInt();
}

void _jumpToBarPos() {
if (itemPos > maxItemCount - 1) {
void _jumpToBarPosition() {
if (itemPosition > maxItemCount - 1) {
return;
}

_currentItem = itemPos;
_currentItem = itemPosition;

/// If the bar is at the bottom but the item position is still smaller than the max item count (due to rounding error)
/// jump to the end of the list
if (barMaxScrollExtent - _barOffset < 10 && itemPosition < maxItemCount) {
widget.controller.jumpTo(
index: maxItemCount,
);

return;
}

widget.controller.jumpTo(
index: itemPos,
index: itemPosition,
);
}

Timer? dragHaltTimer;
int lastTimerPos = 0;
int lastTimerPosition = 0;

void _onVerticalDragUpdate(DragUpdateDetails details) {
setState(() {
Expand All @@ -400,8 +407,8 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
_barOffset = barMaxScrollExtent;
}

if (itemPos != lastTimerPos) {
lastTimerPos = itemPos;
if (itemPosition != lastTimerPosition) {
lastTimerPosition = itemPosition;
dragHaltTimer?.cancel();
widget.scrollStateListener(true);

Expand All @@ -413,7 +420,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
);
}

_jumpToBarPos();
_jumpToBarPosition();
}
});
}
Expand All @@ -426,7 +433,7 @@ class DraggableScrollbarState extends State<DraggableScrollbar>
});

setState(() {
_jumpToBarPos();
_jumpToBarPosition();
_isDragInProcess = false;
});

Expand Down
1 change: 0 additions & 1 deletion mobile/lib/widgets/asset_grid/immich_asset_grid_view.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,6 @@ class ImmichAssetGridViewState extends ConsumerState<ImmichAssetGridView> {

final child = (useDragScrolling && ModalRoute.of(context) != null)
? DraggableScrollbar.semicircle(
viewPortHeight: context.height,
scrollStateListener: dragScrolling,
itemPositionsListener: _itemPositionsListener,
controller: _itemScrollController,
Expand Down
Loading