From 8f5545931da8a6cb3a4dbfdcebf7f655deeb1e45 Mon Sep 17 00:00:00 2001 From: kunfei Date: Fri, 28 Feb 2020 09:53:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/assets/updateLog.md | 4 ++ .../app/ui/widget/image/CircleImageView.kt | 40 +++++++------------ .../res/layout/dialog_read_book_style.xml | 5 +++ 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/app/src/main/assets/updateLog.md b/app/src/main/assets/updateLog.md index 8e1d73878..7bf8ec04a 100644 --- a/app/src/main/assets/updateLog.md +++ b/app/src/main/assets/updateLog.md @@ -2,6 +2,10 @@ * 旧版数据导入教程: * 先在旧版阅读(2.x)中进行备份,然后在新版阅读(3.x)【我的】->【备份与恢复】,选择【导入旧版本数据】。 +**2020/02/28** +* 解决阅读界面部分字体超出范围的问题 +* + **2020/02/27** * 修复bug,边距调节,换源等一些bug,记不清了 * 修复默认字体问题 diff --git a/app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt b/app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt index 253c1bef3..7f14686e8 100644 --- a/app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt @@ -24,7 +24,11 @@ import io.legado.app.utils.sp import kotlin.math.min import kotlin.math.pow -class CircleImageView : AppCompatImageView { +class CircleImageView(context: Context, attrs: AttributeSet) : + AppCompatImageView( + context, + attrs + ) { private val mDrawableRect = RectF() private val mBorderRect = RectF() @@ -59,10 +63,9 @@ class CircleImageView : AppCompatImageView { private var mBorderOverlay: Boolean = false var isDisableCircularTransformation: Boolean = false set(disableCircularTransformation) { - if (isDisableCircularTransformation == disableCircularTransformation) { + if (field == disableCircularTransformation) { return } - field = disableCircularTransformation initializeBitmap() } @@ -85,7 +88,6 @@ class CircleImageView : AppCompatImageView { if (circleBackgroundColor == mCircleBackgroundColor) { return } - mCircleBackgroundColor = circleBackgroundColor mCircleBackgroundPaint.color = circleBackgroundColor invalidate() @@ -117,23 +119,14 @@ class CircleImageView : AppCompatImageView { private var textColor = context.getCompatColor(R.color.tv_text_default) - constructor(context: Context) : super(context) { - init() - } - - @JvmOverloads - constructor(context: Context, attrs: AttributeSet, defStyle: Int = 0) : super( - context, - attrs, - defStyle - ) { - - val a = context.obtainStyledAttributes(attrs, R.styleable.CircleImageView, defStyle, 0) - - mBorderWidth = a.getDimensionPixelSize( - R.styleable.CircleImageView_civ_border_width, - DEFAULT_BORDER_WIDTH - ) + init { + super.setScaleType(SCALE_TYPE) + val a = context.obtainStyledAttributes(attrs, R.styleable.CircleImageView) + mBorderWidth = + a.getDimensionPixelSize( + R.styleable.CircleImageView_civ_border_width, + DEFAULT_BORDER_WIDTH + ) mBorderColor = a.getColor(R.styleable.CircleImageView_civ_border_color, DEFAULT_BORDER_COLOR) mBorderOverlay = @@ -152,11 +145,6 @@ class CircleImageView : AppCompatImageView { } a.recycle() - init() - } - - private fun init() { - super.setScaleType(SCALE_TYPE) mReady = true if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { diff --git a/app/src/main/res/layout/dialog_read_book_style.xml b/app/src/main/res/layout/dialog_read_book_style.xml index 358d68063..2e6c05061 100644 --- a/app/src/main/res/layout/dialog_read_book_style.xml +++ b/app/src/main/res/layout/dialog_read_book_style.xml @@ -269,6 +269,7 @@ android:id="@+id/bg0" android:layout_width="48dp" android:layout_height="48dp" + android:src="@drawable/image_cover_default" app:civ_border_color="@color/tv_text_default" app:civ_border_width="1dp" app:text="@string/text" @@ -281,6 +282,7 @@ android:id="@+id/bg1" android:layout_width="48dp" android:layout_height="48dp" + android:src="@drawable/image_cover_default" app:civ_border_color="@color/tv_text_default" app:civ_border_width="1dp" app:text="@string/text" @@ -293,6 +295,7 @@ android:id="@+id/bg2" android:layout_width="48dp" android:layout_height="48dp" + android:src="@drawable/image_cover_default" app:civ_border_color="@color/tv_text_default" app:civ_border_width="1dp" app:text="@string/text" @@ -305,6 +308,7 @@ android:id="@+id/bg3" android:layout_width="48dp" android:layout_height="48dp" + android:src="@drawable/image_cover_default" app:civ_border_color="@color/tv_text_default" app:civ_border_width="1dp" app:text="@string/text" @@ -317,6 +321,7 @@ android:id="@+id/bg4" android:layout_width="48dp" android:layout_height="48dp" + android:src="@drawable/image_cover_default" app:civ_border_color="@color/tv_text_default" app:civ_border_width="1dp" app:text="@string/text"