Merge branch 'master' into master

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

@@ -12,8 +12,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="6dp"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        android:padding="6dp">
 
         <TextView
             android:id="@+id/tv_name_title"
@@ -36,9 +36,9 @@
             android:id="@+id/iv_edit"
             android:layout_width="20dp"
             android:layout_height="20dp"
+            android:contentDescription="@string/edit"
             android:src="@drawable/ic_edit"
-            app:tint="@color/secondaryText"
-            android:contentDescription="@string/edit" />
+            app:tint="@color/secondaryText" />
 
         <Space
             android:layout_width="0dp"
@@ -59,7 +59,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="6dp"
-        android:text="@string/dark_status_icon" />
+        android:text="@string/dark_status_icon"
+        tools:ignore="TouchTargetSizeCheck" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -140,6 +141,23 @@
 
     </LinearLayout>
 
+    <TextView
+        android:id="@+id/tv_bg_alpha"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingLeft="6dp"
+        android:paddingRight="6dp"
+        android:text="@string/bg_alpha" />
+
+    <io.legado.app.lib.theme.view.ThemeSeekBar
+        android:id="@+id/sb_bg_alpha"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:min="10"
+        android:max="100"
+        android:padding="6dp"
+        tools:ignore="UnusedAttribute" />
+
     <TextView
         android:id="@+id/tv_bg_image"
         android:layout_width="match_parent"

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

@@ -1,22 +1,30 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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/page_panel"
+    android:background="@color/background"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <View
+        android:id="@+id/vw_bg"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"/>
+
     <FrameLayout
         android:id="@+id/vw_status_bar"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/ll_header"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        app:layout_constraintTop_toBottomOf="@id/vw_status_bar">
 
         <io.legado.app.ui.widget.BatteryView
             android:id="@+id/tv_header_left"
@@ -75,26 +83,31 @@
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         android:background="@color/divider"
-        android:visibility="invisible" />
+        android:visibility="invisible"
+        app:layout_constraintTop_toBottomOf="@id/ll_header"/>
 
     <io.legado.app.ui.book.read.page.ContentTextView
         android:id="@+id/content_text_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        app:layout_constraintTop_toBottomOf="@id/vw_top_divider"
+        app:layout_constraintBottom_toTopOf="@id/vw_bottom_divider"/>
 
     <View
         android:id="@+id/vw_bottom_divider"
         android:layout_width="match_parent"
         android:layout_height="0.5dp"
         android:background="@color/divider"
-        android:visibility="invisible" />
+        android:visibility="invisible"
+        app:layout_constraintBottom_toTopOf="@id/ll_footer"/>
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/ll_footer"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:gravity="center_vertical">
+        android:gravity="center_vertical"
+        app:layout_constraintBottom_toBottomOf="parent">
 
         <io.legado.app.ui.widget.BatteryView
             android:id="@+id/tv_footer_left"
@@ -148,4 +161,4 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>