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 63d4c6ca7..ba469cc6d 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 @@ -178,10 +178,10 @@ class PageView(context: Context) : FrameLayout(context) { } ReadTipConfig.apply { tvHeaderLeft.isGone = tipHeaderLeft == none - tvHeaderRight.isGone = tipHeaderRight == none + tvHeaderRight.isInvisible = tipHeaderRight == none tvHeaderMiddle.isGone = tipHeaderMiddle == none - tvFooterLeft.isInvisible = tipFooterLeft == none - tvFooterRight.isGone = tipFooterRight == none + tvFooterLeft.isGone = tipFooterLeft == none + tvFooterRight.isInvisible = tipFooterRight == none tvFooterMiddle.isGone = tipFooterMiddle == none } tvTitle = getTipView(ReadTipConfig.chapterTitle)?.apply { diff --git a/app/src/main/res/layout/view_battery.xml b/app/src/main/res/layout/view_battery.xml index bdbbce378..cf418baa3 100644 --- a/app/src/main/res/layout/view_battery.xml +++ b/app/src/main/res/layout/view_battery.xml @@ -1,7 +1,7 @@ - @@ -21,61 +21,54 @@ android:id="@+id/battery_text" android:layout_width="wrap_content" android:layout_height="match_parent" - android:gravity="center_vertical" + android:includeFontPadding="false" android:maxLines="1" android:ellipsize="end" - android:includeFontPadding="false" android:textSize="11sp" android:text="@string/text" - android:textStyle="bold" /> + android:textStyle="bold" + app:layout_constraintStart_toEndOf="@id/arrow_icon" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="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:textStyle="bold" + app:layout_constraintStart_toEndOf="@id/battery_icon" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent"/> + android:visibility="visible" + app:layout_constraintStart_toEndOf="@id/battery_icon" + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toBottomOf="parent"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/version.properties b/app/version.properties index 3f1967a6b..82abe1f36 100644 --- a/app/version.properties +++ b/app/version.properties @@ -1,4 +1,4 @@ VERSION_MAJOR=3 VERSION_MINOR=26 VERSION_PATCH=2 -VERSION_SUFFIX=-beta.7 \ No newline at end of file +VERSION_SUFFIX=-beta.8 \ No newline at end of file