From d9a1a9772812012bbc7b14806a5e1ef6ea3d779c Mon Sep 17 00:00:00 2001 From: GKF Date: Tue, 8 Jan 2019 16:29:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/kunfei/bookshelf/utils/Selector.java | 536 ++++++++++++++++++ .../kunfei/bookshelf/utils/ShapeSelector.java | 199 ------- .../Theme/views/ATEAccentBgTextView.java | 7 +- .../Theme/views/ATEAccentStrokeTextView.java | 42 ++ .../view/activity/ImportBookActivity.java | 6 +- .../main/res/drawable/selector_btn_accent.xml | 6 - .../main/res/layout/activity_import_book.xml | 14 +- 7 files changed, 591 insertions(+), 219 deletions(-) create mode 100644 app/src/main/java/com/kunfei/bookshelf/utils/Selector.java delete mode 100644 app/src/main/java/com/kunfei/bookshelf/utils/ShapeSelector.java create mode 100644 app/src/main/java/com/kunfei/bookshelf/utils/Theme/views/ATEAccentStrokeTextView.java delete mode 100644 app/src/main/res/drawable/selector_btn_accent.xml diff --git a/app/src/main/java/com/kunfei/bookshelf/utils/Selector.java b/app/src/main/java/com/kunfei/bookshelf/utils/Selector.java new file mode 100644 index 0000000000..6b116df912 --- /dev/null +++ b/app/src/main/java/com/kunfei/bookshelf/utils/Selector.java @@ -0,0 +1,536 @@ +package com.kunfei.bookshelf.utils; + +import android.content.Context; +import android.content.res.ColorStateList; +import android.graphics.Color; +import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; +import android.graphics.drawable.GradientDrawable; +import android.graphics.drawable.StateListDrawable; + +import androidx.annotation.ColorInt; +import androidx.annotation.Dimension; +import androidx.annotation.DrawableRes; +import androidx.annotation.IntDef; +import androidx.core.content.ContextCompat; + +public class Selector { + public static ShapeSelector shapeBuild() { + return new ShapeSelector(); + } + + public static ColorSelector colorBuild() { + return new ColorSelector(); + } + + public static DrawableSelector drawableBuild() { + return new DrawableSelector(); + } + + /** + * 形状ShapeSelector + * + * @author hjy + * created at 2017/12/11 22:26 + */ + public static final class ShapeSelector { + + // 只支持长方形、圆形 + @IntDef({GradientDrawable.RECTANGLE}) + private @interface Shape { + } + + private int mShape; //the shape of background + private int mCornerRadius; //corner radius + + private int mDefaultBgColor; //default background color + private int mDisabledBgColor; //state_enabled = false + private int mPressedBgColor; //state_pressed = true + private int mSelectedBgColor; //state_selected = true + private int mFocusedBgColor; //state_focused = true + private int mStrokeWidth; //stroke width in pixel + private int mDefaultStrokeColor; //default stroke color + private int mDisabledStrokeColor; //state_enabled = false + private int mPressedStrokeColor; //state_pressed = true + private int mSelectedStrokeColor; //state_selected = true + private int mFocusedStrokeColor; //state_focused = true + + private int mTLRadius; + private int mTRRadius; + private int mBLRadius; + private int mBRRadius; + + // 上边框显示，前提边框的宽度不为0 + private boolean mShowTopStroke = true; + // 下边框显示，前提边框的宽度不为0 + private boolean mShowBottomStroke = true; + // 左边框显示，前提边框的宽度不为0 + private boolean mShowLeftStroke = true; + // 右边框显示，前提边框的宽度不为0 + private boolean mShowRightStroke = true; + + // 上边框宽度 + private int mTopStrokeWidth; + // 下边框宽度 + private int mBottomStrokeWidth; + // 左边框宽度 + private int mLeftStrokeWidth; + // 右边框宽度 + private int mRightStrokeWidth; + + private boolean hasSetDisabledBgColor = false; + private boolean hasSetPressedBgColor = false; + private boolean hasSetSelectedBgColor = false; + private boolean hasSetFocusedBgColor = false; + + private boolean hasSetDisabledStrokeColor = false; + private boolean hasSetPressedStrokeColor = false; + private boolean hasSetSelectedStrokeColor = false; + private boolean hasSetFocusedStrokeColor = false; + + private ShapeSelector() { + mShape = GradientDrawable.RECTANGLE; + mDefaultBgColor = Color.TRANSPARENT; + mDisabledBgColor = Color.TRANSPARENT; + mPressedBgColor = Color.TRANSPARENT; + mSelectedBgColor = Color.TRANSPARENT; + mFocusedBgColor = Color.TRANSPARENT; + mStrokeWidth = 0; + mDefaultStrokeColor = Color.TRANSPARENT; + mDisabledStrokeColor = Color.TRANSPARENT; + mPressedStrokeColor = Color.TRANSPARENT; + mSelectedStrokeColor = Color.TRANSPARENT; + mFocusedStrokeColor = Color.TRANSPARENT; + mCornerRadius = 0; + mTLRadius = mCornerRadius; + mTRRadius = mCornerRadius; + mBLRadius = mCornerRadius; + mBRRadius = mCornerRadius; + // 刚开始四个边框都要显示 + mShowTopStroke = true; + mShowBottomStroke = true; + mShowLeftStroke = true; + mShowRightStroke = true; + // 刚开始四个边框大小 + // 上边框宽度 + mTopStrokeWidth = mStrokeWidth; + // 下边框宽度 + mBottomStrokeWidth = mStrokeWidth; + // 左边框宽度 + mLeftStrokeWidth = mStrokeWidth; + // 右边框宽度 + mRightStrokeWidth = mStrokeWidth; + } + + public ShapeSelector setShape(@Shape int shape) { + mShape = shape; + return this; + } + + public ShapeSelector setDefaultBgColor(@ColorInt int color) { + mDefaultBgColor = color; + if (!hasSetDisabledBgColor) + mDisabledBgColor = color; + if (!hasSetPressedBgColor) + mPressedBgColor = color; + if (!hasSetSelectedBgColor) + mSelectedBgColor = color; + if (!hasSetFocusedBgColor) + mFocusedBgColor = color; + return this; + } + + public ShapeSelector setDefaultStrokeColor(@ColorInt int color) { + mDefaultStrokeColor = color; + if (!hasSetDisabledStrokeColor) + mDisabledStrokeColor = color; + if (!hasSetPressedStrokeColor) + mPressedStrokeColor = color; + if (!hasSetSelectedStrokeColor) + mSelectedStrokeColor = color; + if (!hasSetFocusedStrokeColor) + mFocusedStrokeColor = color; + return this; + } + + public ShapeSelector setDisabledBgColor(@ColorInt int color) { + mDisabledBgColor = color; + hasSetDisabledBgColor = true; + return this; + } + + public ShapeSelector setPressedBgColor(@ColorInt int color) { + mPressedBgColor = color; + hasSetPressedBgColor = true; + return this; + } + + public ShapeSelector setSelectedBgColor(@ColorInt int color) { + mSelectedBgColor = color; + hasSetSelectedBgColor = true; + return this; + } + + public ShapeSelector setFocusedBgColor(@ColorInt int color) { + mFocusedBgColor = color; + hasSetFocusedBgColor = true; + return this; + } + + public ShapeSelector setStrokeWidth(@Dimension int width) { + mStrokeWidth = width; + mTopStrokeWidth = mStrokeWidth; + mBottomStrokeWidth = mStrokeWidth; + mLeftStrokeWidth = mStrokeWidth; + mRightStrokeWidth = mStrokeWidth; + mShowTopStroke = true; + mShowBottomStroke = true; + mShowLeftStroke = true; + mShowRightStroke = true; + return this; + } + + public ShapeSelector setDisabledStrokeColor(@ColorInt int color) { + mDisabledStrokeColor = color; + hasSetDisabledStrokeColor = true; + return this; + } + + public ShapeSelector setPressedStrokeColor(@ColorInt int color) { + mPressedStrokeColor = color; + hasSetPressedStrokeColor = true; + return this; + } + + public ShapeSelector setSelectedStrokeColor(@ColorInt int color) { + mSelectedStrokeColor = color; + hasSetSelectedStrokeColor = true; + return this; + } + + public ShapeSelector setFocusedStrokeColor(@ColorInt int color) { + mFocusedStrokeColor = color; + hasSetFocusedStrokeColor = true; + return this; + } + + public ShapeSelector setCornerRadius(@Dimension int radius) { + mCornerRadius = radius; + mTLRadius = mCornerRadius; + mTRRadius = mCornerRadius; + mBLRadius = mCornerRadius; + mBRRadius = mCornerRadius; + return this; + } + + public ShapeSelector setTLRadius(@Dimension int tLRadius) { + mTLRadius = tLRadius; + return this; + } + + public ShapeSelector setTRRadius(@Dimension int tRadius) { + mTRRadius = tRadius; + return this; + } + + public ShapeSelector setBLRadius(@Dimension int bLRadius) { + mBLRadius = bLRadius; + return this; + } + + public ShapeSelector setBRRadius(@Dimension int bRRadius) { + mBRRadius = bRRadius; + return this; + } + + public ShapeSelector setShowTopStroke(boolean showTopStroke) { + this.mShowTopStroke = showTopStroke; + if (!mShowTopStroke) + mTopStrokeWidth = 0; + return this; + } + + public ShapeSelector setShowBottomStroke(boolean showBottomStroke) { + this.mShowBottomStroke = showBottomStroke; + if (!mShowBottomStroke) + mBottomStrokeWidth = 0; + return this; + } + + public ShapeSelector setShowLeftStroke(boolean showLeftStroke) { + this.mShowLeftStroke = showLeftStroke; + if (!mShowLeftStroke) + mLeftStrokeWidth = 0; + return this; + } + + public ShapeSelector setShowRightStroke(boolean showRightStroke) { + this.mShowRightStroke = showRightStroke; + if (!mShowRightStroke) + mRightStrokeWidth = 0; + return this; + } + + public ShapeSelector setTopStrokeWidth(int topStrokeWidth) { + this.mTopStrokeWidth = topStrokeWidth; + if (!mShowTopStroke) + mTopStrokeWidth = 0; + return this; + } + + public ShapeSelector setBottomStrokeWidth(int bottomStrokeWidth) { + this.mBottomStrokeWidth = bottomStrokeWidth; + if (!mShowBottomStroke) + mBottomStrokeWidth = 0; + return this; + } + + public ShapeSelector setLeftStrokeWidth(int leftStrokeWidth) { + this.mLeftStrokeWidth = leftStrokeWidth; + if (!mShowLeftStroke) + mLeftStrokeWidth = 0; + return this; + } + + public ShapeSelector setRightStrokeWidth(int rightStrokeWidth) { + this.mRightStrokeWidth = rightStrokeWidth; + if (!mShowRightStroke) + mRightStrokeWidth = 0; + return this; + } + + public StateListDrawable create() { + StateListDrawable selector = new StateListDrawable(); + + //enabled = false + if (hasSetDisabledBgColor || hasSetDisabledStrokeColor) { + GradientDrawable disabledShape = getItemShape(mShape, mCornerRadius, + mDisabledBgColor, mStrokeWidth, mDisabledStrokeColor); + selector.addState(new int[]{-android.R.attr.state_enabled}, disabledShape); + } + + //pressed = true + if (hasSetPressedBgColor || hasSetPressedStrokeColor) { + GradientDrawable pressedShape = getItemShape(mShape, mCornerRadius, + mPressedBgColor, mStrokeWidth, mPressedStrokeColor); + selector.addState(new int[]{android.R.attr.state_pressed}, pressedShape); + } + + //selected = true + if (hasSetSelectedBgColor || hasSetSelectedStrokeColor) { + GradientDrawable selectedShape = getItemShape(mShape, mCornerRadius, + mSelectedBgColor, mStrokeWidth, mSelectedStrokeColor); + selector.addState(new int[]{android.R.attr.state_selected}, selectedShape); + } + + //focused = true + if (hasSetFocusedBgColor || hasSetFocusedStrokeColor) { + GradientDrawable focusedShape = getItemShape(mShape, mCornerRadius, + mFocusedBgColor, mStrokeWidth, mFocusedStrokeColor); + selector.addState(new int[]{android.R.attr.state_focused}, focusedShape); + } + + //default + GradientDrawable defaultShape = getItemShape(mShape, mCornerRadius, + mDefaultBgColor, mStrokeWidth, mDefaultStrokeColor); + selector.addState(new int[]{}, defaultShape); + + return selector; + } + + private GradientDrawable getItemShape(int shape, int cornerRadius, + int solidColor, int strokeWidth, int strokeColor) { + GradientDrawable drawable = new GradientDrawable(); + drawable.setShape(shape); + drawable.setStroke(strokeWidth, strokeColor); + drawable.setCornerRadius(cornerRadius); + drawable.setColor(solidColor); + return drawable; + } + + private GradientDrawable getDrawable(int shape, int solidColor, float[] radii) { + GradientDrawable drawable = new GradientDrawable(); + drawable.setShape(shape); + drawable.setCornerRadii(radii); + drawable.setColor(solidColor); + return drawable; + } + } + + /** + * 资源DrawableSelector + * + * @author hjy + * created at 2017/12/11 22:34 + */ + public static final class DrawableSelector { + + private Drawable mDefaultDrawable; + private Drawable mDisabledDrawable; + private Drawable mPressedDrawable; + private Drawable mSelectedDrawable; + private Drawable mFocusedDrawable; + + private boolean hasSetDisabledDrawable = false; + private boolean hasSetPressedDrawable = false; + private boolean hasSetSelectedDrawable = false; + private boolean hasSetFocusedDrawable = false; + + private DrawableSelector() { + mDefaultDrawable = new ColorDrawable(Color.TRANSPARENT); + } + + public DrawableSelector setDefaultDrawable(Drawable drawable) { + mDefaultDrawable = drawable; + if (!hasSetDisabledDrawable) + mDisabledDrawable = drawable; + if (!hasSetPressedDrawable) + mPressedDrawable = drawable; + if (!hasSetSelectedDrawable) + mSelectedDrawable = drawable; + if (!hasSetFocusedDrawable) + mFocusedDrawable = drawable; + return this; + } + + public DrawableSelector setDisabledDrawable(Drawable drawable) { + mDisabledDrawable = drawable; + hasSetDisabledDrawable = true; + return this; + } + + public DrawableSelector setPressedDrawable(Drawable drawable) { + mPressedDrawable = drawable; + hasSetPressedDrawable = true; + return this; + } + + public DrawableSelector setSelectedDrawable(Drawable drawable) { + mSelectedDrawable = drawable; + hasSetSelectedDrawable = true; + return this; + } + + public DrawableSelector setFocusedDrawable(Drawable drawable) { + mFocusedDrawable = drawable; + hasSetFocusedDrawable = true; + return this; + } + + public StateListDrawable create() { + StateListDrawable selector = new StateListDrawable(); + if (hasSetDisabledDrawable) + selector.addState(new int[]{-android.R.attr.state_enabled}, mDisabledDrawable); + if (hasSetPressedDrawable) + selector.addState(new int[]{android.R.attr.state_pressed}, mPressedDrawable); + if (hasSetSelectedDrawable) + selector.addState(new int[]{android.R.attr.state_selected}, mSelectedDrawable); + if (hasSetFocusedDrawable) + selector.addState(new int[]{android.R.attr.state_focused}, mFocusedDrawable); + selector.addState(new int[]{}, mDefaultDrawable); + return selector; + } + + public DrawableSelector setDefaultDrawable(Context context, @DrawableRes int drawableRes) { + return setDefaultDrawable(ContextCompat.getDrawable(context, drawableRes)); + } + + public DrawableSelector setDisabledDrawable(Context context, @DrawableRes int drawableRes) { + return setDisabledDrawable(ContextCompat.getDrawable(context, drawableRes)); + } + + public DrawableSelector setPressedDrawable(Context context, @DrawableRes int drawableRes) { + return setPressedDrawable(ContextCompat.getDrawable(context, drawableRes)); + } + + public DrawableSelector setSelectedDrawable(Context context, @DrawableRes int drawableRes) { + return setSelectedDrawable(ContextCompat.getDrawable(context, drawableRes)); + } + + public DrawableSelector setFocusedDrawable(Context context, @DrawableRes int drawableRes) { + return setFocusedDrawable(ContextCompat.getDrawable(context, drawableRes)); + } + } + + /** + * 颜色ColorSelector + * + * @author hjy + * created at 2017/12/11 22:26 + */ + public static final class ColorSelector { + + private int mDefaultColor; + private int mDisabledColor; + private int mPressedColor; + private int mSelectedColor; + private int mFocusedColor; + + private boolean hasSetDisabledColor = false; + private boolean hasSetPressedColor = false; + private boolean hasSetSelectedColor = false; + private boolean hasSetFocusedColor = false; + + private ColorSelector() { + mDefaultColor = Color.BLACK; + mDisabledColor = Color.GRAY; + mPressedColor = Color.BLACK; + mSelectedColor = Color.BLACK; + mFocusedColor = Color.BLACK; + } + + public ColorSelector setDefaultColor(@ColorInt int color) { + mDefaultColor = color; + if (!hasSetDisabledColor) + mDisabledColor = color; + if (!hasSetPressedColor) + mPressedColor = color; + if (!hasSetSelectedColor) + mSelectedColor = color; + if (!hasSetFocusedColor) + mFocusedColor = color; + return this; + } + + public ColorSelector setDisabledColor(@ColorInt int color) { + mDisabledColor = color; + hasSetDisabledColor = true; + return this; + } + + public ColorSelector setPressedColor(@ColorInt int color) { + mPressedColor = color; + hasSetPressedColor = true; + return this; + } + + public ColorSelector setSelectedColor(@ColorInt int color) { + mSelectedColor = color; + hasSetSelectedColor = true; + return this; + } + + public ColorSelector setFocusedColor(@ColorInt int color) { + mFocusedColor = color; + hasSetFocusedColor = true; + return this; + } + + public ColorStateList create() { + int[] colors = new int[]{ + hasSetDisabledColor ? mDisabledColor : mDefaultColor, + hasSetPressedColor ? mPressedColor : mDefaultColor, + hasSetSelectedColor ? mSelectedColor : mDefaultColor, + hasSetFocusedColor ? mFocusedColor : mDefaultColor, + mDefaultColor + }; + int[][] states = new int[5][]; + states[0] = new int[]{-android.R.attr.state_enabled}; + states[1] = new int[]{android.R.attr.state_pressed}; + states[2] = new int[]{android.R.attr.state_selected}; + states[3] = new int[]{android.R.attr.state_focused}; + states[4] = new int[]{}; + return new ColorStateList(states, colors); + } + } +} diff --git a/app/src/main/java/com/kunfei/bookshelf/utils/ShapeSelector.java b/app/src/main/java/com/kunfei/bookshelf/utils/ShapeSelector.java deleted file mode 100644 index 5d571915fa..0000000000 --- a/app/src/main/java/com/kunfei/bookshelf/utils/ShapeSelector.java +++ /dev/null @@ -1,199 +0,0 @@ -package com.kunfei.bookshelf.utils; - -import android.graphics.Color; -import android.graphics.drawable.GradientDrawable; -import android.graphics.drawable.StateListDrawable; - -import androidx.annotation.ColorInt; -import androidx.annotation.Dimension; -import androidx.annotation.IntDef; - -public class ShapeSelector { - @IntDef({GradientDrawable.RECTANGLE, GradientDrawable.OVAL, - GradientDrawable.LINE, GradientDrawable.RING}) - private @interface Shape { - } - - private int mShape; //the shape of background - private int mDefaultBgColor; //default background color - private int mDisabledBgColor; //state_enabled = false - private int mPressedBgColor; //state_pressed = true - private int mSelectedBgColor; //state_selected = true - private int mFocusedBgColor; //state_focused = true - private int mStrokeWidth; //stroke width in pixel - private int mDefaultStrokeColor; //default stroke color - private int mDisabledStrokeColor; //state_enabled = false - private int mPressedStrokeColor; //state_pressed = true - private int mSelectedStrokeColor; //state_selected = true - private int mFocusedStrokeColor; //state_focused = true - private int mCornerRadius; //corner radius - - private boolean hasSetDisabledBgColor = false; - private boolean hasSetPressedBgColor = false; - private boolean hasSetSelectedBgColor = false; - private boolean hasSetFocusedBgColor = false; - - private boolean hasSetDisabledStrokeColor = false; - private boolean hasSetPressedStrokeColor = false; - private boolean hasSetSelectedStrokeColor = false; - private boolean hasSetFocusedStrokeColor = false; - - public static ShapeSelector newShapeSelector() { - return new ShapeSelector(); - } - - public ShapeSelector() { - //initialize default values - mShape = GradientDrawable.RECTANGLE; - mDefaultBgColor = Color.TRANSPARENT; - mDisabledBgColor = Color.TRANSPARENT; - mPressedBgColor = Color.TRANSPARENT; - mSelectedBgColor = Color.TRANSPARENT; - mFocusedBgColor = Color.TRANSPARENT; - mStrokeWidth = 0; - mDefaultStrokeColor = Color.TRANSPARENT; - mDisabledStrokeColor = Color.TRANSPARENT; - mPressedStrokeColor = Color.TRANSPARENT; - mSelectedStrokeColor = Color.TRANSPARENT; - mFocusedStrokeColor = Color.TRANSPARENT; - mCornerRadius = 0; - } - - public ShapeSelector setShape(@Shape int shape) { - mShape = shape; - return this; - } - - public ShapeSelector setDefaultBgColor(@ColorInt int color) { - mDefaultBgColor = color; - if (!hasSetDisabledBgColor) - mDisabledBgColor = color; - if (!hasSetPressedBgColor) - mPressedBgColor = color; - if (!hasSetSelectedBgColor) - mSelectedBgColor = color; - if (!hasSetFocusedBgColor) - mFocusedBgColor = color; - return this; - } - - public ShapeSelector setDisabledBgColor(@ColorInt int color) { - mDisabledBgColor = color; - hasSetDisabledBgColor = true; - return this; - } - - public ShapeSelector setPressedBgColor(@ColorInt int color) { - mPressedBgColor = color; - hasSetPressedBgColor = true; - return this; - } - - public ShapeSelector setSelectedBgColor(@ColorInt int color) { - mSelectedBgColor = color; - hasSetSelectedBgColor = true; - return this; - } - - public ShapeSelector setFocusedBgColor(@ColorInt int color) { - mFocusedBgColor = color; - hasSetPressedBgColor = true; - return this; - } - - public ShapeSelector setStrokeWidth(@Dimension int width) { - mStrokeWidth = width; - return this; - } - - public ShapeSelector setDefaultStrokeColor(@ColorInt int color) { - mDefaultStrokeColor = color; - if (!hasSetDisabledStrokeColor) - mDisabledStrokeColor = color; - if (!hasSetPressedStrokeColor) - mPressedStrokeColor = color; - if (!hasSetSelectedStrokeColor) - mSelectedStrokeColor = color; - if (!hasSetFocusedStrokeColor) - mFocusedStrokeColor = color; - return this; - } - - public ShapeSelector setDisabledStrokeColor(@ColorInt int color) { - mDisabledStrokeColor = color; - hasSetDisabledStrokeColor = true; - return this; - } - - public ShapeSelector setPressedStrokeColor(@ColorInt int color) { - mPressedStrokeColor = color; - hasSetPressedStrokeColor = true; - return this; - } - - public ShapeSelector setSelectedStrokeColor(@ColorInt int color) { - mSelectedStrokeColor = color; - hasSetSelectedStrokeColor = true; - return this; - } - - public ShapeSelector setFocusedStrokeColor(@ColorInt int color) { - mFocusedStrokeColor = color; - hasSetFocusedStrokeColor = true; - return this; - } - - public ShapeSelector setCornerRadius(@Dimension int radius) { - mCornerRadius = radius; - return this; - } - - public StateListDrawable create() { - StateListDrawable selector = new StateListDrawable(); - - //enabled = false - if (hasSetDisabledBgColor || hasSetDisabledStrokeColor) { - GradientDrawable disabledShape = getItemShape(mShape, mCornerRadius, - mDisabledBgColor, mStrokeWidth, mDisabledStrokeColor); - selector.addState(new int[]{-android.R.attr.state_enabled}, disabledShape); - } - - //pressed = true - if (hasSetPressedBgColor || hasSetPressedStrokeColor) { - GradientDrawable pressedShape = getItemShape(mShape, mCornerRadius, - mPressedBgColor, mStrokeWidth, mPressedStrokeColor); - selector.addState(new int[]{android.R.attr.state_pressed}, pressedShape); - } - - //selected = true - if (hasSetSelectedBgColor || hasSetSelectedStrokeColor) { - GradientDrawable selectedShape = getItemShape(mShape, mCornerRadius, - mSelectedBgColor, mStrokeWidth, mSelectedStrokeColor); - selector.addState(new int[]{android.R.attr.state_selected}, selectedShape); - } - - //focused = true - if (hasSetFocusedBgColor || hasSetFocusedStrokeColor) { - GradientDrawable focusedShape = getItemShape(mShape, mCornerRadius, - mFocusedBgColor, mStrokeWidth, mFocusedStrokeColor); - selector.addState(new int[]{android.R.attr.state_focused}, focusedShape); - } - - //default - GradientDrawable defaultShape = getItemShape(mShape, mCornerRadius, - mDefaultBgColor, mStrokeWidth, mDefaultStrokeColor); - selector.addState(new int[]{}, defaultShape); - - return selector; - } - - private GradientDrawable getItemShape(int shape, int cornerRadius, - int solidColor, int strokeWidth, int strokeColor) { - GradientDrawable drawable = new GradientDrawable(); - drawable.setShape(shape); - drawable.setStroke(strokeWidth, strokeColor); - drawable.setCornerRadius(cornerRadius); - drawable.setColor(solidColor); - return drawable; - } -} diff --git a/app/src/main/java/com/kunfei/bookshelf/utils/Theme/views/ATEAccentBgTextView.java b/app/src/main/java/com/kunfei/bookshelf/utils/Theme/views/ATEAccentBgTextView.java index 0ae7d05342..998ecbe52d 100644 --- a/app/src/main/java/com/kunfei/bookshelf/utils/Theme/views/ATEAccentBgTextView.java +++ b/app/src/main/java/com/kunfei/bookshelf/utils/Theme/views/ATEAccentBgTextView.java @@ -5,7 +5,8 @@ import android.util.AttributeSet; import com.kunfei.bookshelf.utils.ColorUtil; -import com.kunfei.bookshelf.utils.ShapeSelector; +import com.kunfei.bookshelf.utils.ScreenUtils; +import com.kunfei.bookshelf.utils.Selector; import com.kunfei.bookshelf.utils.Theme.ThemeStore; import androidx.appcompat.widget.AppCompatTextView; @@ -27,8 +28,8 @@ public ATEAccentBgTextView(Context context, AttributeSet attrs, int defStyleAttr } private void init(Context context, AttributeSet attrs) { - setBackground(ShapeSelector.newShapeSelector() - .setCornerRadius(5) + setBackground(Selector.shapeBuild() + .setCornerRadius(ScreenUtils.dpToPx(3)) .setDefaultBgColor(ThemeStore.accentColor(context)) .setPressedBgColor(ColorUtil.darkenColor(ThemeStore.accentColor(context))) .create()); diff --git a/app/src/main/java/com/kunfei/bookshelf/utils/Theme/views/ATEAccentStrokeTextView.java b/app/src/main/java/com/kunfei/bookshelf/utils/Theme/views/ATEAccentStrokeTextView.java new file mode 100644 index 0000000000..7093a6b696 --- /dev/null +++ b/app/src/main/java/com/kunfei/bookshelf/utils/Theme/views/ATEAccentStrokeTextView.java @@ -0,0 +1,42 @@ +package com.kunfei.bookshelf.utils.Theme.views; + +import android.content.Context; +import android.util.AttributeSet; + +import com.kunfei.bookshelf.R; +import com.kunfei.bookshelf.utils.ScreenUtils; +import com.kunfei.bookshelf.utils.Selector; +import com.kunfei.bookshelf.utils.Theme.ThemeStore; + +import androidx.appcompat.widget.AppCompatTextView; + +public class ATEAccentStrokeTextView extends AppCompatTextView { + public ATEAccentStrokeTextView(Context context) { + super(context); + init(context, null); + } + + public ATEAccentStrokeTextView(Context context, AttributeSet attrs) { + super(context, attrs); + init(context, attrs); + } + + public ATEAccentStrokeTextView(Context context, AttributeSet attrs, int defStyleAttr) { + super(context, attrs, defStyleAttr); + init(context, attrs); + } + + private void init(Context context, AttributeSet attrs) { + setBackground(Selector.shapeBuild() + .setCornerRadius(ScreenUtils.dpToPx(3)) + .setStrokeWidth(ScreenUtils.dpToPx(1)) + .setDisabledStrokeColor(context.getResources().getColor(R.color.md_grey_500)) + .setDefaultStrokeColor(ThemeStore.accentColor(context)) + .setPressedBgColor(context.getResources().getColor(R.color.transparent30)) + .create()); + setTextColor(Selector.colorBuild() + .setDefaultColor(ThemeStore.accentColor(context)) + .setDisabledColor(context.getResources().getColor(R.color.md_grey_500)) + .create()); + } +} diff --git a/app/src/main/java/com/kunfei/bookshelf/view/activity/ImportBookActivity.java b/app/src/main/java/com/kunfei/bookshelf/view/activity/ImportBookActivity.java index 9f7b64e2a4..52cf3ac470 100644 --- a/app/src/main/java/com/kunfei/bookshelf/view/activity/ImportBookActivity.java +++ b/app/src/main/java/com/kunfei/bookshelf/view/activity/ImportBookActivity.java @@ -2,8 +2,8 @@ import android.view.Menu; import android.view.MenuItem; -import android.widget.Button; import android.widget.CheckBox; +import android.widget.TextView; import com.kunfei.bookshelf.R; import com.kunfei.bookshelf.base.BaseTabActivity; @@ -36,9 +36,9 @@ public class ImportBookActivity extends BaseTabActivity - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_import_book.xml b/app/src/main/res/layout/activity_import_book.xml index a1be587042..feb0f7e16e 100644 --- a/app/src/main/res/layout/activity_import_book.xml +++ b/app/src/main/res/layout/activity_import_book.xml @@ -46,27 +46,25 @@ android:text="@string/select_all" android:textColor="@color/tv_text_default" /> -