yusheng/QieKan-3.0
1
0
Fork 0
Code Issues Pull Requests Actions 4 Packages Projects Releases 2 Wiki Activity

优化

Browse Source
This commit is contained in:
kunfei
2022-02-19 19:50:57 +08:00
parent f837628ece
commit 2015ca56cd
1 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/io/legado/app/ui/widget/BatteryView.kt
+2 -7
View File
@@ -31,7 +31,6 @@ class BatteryView @JvmOverloads constructor(
} }
} }
private var battery: Int = 0 private var battery: Int = 0
private var batteryWidth = 0
init { init {
setPadding(4.dp, 3.dp, 6.dp, 3.dp) setPadding(4.dp, 3.dp, 6.dp, 3.dp)
@@ -55,9 +54,6 @@ class BatteryView @JvmOverloads constructor(
@SuppressLint("SetTextI18n") @SuppressLint("SetTextI18n")
fun setBattery(battery: Int, text: String? = null) { fun setBattery(battery: Int, text: String? = null) {
this.battery = battery this.battery = battery
if (isBattery) {
batteryWidth = StaticLayout.getDesiredWidth(battery.toString(), paint).toInt()
}
if (text.isNullOrEmpty()) { if (text.isNullOrEmpty()) {
setText(battery.toString()) setText(battery.toString())
} else { } else {
@@ -72,9 +68,8 @@ class BatteryView @JvmOverloads constructor(
val batteryStart = layout val batteryStart = layout
.getPrimaryHorizontal(text.length - battery.toString().length) .getPrimaryHorizontal(text.length - battery.toString().length)
.toInt() + 3.dp .toInt() + 3.dp
val batteryEnd = layout val batteryEnd =
.getSecondaryHorizontal(text.length) batteryStart + StaticLayout.getDesiredWidth(battery.toString(), paint).toInt() + 4.dp
.toInt() + 6.dp
outFrame.set( outFrame.set(
batteryStart, batteryStart,
2.dp, 2.dp,