fix: #15 when parent.getParent() is ConstraintLayout

nukc · Sep 18, 2018 · cc07875 · cc07875
1 parent bd005dd
commit cc07875
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 ## ChangeLog
 
+#### Version 1.5.3
+fix #15 when parent.getParent() is ConstraintLayout
+
 #### Version 1.5.0
 Supported wrap view
 

diff --git a/README-en.md b/README-en.md
@@ -15,7 +15,7 @@ StateView is an invisible, zero-sized View that can be used to lazily inflate lo
 add the dependency to your build.gradle:
 
 ```groovy
-   compile 'com.github.nukc.stateview:library:1.5.2'
+   compile 'com.github.nukc.stateview:library:1.5.3'
 
    // animator providers
    compile 'com.github.nukc.stateview:animations:1.0.1'

diff --git a/README.md b/README.md
@@ -13,7 +13,7 @@ StateView 一个轻量级的控件, 继承自 `View`, 吸收了 `ViewStub` 的
 
 
 ```groovy
-   compile 'com.github.nukc.stateview:library:1.5.2'
+   compile 'com.github.nukc.stateview:library:1.5.3'
 
    // animator providers
    compile 'com.github.nukc.stateview:animations:1.0.1'

diff --git a/bintray.gradle b/bintray.gradle
@@ -5,7 +5,7 @@ def siteUrl = 'https://github.com/nukc/StateView'      // 项目的主页
 def gitUrl = 'https://github.com/nukc/StateView.git'   // Git仓库的url
 
 group = "com.github.nukc.stateview"
-version = "1.5.2"
+version = "1.5.3"
 
 install {
     repositories.mavenInstaller {

diff --git a/library/build.gradle b/library/build.gradle
@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 27
-        versionCode 23
-        versionName "1.5.2"
+        versionCode 24
+        versionName "1.5.3"
     }
     buildTypes {
         release {

diff --git a/library/src/main/java/com/github/nukc/stateview/StateView.java b/library/src/main/java/com/github/nukc/stateview/StateView.java
@@ -172,9 +172,6 @@ public static StateView inject(@NonNull ViewGroup parent, boolean hasActionBar)
             } else {
                 FrameLayout root = new FrameLayout(parent.getContext());
                 root.setLayoutParams(parent.getLayoutParams());
-                ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
-                        ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
-                parent.setLayoutParams(layoutParams);
 
                 if (viewParent instanceof ViewGroup) {
                     ViewGroup rootGroup = (ViewGroup) viewParent;
@@ -183,6 +180,13 @@ public static StateView inject(@NonNull ViewGroup parent, boolean hasActionBar)
                     // 然后替换成新的
                     rootGroup.addView(root);
                 }
+
+                // if viewParent is ConstraintLayout, setLayoutParams must after rootGroup.removeView(parent);
+                // @see at at android.support.constraint.ConstraintLayout.getViewWidget
+                // @see at android.support.constraint.ConstraintLayout.onViewRemoved
+                ViewGroup.LayoutParams layoutParams = new ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
+                parent.setLayoutParams(layoutParams);
                 root.addView(parent);
                 parent = root;
             }