From 2508e59a270f1bfd24b35e7b98b77ec404256911 Mon Sep 17 00:00:00 2001 From: tibbi Date: Thu, 22 Sep 2022 22:44:46 +0200 Subject: [PATCH] reset some values at touch events --- .../com/simplemobiletools/launcher/activities/MainActivity.kt | 2 ++ .../com/simplemobiletools/launcher/fragments/AllAppsFragment.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt index efc0a0e..e1fd63a 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/activities/MainActivity.kt @@ -201,6 +201,7 @@ class MainActivity : SimpleActivity(), FlingListener { } fun startHandlingTouches(touchDownY: Int) { + mLongPressedIcon = null mTouchDownY = touchDownY mCurrentFragmentY = all_apps_fragment.y.toInt() mIgnoreUpEvent = false @@ -294,6 +295,7 @@ class MainActivity : SimpleActivity(), FlingListener { } setOnDismissListener { + mOpenPopupMenu = null (all_apps_fragment as AllAppsFragment).ignoreTouches = false } diff --git a/app/src/main/kotlin/com/simplemobiletools/launcher/fragments/AllAppsFragment.kt b/app/src/main/kotlin/com/simplemobiletools/launcher/fragments/AllAppsFragment.kt index e41d2cf..5e64a8e 100644 --- a/app/src/main/kotlin/com/simplemobiletools/launcher/fragments/AllAppsFragment.kt +++ b/app/src/main/kotlin/com/simplemobiletools/launcher/fragments/AllAppsFragment.kt @@ -56,6 +56,8 @@ class AllAppsFragment(context: Context, attributeSet: AttributeSet) : MyFragment } var shouldIntercept = false + + // pull the whole fragment down if it is scrolled way to the top and the users pulls it even further if (touchDownY != -1) { shouldIntercept = touchDownY - event.y < 0 && all_apps_grid.computeVerticalScrollOffset() == 0 if (shouldIntercept) {