0.6.7

fixed locked swipe
shadowalker77 · Oct 8, 2023 · 5fd0df5 · 5fd0df5
1 parent 076ec3a
commit 5fd0df5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/app/src/main/java/com/alirezabdn/whygoogle/SecondFragment.kt b/app/src/main/java/com/alirezabdn/whygoogle/SecondFragment.kt
@@ -20,7 +20,7 @@ class SecondFragment : WhyGoogleFragment<MainFragmentBinding>() {
         }
     }
 
-    override var preventFromPop: Boolean = true
+    override var lockedSwipe: Boolean = true
 
     override val bindingInflater: (LayoutInflater, ViewGroup?, Boolean) -> MainFragmentBinding
         get() = MainFragmentBinding::inflate

diff --git a/whygoogle/build.gradle b/whygoogle/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 17
         targetSdkVersion 30
         versionCode 1
-        versionName "0.6.6"
+        versionName "0.6.7"
     }
     buildFeatures {
         viewBinding true

diff --git a/whygoogle/src/main/java/ir/ayantech/whygoogle/activity/SwipableWhyGoogleActivity.kt b/whygoogle/src/main/java/ir/ayantech/whygoogle/activity/SwipableWhyGoogleActivity.kt
@@ -263,7 +263,6 @@ abstract class SwipableWhyGoogleActivity<T : ViewBinding> : AppCompatActivity(),
     }
 
     override fun onTopFragmentChanged(whyGoogleFragment: WhyGoogleFragment<*>) {
-        fragmentHost.isUserInputEnabled = !whyGoogleFragment.lockedSwipe
     }
 
     override fun getTopFragment(): WhyGoogleFragment<*>? =

diff --git a/whygoogle/src/main/java/ir/ayantech/whygoogle/widget/SwipeBackContainer.kt b/whygoogle/src/main/java/ir/ayantech/whygoogle/widget/SwipeBackContainer.kt
@@ -7,6 +7,7 @@ import android.util.AttributeSet
 import android.view.MotionEvent
 import android.view.animation.AccelerateDecelerateInterpolator
 import com.alirezabdn.whyfinal.widget.NonFinalViewPager2
+import ir.ayantech.whygoogle.activity.SwipableWhyGoogleActivity
 import ir.ayantech.whygoogle.helper.FloatCallBack
 import ir.ayantech.whygoogle.helper.SimpleCallBack
 
@@ -15,6 +16,11 @@ abstract class SwipeBackContainer @JvmOverloads constructor(
 ) : NonFinalViewPager2(context, attrs) {
     abstract fun onPageSettled(callback: SimpleCallBack)
 
+    override fun isUserInputEnabled(): Boolean {
+        if ((this.adapter as? SwipableWhyGoogleActivity.WhyGoogleFragmentAdapter)?.fragmentActivity?.getTopFragment()?.lockedSwipe == true)
+            return false
+        return super.isUserInputEnabled()
+    }
     fun listener(
         onPageSettled: SimpleCallBack,
         onPageScrolled: FloatCallBack
-Original file line number
+Diff line change
@@ Expand Up @@
         }
         override fun onTopFragmentChanged(whyGoogleFragment: WhyGoogleFragment<*>) {
-            fragmentHost.isUserInputEnabled = !whyGoogleFragment.lockedSwipe
         }
         override fun getTopFragment(): WhyGoogleFragment<*>? =
@@ Expand Down @@