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

优化顶栏与底栏布局，现在，中间有控件时，不会被右侧过长控件遮挡

Browse Source
This commit is contained in:
HapeLee
2025-11-05 00:14:27 +08:00
parent d815c54a03
commit 3d0b9943ea
3 changed files with 103 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/layout/activity_chapter_list.xml
+23 -6
View File
@@ -22,14 +22,31 @@
app:navigationIcon="@drawable/ic_arrow_back"
app:title="" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:background="?attr/colorSurface"
app:tabGravity="fill"
app:tabMode="fixed" />
android:layout_marginHorizontal="16dp">
<com.google.android.material.tabs.TabLayout
android:id="@+id/tab_layout"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/colorSurface"
app:tabGravity="fill"
app:tabMode="fixed" />
<com.google.android.material.button.MaterialButton
android:layout_width="32dp"
android:layout_height="32dp"
android:clickable="true"
android:checkable="true"
app:icon="@drawable/ic_toc"
style="@style/Widget.Material3Expressive.Button.IconButton.Tonal"/>
</LinearLayout>
</com.google.android.material.appbar.AppBarLayout>
app/src/main/res/layout/view_battery.xml
+52 -49
View File
@@ -1,7 +1,7 @@
<?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_width="match_parent"
android:layout_height="wrap_content"
xmlns:app="http://schemas.android.com/apk/res-auto">
@@ -21,52 +21,61 @@
android:id="@+id/battery_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:maxLines="1"
android:ellipsize="end"
android:includeFontPadding="false"
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="1.2dp"
app:strokeWidth="0dp"
app:cardCornerRadius="1dp"
app:cardBackgroundColor="?attr/colorControlNormal"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="@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"
@@ -76,19 +85,13 @@
android:includeFontPadding="false"
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>
app/src/main/res/layout/view_book_page.xml
+28 -35
View File
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/vw_root"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -24,40 +23,37 @@
android:id="@+id/tv_header_left"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_header_right"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/barrier"
app:layout_constraintTop_toTopOf="parent" />
<io.legado.app.ui.widget.BatteryView
android:id="@+id/tv_header_middle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<io.legado.app.ui.widget.BatteryView
android:id="@+id/tv_header_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:ellipsize="end"
android:singleLine="true"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlHardcoded,RtlSymmetry" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="start"
app:barrierAllowsGoneWidgets="false"
app:constraint_referenced_ids="tv_header_middle,tv_header_right" />
</androidx.constraintlayout.widget.ConstraintLayout>
@@ -96,40 +92,37 @@
android:id="@+id/tv_footer_left"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintHorizontal_weight="1"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toLeftOf="@+id/tv_footer_right"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@+id/barrier_footer"
app:layout_constraintTop_toTopOf="parent" />
<io.legado.app.ui.widget.BatteryView
android:id="@+id/tv_footer_middle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:singleLine="true"
android:textSize="12sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<io.legado.app.ui.widget.BatteryView
android:id="@+id/tv_footer_right"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="3dp"
android:ellipsize="end"
android:singleLine="true"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="RtlHardcoded,RtlSymmetry,SmallSp" />
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/barrier_footer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="start"
app:barrierAllowsGoneWidgets="false"
app:constraint_referenced_ids="tv_footer_middle,tv_footer_right" />
</androidx.constraintlayout.widget.ConstraintLayout>