feat: 优化代码

pull/121/head
kunfei 5 years ago
parent b15928026c
commit 8f5545931d
  1. 4
      app/src/main/assets/updateLog.md
  2. 34
      app/src/main/java/io/legado/app/ui/widget/image/CircleImageView.kt
  3. 5
      app/src/main/res/layout/dialog_read_book_style.xml

@ -2,6 +2,10 @@
* 旧版数据导入教程: * 旧版数据导入教程:
* 先在旧版阅读(2.x)中进行备份,然后在新版阅读(3.x)【我的】->【备份与恢复】,选择【导入旧版本数据】。 * 先在旧版阅读(2.x)中进行备份,然后在新版阅读(3.x)【我的】->【备份与恢复】,选择【导入旧版本数据】。
**2020/02/28**
* 解决阅读界面部分字体超出范围的问题
*
**2020/02/27** **2020/02/27**
* 修复bug,边距调节,换源等一些bug,记不清了 * 修复bug,边距调节,换源等一些bug,记不清了
* 修复默认字体问题 * 修复默认字体问题

@ -24,7 +24,11 @@ import io.legado.app.utils.sp
import kotlin.math.min import kotlin.math.min
import kotlin.math.pow import kotlin.math.pow
class CircleImageView : AppCompatImageView { class CircleImageView(context: Context, attrs: AttributeSet) :
AppCompatImageView(
context,
attrs
) {
private val mDrawableRect = RectF() private val mDrawableRect = RectF()
private val mBorderRect = RectF() private val mBorderRect = RectF()
@ -59,10 +63,9 @@ class CircleImageView : AppCompatImageView {
private var mBorderOverlay: Boolean = false private var mBorderOverlay: Boolean = false
var isDisableCircularTransformation: Boolean = false var isDisableCircularTransformation: Boolean = false
set(disableCircularTransformation) { set(disableCircularTransformation) {
if (isDisableCircularTransformation == disableCircularTransformation) { if (field == disableCircularTransformation) {
return return
} }
field = disableCircularTransformation field = disableCircularTransformation
initializeBitmap() initializeBitmap()
} }
@ -85,7 +88,6 @@ class CircleImageView : AppCompatImageView {
if (circleBackgroundColor == mCircleBackgroundColor) { if (circleBackgroundColor == mCircleBackgroundColor) {
return return
} }
mCircleBackgroundColor = circleBackgroundColor mCircleBackgroundColor = circleBackgroundColor
mCircleBackgroundPaint.color = circleBackgroundColor mCircleBackgroundPaint.color = circleBackgroundColor
invalidate() invalidate()
@ -117,20 +119,11 @@ class CircleImageView : AppCompatImageView {
private var textColor = context.getCompatColor(R.color.tv_text_default) private var textColor = context.getCompatColor(R.color.tv_text_default)
constructor(context: Context) : super(context) { init {
init() super.setScaleType(SCALE_TYPE)
} val a = context.obtainStyledAttributes(attrs, R.styleable.CircleImageView)
mBorderWidth =
@JvmOverloads a.getDimensionPixelSize(
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, R.styleable.CircleImageView_civ_border_width,
DEFAULT_BORDER_WIDTH DEFAULT_BORDER_WIDTH
) )
@ -152,11 +145,6 @@ class CircleImageView : AppCompatImageView {
} }
a.recycle() a.recycle()
init()
}
private fun init() {
super.setScaleType(SCALE_TYPE)
mReady = true mReady = true
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

@ -269,6 +269,7 @@
android:id="@+id/bg0" android:id="@+id/bg0"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:src="@drawable/image_cover_default"
app:civ_border_color="@color/tv_text_default" app:civ_border_color="@color/tv_text_default"
app:civ_border_width="1dp" app:civ_border_width="1dp"
app:text="@string/text" app:text="@string/text"
@ -281,6 +282,7 @@
android:id="@+id/bg1" android:id="@+id/bg1"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:src="@drawable/image_cover_default"
app:civ_border_color="@color/tv_text_default" app:civ_border_color="@color/tv_text_default"
app:civ_border_width="1dp" app:civ_border_width="1dp"
app:text="@string/text" app:text="@string/text"
@ -293,6 +295,7 @@
android:id="@+id/bg2" android:id="@+id/bg2"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:src="@drawable/image_cover_default"
app:civ_border_color="@color/tv_text_default" app:civ_border_color="@color/tv_text_default"
app:civ_border_width="1dp" app:civ_border_width="1dp"
app:text="@string/text" app:text="@string/text"
@ -305,6 +308,7 @@
android:id="@+id/bg3" android:id="@+id/bg3"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:src="@drawable/image_cover_default"
app:civ_border_color="@color/tv_text_default" app:civ_border_color="@color/tv_text_default"
app:civ_border_width="1dp" app:civ_border_width="1dp"
app:text="@string/text" app:text="@string/text"
@ -317,6 +321,7 @@
android:id="@+id/bg4" android:id="@+id/bg4"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:src="@drawable/image_cover_default"
app:civ_border_color="@color/tv_text_default" app:civ_border_color="@color/tv_text_default"
app:civ_border_width="1dp" app:civ_border_width="1dp"
app:text="@string/text" app:text="@string/text"

Loading…
Cancel
Save