Skip to content

chore(mobile): simplify pop logic #26410

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

Open
uhthomas wants to merge 1 commit into
base: main
Choose a base branch
from
+3 −7
Open

chore(mobile): simplify pop logic #26410

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 3 additions & 7 deletions mobile/lib/presentation/widgets/asset_viewer/asset_page.widget.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,6 @@ class _AssetPageState extends ConsumerState<AssetPage> {
DragStartDetails? _dragStart;
_DragIntent _dragIntent = _DragIntent.none;
Drag? _drag;
bool _shouldPopOnDrag = false;

@override
void initState() {
Expand Down Expand Up @@ -115,7 +114,6 @@ class _AssetPageState extends ConsumerState<AssetPage> {

void _beginDrag(DragStartDetails details) {
_dragStart = details;
_shouldPopOnDrag = false;
_lastScrollOffset = _proxyScrollController.hasClients ? _proxyScrollController.offset : 0.0;

if (_viewController != null) {
Expand Down Expand Up @@ -158,6 +156,7 @@ class _AssetPageState extends ConsumerState<AssetPage> {
void _endDrag(DragEndDetails details) {
if (_dragStart == null) return;

final start = _dragStart;
_dragStart = null;

final intent = _dragIntent;
Expand All @@ -173,7 +172,8 @@ class _AssetPageState extends ConsumerState<AssetPage> {
_drag?.end(details);
_drag = null;
case _DragIntent.dismiss:
if (_shouldPopOnDrag) {
const popThreshold = 75.0;
if (details.localPosition.dy - start!.localPosition.dy > popThreshold) {
context.maybePop();
return;
}
Expand Down Expand Up @@ -206,12 +206,8 @@ class _AssetPageState extends ConsumerState<AssetPage> {

void _handleDragDown(BuildContext context, Offset delta) {
const dragRatio = 0.2;
const popThreshold = 75.0;

_shouldPopOnDrag = delta.dy > popThreshold;

final distance = delta.dy.abs();

final maxScaleDistance = context.height * 0.5;
final scaleReduction = (distance / maxScaleDistance).clamp(0.0, dragRatio);
final initialScale = _viewController?.initialScale ?? _initialPhotoViewState.scale;
Expand Down
Loading