合并代码

app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         android:name=".base.MyApp"
         android:allowBackup="true"
         android:icon="@mipmap/logo"
+        android:logo="@mipmap/logo"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"

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

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/ll_setting"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -83,7 +84,7 @@
     </androidx.appcompat.widget.LinearLayoutCompat>
 
 
-    <LinearLayout
+    <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="10dp">
@@ -92,34 +93,35 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
-            android:text="@string/font_size"
+            android:text="@string/page_mode"
             android:textColor="@color/smallColor"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
             android:textSize="16sp" />
 
         <RadioGroup
             android:id="@+id/read_setting_rg_page_mode"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_margin="10dp"
+            android:orientation="horizontal"
-            android:orientation="horizontal">
+            android:layout_margin="10dp">
 
             <androidx.appcompat.widget.AppCompatRadioButton
                 android:id="@+id/read_setting_rb_simulation"
                 android:layout_width="0dp"
                 android:layout_height="35dp"
-                android:layout_marginEnd="18dp"
                 android:layout_weight="1"
                 android:button="@null"
-                android:gravity="center"
+                android:gravity="center|end"
                 android:text="@string/simulation"
                 android:textColor="@drawable/text_color"
                 android:textSize="14sp" />
 
             <androidx.appcompat.widget.AppCompatRadioButton
                 android:id="@+id/read_setting_rb_cover"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="35dp"
-                android:layout_marginEnd="18dp"
                 android:layout_weight="1"
                 android:button="@null"
                 android:gravity="center"
@@ -132,7 +134,6 @@
                 android:id="@+id/read_setting_rb_scroll"
                 android:layout_width="0dp"
                 android:layout_height="35dp"
-                android:layout_marginEnd="18dp"
                 android:layout_weight="1"
                 android:button="@null"
                 android:gravity="center"
@@ -146,14 +147,14 @@
                 android:layout_height="35dp"
                 android:layout_weight="1"
                 android:button="@null"
-                android:gravity="center"
+                android:gravity="center|start"
                 android:text="@string/none"
                 android:textColor="@drawable/text_color"
                 android:textSize="14sp" />
         </RadioGroup>
 
 
-    </LinearLayout>
+    </androidx.constraintlayout.widget.ConstraintLayout>
 
 
     <androidx.appcompat.widget.LinearLayoutCompat

app/src/main/res/values-night/strings.xml

@@ -143,6 +143,7 @@
     <string name="good_text">如果您觉得我们做的还不错请给我们一个五星好评鼓励一下</string>
 
     <!--  翻页  -->
+    <string name="page_mode">翻页</string>
     <string name="simulation">仿真</string>
     <string name="cover">覆盖</string>
     <string name="scroll">滚动</string>

app/src/main/res/values-zh-rTW-night/strings.xml

@@ -140,6 +140,7 @@
     <string name="good_text">如果您覺得我們做的還不錯請給我們壹個五星好評鼓勵壹下</string>
 
     <!--  翻页  -->
+    <string name="page_mode">翻页</string>
     <string name="simulation">仿真</string>
     <string name="cover">覆盖</string>
     <string name="scroll">滚动</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -142,6 +142,7 @@
     <string name="good_text">如果您覺得我們做的還不錯請給我們壹個五星好評鼓勵壹下</string>
 
     <!--  翻页  -->
+    <string name="page_mode">翻页</string>
     <string name="simulation">仿真</string>
     <string name="cover">覆盖</string>
     <string name="scroll">滚动</string>

app/src/main/res/values/strings.xml

@@ -145,6 +145,7 @@
     <string name="good_text">如果您觉得我们做的还不错请给我们一个五星好评鼓励一下</string>
 
     <!--  翻页  -->
+    <string name="page_mode">翻页</string>
     <string name="simulation">仿真</string>
     <string name="cover">覆盖</string>
     <string name="scroll">滚动</string>