diff --git a/app/build.gradle b/app/build.gradle index dbd45331c..73d501ed4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,10 +27,9 @@ 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.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' } 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 e1fb25821..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/dress_icon.png and /dev/null differ 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 @@ - - - -