From 37384cc86aad7ca1778064a5638b48ddaed4feec Mon Sep 17 00:00:00 2001 From: C Date: Tue, 15 Feb 2022 14:35:53 +0800 Subject: [PATCH] Fix: when parent is FragmentContainerView #42 --- README-en.md | 2 +- README.md | 2 +- kotlin/build.gradle | 4 ++-- kotlin/src/main/java/com/github/nukc/stateview/StateView.kt | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/README-en.md b/README-en.md index 9dee99d..6cfab7e 100644 --- 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 index 3dcd7e3..7ede08a 100644 --- 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 index 6ca2575..fe144a0 100644 --- 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 index 384eb71..671cfba 100644 --- 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)