From 529443c0c3478bad4ccb33c0b657e4bffbb6a136 Mon Sep 17 00:00:00 2001 From: kunfei Date: Sat, 19 Feb 2022 19:50:57 +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 --- app/src/main/java/io/legado/app/ui/widget/BatteryView.kt | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt b/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt index d07669d17..6d313db51 100644 --- a/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt +++ b/app/src/main/java/io/legado/app/ui/widget/BatteryView.kt @@ -31,7 +31,6 @@ class BatteryView @JvmOverloads constructor( } } private var battery: Int = 0 - private var batteryWidth = 0 init { setPadding(4.dp, 3.dp, 6.dp, 3.dp) @@ -55,9 +54,6 @@ class BatteryView @JvmOverloads constructor( @SuppressLint("SetTextI18n") fun setBattery(battery: Int, text: String? = null) { this.battery = battery - if (isBattery) { - batteryWidth = StaticLayout.getDesiredWidth(battery.toString(), paint).toInt() - } if (text.isNullOrEmpty()) { setText(battery.toString()) } else { @@ -72,9 +68,8 @@ class BatteryView @JvmOverloads constructor( val batteryStart = layout .getPrimaryHorizontal(text.length - battery.toString().length) .toInt() + 3.dp - val batteryEnd = layout - .getSecondaryHorizontal(text.length) - .toInt() + 6.dp + val batteryEnd = + batteryStart + StaticLayout.getDesiredWidth(battery.toString(), paint).toInt() + 4.dp outFrame.set( batteryStart, 2.dp,