🐛 upgrade to v1.1.1

ethanhua · Jun 11, 2018 · 776327d · 776327d
1 parent 22c6a3c
commit 776327d
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/README.md b/README.md
@@ -29,8 +29,8 @@ you can scan the qrcode for download demo apk
 In your build.gradle:
 ```
 dependencies {
- implementation 'com.ethanhua:skeleton:1.1.0'
- implementation 'io.supercharge:shimmerlayout:2.0.0'
+ implementation 'com.ethanhua:skeleton:1.1.1'
+ implementation 'io.supercharge:shimmerlayout:2.1.0'
  }
 ```
 

diff --git a/library/build.gradle b/library/build.gradle
@@ -5,8 +5,8 @@ android {
  defaultConfig {
  minSdkVersion 15
  targetSdkVersion 26
- versionCode 8
- versionName "1.1.0"
+ versionCode 9
+ versionName "1.1.1"
  }
  buildTypes {
  release {
@@ -18,7 +18,7 @@ android {
 
 dependencies {
  implementation fileTree(include: ['*.jar'], dir: 'libs')
- implementation 'io.supercharge:shimmerlayout:2.0.0'
+ implementation 'io.supercharge:shimmerlayout:2.1.0'
  implementation 'com.android.support:recyclerview-v7:26.1.0'
  implementation 'com.android.support:appcompat-v7:26.1.0'
 }
@@ -27,7 +27,7 @@ publish {
  userOrg = 'ethanhua'
  groupId = 'com.ethanhua'
  artifactId = 'skeleton'
- publishVersion = '1.1.0'
+ publishVersion = '1.1.1'
  bintrayUser = 'ethanhua'
  bintrayKey = ''
  desc = 'a library provider a easy way to show skeleton loading view'

diff --git a/library/src/main/java/com/ethanhua/skeleton/RecyclerViewSkeletonScreen.java b/library/src/main/java/com/ethanhua/skeleton/RecyclerViewSkeletonScreen.java
@@ -41,9 +41,6 @@ public void show() {
  @Override
  public void hide() {
  mRecyclerView.setAdapter(mActualAdapter);
- if (!mRecyclerView.isComputingLayout() && mRecyclerViewFrozen) {
- mRecyclerView.setLayoutFrozen(false);
- }
  }
 
  public static class Builder {

diff --git a/library/src/main/java/com/ethanhua/skeleton/ViewSkeletonScreen.java b/library/src/main/java/com/ethanhua/skeleton/ViewSkeletonScreen.java
@@ -81,6 +81,9 @@ public void show() {
 
  @Override
  public void hide() {
+ if (mViewReplacer.getTargetView() instanceof ShimmerLayout) {
+ ((ShimmerLayout) mViewReplacer.getTargetView()).stopShimmerAnimation();
+ }
  mViewReplacer.restore();
  }
 

diff --git a/library/src/main/res/layout/layout_shimmer.xml b/library/src/main/res/layout/layout_shimmer.xml
@@ -1,7 +1,7 @@
 <io.supercharge.shimmerlayout.ShimmerLayout
  xmlns:android="http:https://schemas.android.com/apk/res/android"
  xmlns:app="http:https://schemas.android.com/apk/res-auto"
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
  android:layout_height="wrap_content"
  app:shimmer_angle="0"
  app:shimmer_animation_duration="1200"/>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -24,8 +24,8 @@ dependencies {
  exclude group: 'com.android.support', module: 'support-annotations'
  })
  //implementation project(':library')
- implementation 'com.ethanhua:skeleton:1.1.0'
- implementation 'io.supercharge:shimmerlayout:2.0.0'
+ implementation 'com.ethanhua:skeleton:1.1.1'
+ implementation 'io.supercharge:shimmerlayout:2.1.0'
  implementation 'com.android.support.constraint:constraint-layout:1.0.2'
  implementation 'com.android.support:recyclerview-v7:26.1.0'
  implementation 'com.android.support:appcompat-v7:26.1.0'