From d359d4deb271a17e447d5318a0505158a31a35f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=95=E5=86=B0?= <15700064941@163.com> Date: Tue, 7 May 2019 15:26:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=91=BD=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/lvbing/imagebrower/GlideSimpleLoader.java | 2 +- app/src/main/java/com/lvbing/imagebrower/MainActivity.java | 4 ++-- .../lvbing/imagebrower/widget/CustomLoadingUIProvider2.java | 2 +- .../java/com/lvbing/imagebrower/widget/DecorationLayout.java | 4 ++-- .../github/{ielse => lvbing}/imagewatcher/ImageWatcher.java | 4 +++- .../{ielse => lvbing}/imagewatcher/ImageWatcherHelper.java | 4 +++- .../github/{ielse => lvbing}/imagewatcher/ProgressView.java | 2 +- .../com/github/{ielse => lvbing}/imagewatcher/ViewState.java | 4 +++- 8 files changed, 16 insertions(+), 10 deletions(-) rename imagewatcher/src/main/java/com/github/{ielse => lvbing}/imagewatcher/ImageWatcher.java (99%) rename imagewatcher/src/main/java/com/github/{ielse => lvbing}/imagewatcher/ImageWatcherHelper.java (99%) rename imagewatcher/src/main/java/com/github/{ielse => lvbing}/imagewatcher/ProgressView.java (99%) rename imagewatcher/src/main/java/com/github/{ielse => lvbing}/imagewatcher/ViewState.java (98%) diff --git a/app/src/main/java/com/lvbing/imagebrower/GlideSimpleLoader.java b/app/src/main/java/com/lvbing/imagebrower/GlideSimpleLoader.java index d61e830..8dec140 100644 --- a/app/src/main/java/com/lvbing/imagebrower/GlideSimpleLoader.java +++ b/app/src/main/java/com/lvbing/imagebrower/GlideSimpleLoader.java @@ -9,7 +9,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.request.target.SimpleTarget; import com.bumptech.glide.request.transition.Transition; -import com.github.ielse.imagewatcher.ImageWatcher; +import com.github.lvbing.imagewatcher.ImageWatcher; class GlideSimpleLoader implements ImageWatcher.Loader { @Override diff --git a/app/src/main/java/com/lvbing/imagebrower/MainActivity.java b/app/src/main/java/com/lvbing/imagebrower/MainActivity.java index 54b63a1..c5e0e57 100644 --- a/app/src/main/java/com/lvbing/imagebrower/MainActivity.java +++ b/app/src/main/java/com/lvbing/imagebrower/MainActivity.java @@ -9,8 +9,8 @@ import android.widget.ImageView; import android.widget.Toast; -import com.github.ielse.imagewatcher.ImageWatcher; -import com.github.ielse.imagewatcher.ImageWatcherHelper; +import com.github.lvbing.imagewatcher.ImageWatcher; +import com.github.lvbing.imagewatcher.ImageWatcherHelper; import com.lvbing.imagebrower.widget.CustomLoadingUIProvider2; import com.lvbing.imagebrower.widget.DecorationLayout; import com.lvbing.imagebrower.widget.MessagePicturesLayout; diff --git a/app/src/main/java/com/lvbing/imagebrower/widget/CustomLoadingUIProvider2.java b/app/src/main/java/com/lvbing/imagebrower/widget/CustomLoadingUIProvider2.java index 643f426..c8535f9 100644 --- a/app/src/main/java/com/lvbing/imagebrower/widget/CustomLoadingUIProvider2.java +++ b/app/src/main/java/com/lvbing/imagebrower/widget/CustomLoadingUIProvider2.java @@ -8,7 +8,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; -import com.github.ielse.imagewatcher.ImageWatcher; +import com.github.lvbing.imagewatcher.ImageWatcher; import com.lvbing.imagebrower.R; public class CustomLoadingUIProvider2 implements ImageWatcher.LoadingUIProvider { diff --git a/app/src/main/java/com/lvbing/imagebrower/widget/DecorationLayout.java b/app/src/main/java/com/lvbing/imagebrower/widget/DecorationLayout.java index 9dcbad6..738e319 100644 --- a/app/src/main/java/com/lvbing/imagebrower/widget/DecorationLayout.java +++ b/app/src/main/java/com/lvbing/imagebrower/widget/DecorationLayout.java @@ -10,8 +10,8 @@ import android.widget.TextView; import android.widget.Toast; -import com.github.ielse.imagewatcher.ImageWatcher; -import com.github.ielse.imagewatcher.ImageWatcherHelper; +import com.github.lvbing.imagewatcher.ImageWatcher; +import com.github.lvbing.imagewatcher.ImageWatcherHelper; import com.lvbing.imagebrower.R; public class DecorationLayout extends FrameLayout implements ViewPager.OnPageChangeListener, View.OnClickListener { diff --git a/imagewatcher/src/main/java/com/github/ielse/imagewatcher/ImageWatcher.java b/imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ImageWatcher.java similarity index 99% rename from imagewatcher/src/main/java/com/github/ielse/imagewatcher/ImageWatcher.java rename to imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ImageWatcher.java index b9b8eca..a3f6da4 100644 --- a/imagewatcher/src/main/java/com/github/ielse/imagewatcher/ImageWatcher.java +++ b/imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ImageWatcher.java @@ -1,4 +1,4 @@ -package com.github.ielse.imagewatcher; +package com.github.lvbing.imagewatcher; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; @@ -33,6 +33,8 @@ import android.widget.ImageView; import android.widget.TextView; +import com.github.ielse.imagewatcher.R; + import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; diff --git a/imagewatcher/src/main/java/com/github/ielse/imagewatcher/ImageWatcherHelper.java b/imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ImageWatcherHelper.java similarity index 99% rename from imagewatcher/src/main/java/com/github/ielse/imagewatcher/ImageWatcherHelper.java rename to imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ImageWatcherHelper.java index a3c7e9e..5c98522 100644 --- a/imagewatcher/src/main/java/com/github/ielse/imagewatcher/ImageWatcherHelper.java +++ b/imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ImageWatcherHelper.java @@ -1,4 +1,4 @@ -package com.github.ielse.imagewatcher; +package com.github.lvbing.imagewatcher; import android.net.Uri; import android.support.v4.app.Fragment; @@ -11,6 +11,8 @@ import android.view.ViewGroup; import android.widget.ImageView; +import com.github.ielse.imagewatcher.R; + import java.util.ArrayList; import java.util.List; diff --git a/imagewatcher/src/main/java/com/github/ielse/imagewatcher/ProgressView.java b/imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ProgressView.java similarity index 99% rename from imagewatcher/src/main/java/com/github/ielse/imagewatcher/ProgressView.java rename to imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ProgressView.java index 6b1ecf6..67887b4 100644 --- a/imagewatcher/src/main/java/com/github/ielse/imagewatcher/ProgressView.java +++ b/imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ProgressView.java @@ -1,4 +1,4 @@ -package com.github.ielse.imagewatcher; +package com.github.lvbing.imagewatcher; import android.content.Context; import android.content.res.Resources; diff --git a/imagewatcher/src/main/java/com/github/ielse/imagewatcher/ViewState.java b/imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ViewState.java similarity index 98% rename from imagewatcher/src/main/java/com/github/ielse/imagewatcher/ViewState.java rename to imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ViewState.java index 79a138c..c9d6679 100644 --- a/imagewatcher/src/main/java/com/github/ielse/imagewatcher/ViewState.java +++ b/imagewatcher/src/main/java/com/github/lvbing/imagewatcher/ViewState.java @@ -1,9 +1,11 @@ -package com.github.ielse.imagewatcher; +package com.github.lvbing.imagewatcher; import android.animation.Animator; import android.animation.ValueAnimator; import android.view.View; +import com.github.ielse.imagewatcher.R; + /** * ViewState包含记录了一个View的瞬时UI状态
* 并且提供了给View新增状态，抓取View的当前状态，复制View的状态，将View还原至该状态等便捷方法