From c8b2b45b7d1af9e83c57d41b6ded626233186973 Mon Sep 17 00:00:00 2001 From: zjlong Date: Tue, 26 Apr 2016 11:47:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9jar=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/matto/ui/activity/AndroidSwipActivity.java | 4 ++-- basic/build.gradle | 7 ++++--- .../{SwipeBackActivity.java => BaseSwipeBackActivity.java} | 2 +- 3 files changed, 7 insertions(+), 6 deletions(-) rename basic/src/main/java/com/common/view/base/{SwipeBackActivity.java => BaseSwipeBackActivity.java} (93%) diff --git a/app/src/main/java/com/matto/ui/activity/AndroidSwipActivity.java b/app/src/main/java/com/matto/ui/activity/AndroidSwipActivity.java index 0b9ad63..b67bbcd 100644 --- a/app/src/main/java/com/matto/ui/activity/AndroidSwipActivity.java +++ b/app/src/main/java/com/matto/ui/activity/AndroidSwipActivity.java @@ -2,7 +2,7 @@ import android.os.Bundle; -import com.common.view.base.SwipeBackActivity; +import com.common.view.base.BaseSwipeBackActivity; import com.common.view.widget.SwipeBackLayout; import com.matto.R; @@ -10,7 +10,7 @@ * author meikoz on 2016/4/19. * email meikoz@126.com */ -public class AndroidSwipActivity extends SwipeBackActivity { +public class AndroidSwipActivity extends BaseSwipeBackActivity { @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/basic/build.gradle b/basic/build.gradle index 33646b7..0e3acff 100644 --- a/basic/build.gradle +++ b/basic/build.gradle @@ -27,9 +27,12 @@ dependencies { testCompile 'junit:junit:4.12' compile 'com.android.support:appcompat-v7:23.2.0' + // Glide + compile 'com.github.bumptech.glide:glide:3.7.0' + // butter knife - compile 'com.android.support:recyclerview-v7:23.2.0' compile 'com.jakewharton:butterknife:7.0.1' + compile 'com.android.support:recyclerview-v7:23.2.0' //adapter compile 'com.joanzapata.android:base-adapter-helper:1.1.11' @@ -40,6 +43,4 @@ dependencies { compile 'com.squareup.retrofit2:converter-gson:2.0.0-beta4' compile 'com.squareup.okhttp3:logging-interceptor:3.1.2' - // Glide - compile 'com.github.bumptech.glide:glide:3.7.0' } diff --git a/basic/src/main/java/com/common/view/base/SwipeBackActivity.java b/basic/src/main/java/com/common/view/base/BaseSwipeBackActivity.java similarity index 93% rename from basic/src/main/java/com/common/view/base/SwipeBackActivity.java rename to basic/src/main/java/com/common/view/base/BaseSwipeBackActivity.java index e8c2698..ce092b0 100644 --- a/basic/src/main/java/com/common/view/base/SwipeBackActivity.java +++ b/basic/src/main/java/com/common/view/base/BaseSwipeBackActivity.java @@ -15,7 +15,7 @@ /** * Created by Eric on 15/3/3. */ -public abstract class SwipeBackActivity extends AppCompatActivity implements SwipeBackLayout.SwipeBackListener { +public abstract class BaseSwipeBackActivity extends AppCompatActivity implements SwipeBackLayout.SwipeBackListener { private SwipeBackLayout swipeBackLayout; private ImageView ivShadow;