From 100b3d2216db338cc1b2ff6f966b7b728c4fd242 Mon Sep 17 00:00:00 2001
From: Invinciblelee <1760316362@qq.com>
Date: Fri, 31 May 2019 17:59:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml            | 9 +++------
 app/src/main/res/layout/activity_main.xml   | 3 ++-
 app/src/main/res/layout/activity_search.xml | 1 +
 app/src/main/res/layout/app_bar_main.xml    | 1 +
 app/src/main/res/values-v21/styles.xml      | 7 -------
 5 files changed, 7 insertions(+), 14 deletions(-)
 delete mode 100644 app/src/main/res/values-v21/styles.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d540a2f60..aa944bcdc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -25,14 +25,9 @@
             android:supportsRtl="true"
             android:theme="@style/AppTheme.Light"
             tools:ignore="AllowBackup,GoogleAppIndexingWarning">
-        <activity android:name=".ui.search.SearchActivity">
-        </activity>
-        <activity android:name=".ui.about.AboutActivity">
-        </activity>
         <activity
                 android:name=".ui.main.MainActivity"
-                android:label="@string/app_name"
-                android:theme="@style/AppTheme.Light.NoActionBar">
+                android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -40,6 +35,8 @@
             </intent-filter>
         </activity>
         <activity android:name=".ui.replacerule.ReplaceRuleActivity"/>
+        <activity android:name=".ui.search.SearchActivity"/>
+        <activity android:name=".ui.about.AboutActivity"/>
 
         <activity android:name=".help.permission.PermissionActivity"
                   android:theme="@style/Activity.Permission"/>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8e1943029..405e13f17 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -5,7 +5,7 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/drawer_layout"
         android:layout_width="match_parent" android:layout_height="match_parent"
-        android:fitsSystemWindows="true" tools:openDrawer="start">
+        tools:openDrawer="start">
 
     <include
             layout="@layout/app_bar_main"
@@ -18,6 +18,7 @@
             android:layout_height="match_parent"
             android:layout_gravity="start"
             android:fitsSystemWindows="true"
+            app:insetForeground="@color/transparent"
             app:headerLayout="@layout/nav_header_main"
             app:menu="@menu/activity_main_drawer"/>
 
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 33b3b9ddb..c09d5b9e7 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -10,6 +10,7 @@
             android:id="@+id/title_bar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:fitsSystemWindows="true"
             app:layout_constraintTop_toTopOf="parent"
             app:title="搜索"/>
 
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 5eb482eab..9de695516 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -10,6 +10,7 @@
     <io.legado.app.ui.widget.TitleBar
             android:id="@+id/title_bar"
             android:layout_width="match_parent"
+            android:fitsSystemWindows="true"
             android:layout_height="wrap_content"/>
 
     <include layout="@layout/content_main"/>
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
deleted file mode 100644
index 192fa5a8b..000000000
--- a/app/src/main/res/values-v21/styles.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<resources>
-    <style name="AppTheme.Light.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-        <item name="android:statusBarColor">@android:color/transparent</item>
-    </style>
-</resources>