Fix PR #64 by making more open only on swipe down after certain thres…

…hold
Ivy-Apps · Nov 8, 2021 · 0f4de73 · 0f4de73
1 parent 90800bb
commit 0f4de73
Showing 1 changed file with 13 additions and 14 deletions.
diff --git a/app/src/main/java/com/ivy/wallet/ui/home/HomeTab.kt b/app/src/main/java/com/ivy/wallet/ui/home/HomeTab.kt
@@ -2,19 +2,16 @@ package com.ivy.wallet.ui.home
 
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.foundation.gestures.detectDragGestures
+import androidx.compose.foundation.gestures.detectVerticalDragGestures
 import androidx.compose.foundation.layout.*
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.*
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.geometry.Offset
-import androidx.compose.ui.input.pointer.PointerInputChange
 import androidx.compose.ui.input.pointer.pointerInput
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.IntOffset
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.google.accompanist.insets.navigationBarsPadding
@@ -34,7 +31,8 @@ import com.ivy.wallet.ui.theme.Theme
 import com.ivy.wallet.ui.theme.modal.*
 import com.ivy.wallet.ui.theme.transaction.TransactionsDividerLine
 import com.ivy.wallet.ui.theme.transaction.transactions
-import kotlin.math.roundToInt
+
+private const val SWIPE_DOWN_THRESHOLD_OPEN_MORE_MENU = 200
 
 @ExperimentalAnimationApi
 @ExperimentalFoundationApi
@@ -166,25 +164,26 @@ private fun BoxWithConstraintsScope.UI(
         mutableStateOf(null)
     }
     var expanded by remember { mutableStateOf(false) }
-    val offset by remember { mutableStateOf(Offset.Zero) }
+
+    var headerSwipeOffset by remember { mutableStateOf(0f) }
 
     Column(
         modifier = Modifier
             .fillMaxSize()
             .statusBarsPadding()
-            .offset {
-                IntOffset(offset.x.roundToInt(), offset.y.roundToInt())
-            }
             .navigationBarsPadding()
             .pointerInput(Unit) {
-                detectDragGestures(
-                    onDragStart = { },
+                detectVerticalDragGestures(
                     onDragEnd = {
-                        expanded = true
+                        headerSwipeOffset = 0f
                     },
-                    onDragCancel = { },
-                    onDrag = { _: PointerInputChange, _: Offset ->
+                    onVerticalDrag = { _, dragAmount ->
+                        //dragAmount: positive when scrolling down; negative when scrolling up
+                        headerSwipeOffset += dragAmount
 
+                        if (headerSwipeOffset > SWIPE_DOWN_THRESHOLD_OPEN_MORE_MENU) {
+                            expanded = true
+                        }
                     }
                 )
             }