电量显示问题 #232

app/src/main/res/layout/view_battery.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
+    android:layout_width="match_parent"
+    android:layout_height="20dp"
+    android:gravity="center_vertical"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <ImageView
@@ -21,76 +22,77 @@
         android:id="@+id/battery_text"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:includeFontPadding="false"
+        android:gravity="center_vertical"
         android:maxLines="1"
         android:ellipsize="end"
         android:textSize="11sp"
         android:text="@string/text"
-        android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@id/arrow_icon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        android:textStyle="bold" />
 
-    <TextView
-        android:id="@+id/battery_text_inner"
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_marginEnd="2.4dp"
-        android:layout_marginBottom="0.8dp"
-        android:textSize="8sp"
-        android:text="@string/text"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="@id/battery_icon"
-        app:layout_constraintEnd_toEndOf="@id/battery_icon"
-        app:layout_constraintTop_toTopOf="@id/battery_icon"
-        app:layout_constraintBottom_toBottomOf="@id/battery_icon"
-        tools:ignore="SmallSp" />
+        android:layout_gravity="center_vertical">
 
-    <ImageView
-        android:id="@+id/battery_icon"
-        android:layout_width="28dp"
-        android:layout_height="12dp"
-        android:layout_marginStart="4dp"
-        android:scaleType="centerCrop"
-        android:src="@drawable/ic_battery"
-        app:layout_constraintStart_toEndOf="@id/battery_text"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        <TextView
+            android:id="@+id/battery_text_inner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="2.4dp"
+            android:layout_marginBottom="0.8dp"
+            android:textSize="8sp"
+            android:text="@string/text"
+            android:textStyle="bold"
+            tools:ignore="SmallSp"
+            app:layout_constraintStart_toStartOf="@id/battery_icon"
+            app:layout_constraintEnd_toEndOf="@id/battery_icon"
+            app:layout_constraintTop_toTopOf="@id/battery_icon"
+            app:layout_constraintBottom_toBottomOf="@id/battery_icon"/>
 
-    <com.google.android.material.card.MaterialCardView
-        android:id="@+id/battery_fill"
-        android:layout_width="17dp"
-        android:layout_height="8dp"
-        android:visibility="gone"
-        android:layout_marginStart="4.2dp"
-        app:strokeWidth="0dp"
-        app:cardCornerRadius="1dp"
-        app:cardBackgroundColor="?attr/colorControlNormal"
-        app:layout_constraintStart_toStartOf="@id/battery_icon"
-        app:layout_constraintTop_toTopOf="@id/battery_icon"
-        app:layout_constraintBottom_toBottomOf="@id/battery_icon"/>
+        <ImageView
+            android:id="@+id/battery_icon"
+            android:layout_width="28dp"
+            android:layout_height="12dp"
+            android:layout_marginStart="4dp"
+            android:scaleType="centerCrop"
+            android:src="@drawable/ic_battery"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"/>
+
+        <com.google.android.material.card.MaterialCardView
+            android:id="@+id/battery_fill"
+            android:layout_width="17dp"
+            android:layout_height="8dp"
+            android:visibility="visible"
+            android:layout_marginStart="4.2dp"
+            app:strokeWidth="0dp"
+            app:cardCornerRadius="1dp"
+            app:cardBackgroundColor="?attr/colorControlNormal"
+            app:layout_constraintStart_toStartOf="@id/battery_icon"
+            app:layout_constraintTop_toTopOf="@id/battery_icon"
+            app:layout_constraintBottom_toBottomOf="@id/battery_icon"/>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
     <TextView
         android:id="@+id/battery_text_end"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:visibility="gone"
-        android:includeFontPadding="false"
+        android:gravity="center_vertical"
+        android:maxLines="1"
+        android:ellipsize="end"
         android:textSize="11sp"
         android:text="@string/text"
-        android:textStyle="bold"
-        app:layout_constraintStart_toEndOf="@id/battery_icon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        android:textStyle="bold" />
 
     <io.legado.app.ui.widget.BatteryViewOrgin
         android:id="@+id/battery_classic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:text="@string/text"
-        android:visibility="visible"
-        app:layout_constraintStart_toEndOf="@id/battery_icon"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"/>
+        android:visibility="visible" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+</LinearLayout>