From ea3550a622efd1601feccb2557e0abd5d3057343 Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Sat, 19 Feb 2022 19:32:07 +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

---
 .../legado/app/ui/book/read/page/PageView.kt  |  4 ++--
 .../io/legado/app/ui/widget/BatteryView.kt    | 23 ++++++++++++++-----
 2 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
index b37676091..ce67f6c8d 100644
--- a/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
+++ b/app/src/main/java/io/legado/app/ui/book/read/page/PageView.kt
@@ -200,14 +200,14 @@ class PageView(context: Context) : FrameLayout(context) {
 
     fun upBattery(battery: Int) {
         this.battery = battery
-        tvBattery?.setTextAndBattery(battery = battery)
+        tvBattery?.setBattery(battery)
         upTimeBattery()
     }
 
     @SuppressLint("SetTextI18n")
     private fun upTimeBattery() {
         val time = timeFormat.format(Date(System.currentTimeMillis()))
-        tvTimeBattery?.setTextAndBattery(time, battery)
+        tvTimeBattery?.setBattery(battery, time)
     }
 
     fun setContent(textPage: TextPage, resetPageOffset: Boolean = true) {
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 e076ff0ab..71b58edca 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
@@ -53,28 +53,39 @@ class BatteryView @JvmOverloads constructor(
     }
 
     @SuppressLint("SetTextI18n")
-    fun setTextAndBattery(text: String = "", battery: Int = 0) {
+    fun setBattery(battery: Int, text: String? = null) {
         this.battery = battery
         if (isBattery) {
             batteryWidth = StaticLayout.getDesiredWidth(battery.toString(), paint).toInt()
         }
-        setText("$text  $battery")
+        if (text.isNullOrEmpty()) {
+            setText(battery.toString())
+        } else {
+            setText("$text  $battery")
+        }
     }
 
     override fun onDraw(canvas: Canvas) {
         super.onDraw(canvas)
         if (!isBattery) return
+        layout.getLineBounds(0, outFrame)
+        val batteryStart = layout
+            .getPrimaryHorizontal(text.length - battery.toString().length)
+            .toInt() + 3.dp
+        val batteryEnd = layout
+            .getSecondaryHorizontal(text.length)
+            .toInt() + 6.dp
         outFrame.set(
-            width - 6.dp - batteryWidth,
+            batteryStart,
             1.dp,
-            width - 3.dp,
+            batteryEnd,
             height - 1.dp
         )
         val dj = (outFrame.bottom - outFrame.top) / 3
         polar.set(
-            outFrame.right,
+            batteryEnd,
             outFrame.top + dj,
-            width - 1.dp,
+            batteryEnd + 2.dp,
             outFrame.bottom - dj
         )
         batteryPaint.style = Paint.Style.STROKE