Fix: when parent is FragmentContainerView #42

nukc · Feb 15, 2022 · 37384cc · 37384cc
1 parent 8da7497
commit 37384cc
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/README-en.md b/README-en.md
@@ -26,7 +26,7 @@ Step 1. Add the JitPack repository to your build file
 Step 2. Add the dependency
 ```groovy
 	dependencies {
-	    implementation 'com.github.nukc:StateView:v3.0.1'
+	    implementation 'com.github.nukc:StateView:v3.0.2'
 	}
 ```
 

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Step 1. Add the JitPack repository to your build file
 Step 2. Add the dependency
 ```groovy
 	dependencies {
-	    implementation 'com.github.nukc:StateView:v3.0.1'
+	    implementation 'com.github.nukc:StateView:v3.0.2'
 	}
 ```
 

diff --git a/kotlin/build.gradle b/kotlin/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 30
-        versionCode 7
-        versionName "3.0.0"
+        versionCode 9
+        versionName "3.0.2"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'

diff --git a/kotlin/src/main/java/com/github/nukc/stateview/StateView.kt b/kotlin/src/main/java/com/github/nukc/stateview/StateView.kt
@@ -19,6 +19,7 @@ import androidx.core.view.NestedScrollingChild
 import androidx.core.view.NestedScrollingParent
 import androidx.core.view.ScrollingView
 import androidx.core.view.ViewCompat
+import androidx.fragment.app.FragmentContainerView
 import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
 
 /**
@@ -297,7 +298,7 @@ class StateView @JvmOverloads constructor(
                 (viewGroup is ScrollingView && viewGroup is NestedScrollingChild) ||
                 (viewGroup is NestedScrollingParent && viewGroup is NestedScrollingChild)
             ) {
-                return if (viewGroup.parent is ViewGroup) {
+                return if (viewGroup.parent is ViewGroup && viewGroup.parent !is FragmentContainerView) {
                     wrap(viewGroup)
                 } else {
                     Injector.wrapChild(viewGroup)