From 6e3c50bd5299e5cf13284fe1c8ac83dacd6e1d8a Mon Sep 17 00:00:00 2001
From: kunfei <gekunfei@live.com>
Date: Tue, 11 Feb 2020 16:37:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=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               | 14 ++++++++++++--
 .../legado/app/ui/welcome/WelcomeActivity.kt   | 18 +++++++-----------
 .../main/res/layout/activity_replace_rule.xml  | 18 +++++++++---------
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0f1381bf6..9d12312e4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -27,9 +27,19 @@
         android:theme="@style/AppTheme.Light"
         android:requestLegacyExternalStorage="false"
         tools:ignore="AllowBackup,GoogleAppIndexingWarning,UnusedAttribute">
+        <activity android:name=".ui.welcome.WelcomeActivity">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+            <meta-data
+                android:name="android.app.shortcuts"
+                android:resource="@xml/shortcuts"
+                android:launchMode="singleTask" />
+        </activity>
         <activity
-            android:name=".ui.welcome.WelcomeActivity"
-            android:label="@string/app_name">
+            android:name=".ui.welcome.Icon1Activity"
+            android:enabled="false">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
diff --git a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
index 4a1e12f82..90245b5bc 100644
--- a/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
+++ b/app/src/main/java/io/legado/app/ui/welcome/WelcomeActivity.kt
@@ -13,7 +13,7 @@ import io.legado.app.utils.getPrefBoolean
 import kotlinx.android.synthetic.main.activity_welcome.*
 import org.jetbrains.anko.startActivity
 
-class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
+open class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
 
     override fun onActivityCreated(savedInstanceState: Bundle?) {
         iv_bg.setColorFilter(accentColor)
@@ -37,19 +37,15 @@ class WelcomeActivity : BaseActivity(R.layout.activity_welcome) {
                 finish()
             }
 
-            override fun onAnimationEnd(animation: Animator) {
+            override fun onAnimationEnd(animation: Animator) = Unit
 
-            }
-
-            override fun onAnimationCancel(animation: Animator) {
-
-            }
+            override fun onAnimationCancel(animation: Animator) = Unit
 
-            override fun onAnimationRepeat(animation: Animator) {
-
-            }
+            override fun onAnimationRepeat(animation: Animator) = Unit
         })
         welAnimator.start()
     }
 
-}
\ No newline at end of file
+}
+
+class Icon1Activity : WelcomeActivity()
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_replace_rule.xml b/app/src/main/res/layout/activity_replace_rule.xml
index cefeba9d0..32c44cc24 100644
--- a/app/src/main/res/layout/activity_replace_rule.xml
+++ b/app/src/main/res/layout/activity_replace_rule.xml
@@ -1,27 +1,27 @@
 <?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"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".ui.replacerule.ReplaceRuleActivity">
 
     <io.legado.app.ui.widget.TitleBar
         android:id="@+id/title_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:contentLayout="@layout/view_search"
-        app:layout_constraintTop_toTopOf="parent"
         app:title="@string/replace_purify" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/title_bar"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintVertical_bias="0.0" />
+        android:layout_weight="1" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
+    <io.legado.app.ui.widget.SelectActionBar
+        android:id="@+id/select_action_bar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+</LinearLayout>