Skip to content

Commit d4b1ee4

Browse files
author
A.Badakhshan
committed
0.4.14
1 parent b3a07c5 commit d4b1ee4

File tree

5 files changed

+7
-8
lines changed

5 files changed

+7
-8
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:icon="@mipmap/ic_launcher"
88
android:label="@string/app_name"
99
android:roundIcon="@mipmap/ic_launcher_round"
10-
android:supportsRtl="false"
10+
android:supportsRtl="true"
1111
android:theme="@style/Theme.WhyGoogle">
1212
<activity android:name=".MainActivity">
1313
<intent-filter>

app/src/main/java/com/alirezabdn/whygoogle/MainFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.util.Log
44
import android.view.LayoutInflater
55
import android.view.ViewGroup
66
import androidx.fragment.app.Fragment
7-
import com.alirezabdn.whyfinal.adapter.FragmentStateAdapter
7+
import androidx.viewpager2.adapter.FragmentStateAdapter
88
import com.alirezabdn.whygoogle.databinding.MainFragmentBinding
99
import ir.ayantech.whygoogle.fragment.WhyGoogleFragment
1010

app/src/main/res/layout/main_fragment.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
android:text="go2"
2929
app:layout_constraintTop_toBottomOf="@+id/testTv" />
3030

31-
<com.alirezabdn.whyfinal.widget.NonFinalViewPager2
31+
<androidx.viewpager2.widget.ViewPager2
3232
android:id="@+id/myVp2"
3333
android:layout_width="match_parent"
3434
android:layout_height="0dp"

whygoogle/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ android {
1111
minSdkVersion 17
1212
targetSdkVersion 30
1313
versionCode 1
14-
versionName "0.4.13"
14+
versionName "0.4.14"
1515
}
1616
buildFeatures {
1717
viewBinding true
@@ -39,5 +39,5 @@ dependencies {
3939
implementation 'com.google.android.material:material:1.4.0'
4040
implementation "androidx.lifecycle:lifecycle-common-java8:2.3.1"
4141
implementation "androidx.lifecycle:lifecycle-process:2.3.1"
42-
api 'com.github.shadowalker77:nonfinalviewpager2:0.2.3'
42+
api 'com.github.shadowalker77:nonfinalviewpager2:0.2.4'
4343
}

whygoogle/src/main/java/ir/ayantech/whygoogle/widget/SwipeBackContainer.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import android.view.View
1212
import android.view.ViewGroup
1313
import android.view.animation.AccelerateDecelerateInterpolator
1414
import androidx.annotation.RequiresApi
15-
import androidx.core.view.ViewCompat
1615
import com.alirezabdn.whyfinal.widget.NonFinalViewPager2
1716
import ir.ayantech.whygoogle.activity.SwipableWhyGoogleActivity
1817
import ir.ayantech.whygoogle.helper.SimpleCallBack
@@ -49,7 +48,7 @@ class SwipeBackContainer : NonFinalViewPager2 {
4948
val childToCheck = viewToCheck.getChildAt(i)
5049
val bounds = Rect()
5150
childToCheck.getHitRect(bounds)
52-
if (!bounds.contains(x.toInt(), y.toInt())) continue
51+
if (!bounds.contains(x.toInt(), this@SwipeBackContainer.height - y.toInt())) continue
5352
if (canViewScroll(childToCheck, orientation, -1f) || canViewScroll(
5453
childToCheck,
5554
orientation,
@@ -66,7 +65,7 @@ class SwipeBackContainer : NonFinalViewPager2 {
6665
}
6766

6867
private fun canViewScroll(view: View?, orientation: Int, delta: Float): Boolean {
69-
val direction = delta.sign.toInt()
68+
val direction = -delta.sign.toInt()
7069
return when (orientation) {
7170
0 -> view?.canScrollHorizontally(direction) ?: false
7271
1 -> view?.canScrollVertically(direction) ?: false

0 commit comments

Comments
 (0)