From c979fad73520cf1e6aa70d4db51e42a7022d85c4 Mon Sep 17 00:00:00 2001 From: AllenCoder Date: Sat, 12 Jan 2019 19:26:06 +0800 Subject: [PATCH 1/3] 1. upgradle glide version 2. upgradle logger version --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dbd45331c..dc0db7382 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,10 +27,10 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(path: ':library') implementation project(':material-spinner-1.0.5') - implementation 'com.github.bumptech.glide:glide:3.7.0' + implementation 'com.github.bumptech.glide:glide:4.8.0' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support:cardview-v7:28.0.0' implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.kyleduo.switchbutton:library:2.0.0' - implementation 'com.orhanobut:logger:2.1.1' + implementation 'com.orhanobut:logger:2.2.0' } From feb3dce8809f7508d98d11f2abb69bb1a39725c7 Mon Sep 17 00:00:00 2001 From: AllenCoder Date: Sat, 12 Jan 2019 19:27:34 +0800 Subject: [PATCH 2/3] 1. upgradle glide version 2. add glide proguard --- app/build.gradle | 1 + app/proguard-rules.pro | 9 +++++++++ 2 files changed, 10 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index dc0db7382..374dd4040 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,6 +28,7 @@ dependencies { implementation project(path: ':library') implementation project(':material-spinner-1.0.5') implementation 'com.github.bumptech.glide:glide:4.8.0' + annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support:cardview-v7:28.0.0' implementation 'com.android.support:appcompat-v7:28.0.0' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index aad001d60..a88efdf33 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -24,3 +24,12 @@ -keepclassmembers public class * extends com.chad.library.adapter.base.BaseViewHolder { (android.view.View); } +-keep public class * implements com.bumptech.glide.module.GlideModule +-keep public class * extends com.bumptech.glide.module.AppGlideModule +-keep public enum com.bumptech.glide.load.ImageHeaderParser$** { + **[] $VALUES; + public *; +} + +# for DexGuard only +-keepresourcexmlelements manifest/application/meta-data@value=GlideModule From 3e13c5bed9256c4494415099c44675e7add9ffd0 Mon Sep 17 00:00:00 2001 From: AllenCoder Date: Sat, 12 Jan 2019 19:36:58 +0800 Subject: [PATCH 3/3] 1. rm unused resource 2. rm unused lib 3. rm unused class --- app/build.gradle | 2 - app/proguard-rules.pro | 9 --- .../adapter/DefAdpater.java | 63 ------------------ .../adapter/QuickAdapter.java | 7 -- .../transform/GlideCircleTransform.java | 53 --------------- app/src/main/res/mipmap-xhdpi/dress_icon.png | Bin 1523 -> 0 bytes app/src/main/res/values-v21/dimens.xml | 4 +- app/src/main/res/values/dimens.xml | 1 - app/src/main/res/values/strings.xml | 3 - app/src/main/res/values/styles.xml | 7 -- library/src/main/res/values/dimens.xml | 3 - 11 files changed, 1 insertion(+), 151 deletions(-) delete mode 100644 app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DefAdpater.java delete mode 100644 app/src/main/java/com/chad/baserecyclerviewadapterhelper/transform/GlideCircleTransform.java delete mode 100644 app/src/main/res/mipmap-xhdpi/dress_icon.png diff --git a/app/build.gradle b/app/build.gradle index 374dd4040..73d501ed4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,8 +27,6 @@ dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(path: ':library') implementation project(':material-spinner-1.0.5') - implementation 'com.github.bumptech.glide:glide:4.8.0' - annotationProcessor 'com.github.bumptech.glide:compiler:4.8.0' implementation 'com.android.support:design:28.0.0' implementation 'com.android.support:cardview-v7:28.0.0' implementation 'com.android.support:appcompat-v7:28.0.0' diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index a88efdf33..aad001d60 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -24,12 +24,3 @@ -keepclassmembers public class * extends com.chad.library.adapter.base.BaseViewHolder { (android.view.View); } --keep public class * implements com.bumptech.glide.module.GlideModule --keep public class * extends com.bumptech.glide.module.AppGlideModule --keep public enum com.bumptech.glide.load.ImageHeaderParser$** { - **[] $VALUES; - public *; -} - -# for DexGuard only --keepresourcexmlelements manifest/application/meta-data@value=GlideModule diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DefAdpater.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DefAdpater.java deleted file mode 100644 index f840345c9..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/DefAdpater.java +++ /dev/null @@ -1,63 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.adapter; - -import android.content.Context; -import android.support.v7.widget.RecyclerView; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ImageView; -import android.widget.TextView; - -import com.bumptech.glide.Glide; -import com.chad.baserecyclerviewadapterhelper.R; -import com.chad.baserecyclerviewadapterhelper.data.DataServer; -import com.chad.baserecyclerviewadapterhelper.entity.Status; - -import java.util.List; - -/** - * https://github.com/CymChad/BaseRecyclerViewAdapterHelper - */ -public class DefAdpater extends RecyclerView.Adapter { - private final List sampleData = DataServer.getSampleData(100); - private Context mContext; - private LayoutInflater mLayoutInflater; - public DefAdpater(Context context) { - mContext = context; - mLayoutInflater = LayoutInflater.from(context); - } - - @Override - public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { - View item = mLayoutInflater.inflate(R.layout.layout_animation, parent, false); - return new ViewHolder(item); - } - - @Override - public void onBindViewHolder(ViewHolder holder, int position) { - Status status = sampleData.get(position); - holder.name.setText(status.getUserName()); - holder.text.setText(status.getText()); - holder.date.setText(status.getCreatedAt()); - } - - @Override - public int getItemCount() { - return sampleData.size(); - } - - public static class ViewHolder extends RecyclerView.ViewHolder { - - private TextView name; - private TextView date; - private TextView text; - - public ViewHolder(View itemView) { - super(itemView); - text = (TextView) itemView.findViewById(R.id.tweetText); - name = (TextView) itemView.findViewById(R.id.tweetName); - date = (TextView) itemView.findViewById(R.id.tweetDate); - - } - } -} \ No newline at end of file diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/QuickAdapter.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/QuickAdapter.java index 455499133..a5caa31cb 100644 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/QuickAdapter.java +++ b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/adapter/QuickAdapter.java @@ -1,15 +1,8 @@ package com.chad.baserecyclerviewadapterhelper.adapter; -import android.text.method.LinkMovementMethod; -import android.widget.ImageView; -import android.widget.TextView; - -import com.bumptech.glide.Glide; import com.chad.baserecyclerviewadapterhelper.R; import com.chad.baserecyclerviewadapterhelper.data.DataServer; import com.chad.baserecyclerviewadapterhelper.entity.Status; -import com.chad.baserecyclerviewadapterhelper.transform.GlideCircleTransform; -import com.chad.baserecyclerviewadapterhelper.util.SpannableStringUtils; import com.chad.library.adapter.base.BaseQuickAdapter; import com.chad.library.adapter.base.BaseViewHolder; diff --git a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/transform/GlideCircleTransform.java b/app/src/main/java/com/chad/baserecyclerviewadapterhelper/transform/GlideCircleTransform.java deleted file mode 100644 index 3755a3841..000000000 --- a/app/src/main/java/com/chad/baserecyclerviewadapterhelper/transform/GlideCircleTransform.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.chad.baserecyclerviewadapterhelper.transform; - -import android.content.Context; -import android.graphics.Bitmap; -import android.graphics.BitmapShader; -import android.graphics.Canvas; -import android.graphics.Paint; - -import com.bumptech.glide.load.engine.bitmap_recycle.BitmapPool; -import com.bumptech.glide.load.resource.bitmap.BitmapTransformation; - -/** - * Created by tb on 16/5/3. - */ -public class GlideCircleTransform extends BitmapTransformation { - - public GlideCircleTransform(Context context) { - super(context); - } - - @Override - protected Bitmap transform(BitmapPool pool, Bitmap toTransform, int outWidth, int outHeight) { - return circleCrop(pool, toTransform); - } - - private static Bitmap circleCrop(BitmapPool pool, Bitmap source) { - if (source == null) return null; - - int size = Math.min(source.getWidth(), source.getHeight()); - int x = (source.getWidth() - size) / 2; - int y = (source.getHeight() - size) / 2; - - Bitmap squared = Bitmap.createBitmap(source, x, y, size, size); - - Bitmap result = pool.get(size, size, Bitmap.Config.ARGB_8888); - if (result == null) { - result = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888); - } - - Canvas canvas = new Canvas(result); - Paint paint = new Paint(); - paint.setShader(new BitmapShader(squared, BitmapShader.TileMode.CLAMP, BitmapShader.TileMode.CLAMP)); - paint.setAntiAlias(true); - float r = size / 2f; - canvas.drawCircle(r, r, r, paint); - return result; - } - - @Override - public String getId() { - return getClass().getName(); - } -} diff --git a/app/src/main/res/mipmap-xhdpi/dress_icon.png b/app/src/main/res/mipmap-xhdpi/dress_icon.png deleted file mode 100644 index e1fb25821ba324925fbad4772bde9985057aa601..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1523 zcmeAS@N?(olHy`uVBq!ia0vp^5DSr z1<%~X^wgl##FWaylc_cg49r@YArU1JzCKpT`MG+DAT@dwxdlMo3=B5*6$OdO*{LN8 zNvY|XdA3ULckfqH$V{%1*XSQL?vFu&J;D8jzb> zlBiITo0C^;Rbi_HHrEQs1_|pcDS(xfWZNo192Makpx~Tel&WB=XQrEMXl$flZmDNz zYH4I)qN8ABU}&aqV4`nmscUF#1wRtPXT0NVp4u- ziLDaQr4TRV7Ql_oD~1LWFu?RH5)1SV^$b8>f+_U%#ji9s7p}UvBq$Z(UaSTehg24% z>IbD3=a&{G10ya?8Dv#~m2**QVo82cNPd0}EEEGW@=NlIGx7@*oSi|TW~yhZpy8XC zoS6p_)&%SG^|kWMD=taQOHTE4u~h<^q?ehQVr63KX69sRYT)GRklAm0fo0?Yw)0=|OYlu@XC`sfN0Bv?jEy^rQO>ryA&s6|>-6|8O zTTEPWng`XJg3~P~ZaDSo10ACeieRJ&hY0~w5r_#-zCaE<1El5wQ+*LIc^8$MG%zqQ z#e2FqhE&{IGwr;0NTA5^_dN+7Et)T~Gz=C6Z4zizIw9Y^@InmNHbd=&x0cj5MvEtU zsj#W;D7d&z%}H@drijp#PvP3qO`d@UQ@jklX75wq$3L&X{NC*6XT1) z`@Ul5lPQ-fUZ`X+mOkLoV5~o2^n>eOVeu1 zj4`JV-1(Hj%Kczkd{g@Zei@^Ks>$=3;&czjUdY@OF23V=4g1vut|v3^Wbnr@7$@Go zl<{nL0>_o6#Y?8;?mi{)@zwS;g_-xXW%oCyO$c~2-H}H`>tlD~yJFw#nRPrp4f!c8 zxt#A5e07bQGxsqszt_Yjr+0IkpnD8ov}gqT<2SFb{4Wn!mePN-Ec}S7+{U-l!n@pO zs%V5Yt=<;A_NB@EY_B~LLOB`-gY2f;2-Q5>?9!R<(KJOU=h0`w>o-@H9&_pKa@RV; z{A`)V{zXQAy&tgtaE;rP+grP+>-dy6i>%&BEdJyDv;4Bx9=1K-A{McEDr}y?nm*NU z|3L)_w)r>07;hbrov^+qn&tVL{EMOnSw*W?C!F~u*85TZnb+Yjcfv1r9oSQ}qA8>G z^xl_i*e_jRyc9WO`OA$fLrrF0+pHtRV|jmR^hNtazp88&RCalPKD_?L|CEn@>@l-$ z`xWapK73xT;LxQ0z;{CR#1{rLnAK~}>~HYeu=H-GNp5pl+?qYpo-IpzH{HP`Q8eGR z-{H<_g(t=4qM{A`52kqQTAZIbtNEP67UsMU>yr0>-|~BA`m6&R(rh;Tot8TLOiF^9 ocgp_iW0i{Qo}a1t>fgY~5VUX3-kQ#R*FnXwr>mdKI;Vst058l!q5uE@ diff --git a/app/src/main/res/values-v21/dimens.xml b/app/src/main/res/values-v21/dimens.xml index c6880f0a6..3ea04e700 100644 --- a/app/src/main/res/values-v21/dimens.xml +++ b/app/src/main/res/values-v21/dimens.xml @@ -1,4 +1,2 @@ - - 25dp - + diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 44e534012..2a202cf2c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -7,5 +7,4 @@ 40dp 14sp - 0dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index ab62bf1d8..e37caa63b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,7 +1,4 @@ - BRVAH - HeaderAndFooterUseActivity - Network error Simulation network error Network error, Click Retry There is no data, Click Retry diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index a08462010..ea9715b14 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -42,13 +42,6 @@ - - - -