From c81241bdc4bba22027dd8addff9d8f98dc5489b4 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Wed, 15 Feb 2023 21:57:46 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BB=85=20DEBUG=20=E6=88=96=E8=87=AA?=
 =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=90=AF=E7=94=A8=E6=96=B0=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                     | 9 +++++----
 app/src/main/AndroidManifest.xml                     | 5 ++++-
 app/src/main/java/com/huanchengfly/tieba/post/App.kt | 5 ++++-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 488da5cb..837848f4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -40,8 +40,9 @@ android {
         vectorDrawables {
             useSupportLibrary true
         }
-        manifestPlaceholders  = [
-                is_self_build: "$isSelfBuild"
+        manifestPlaceholders = [
+                is_self_build: "$isSelfBuild",
+                enable_new_ui: "${debug || isSelfBuild}",
         ]
     }
     buildFeatures {
@@ -194,14 +195,14 @@ dependencies {
     implementation fileTree(include: ["*.jar"], dir: "libs")
 
     //AndroidX
-    implementation "androidx.appcompat:appcompat:1.6.0"
+    implementation "androidx.appcompat:appcompat:1.6.1"
     implementation "androidx.annotation:annotation:1.5.0"
     implementation "androidx.constraintlayout:constraintlayout:2.1.4"
     implementation "androidx.core:core-ktx:1.9.0"
     implementation 'androidx.core:core-splashscreen:1.0.0'
     implementation "androidx.preference:preference-ktx:1.2.0"
     implementation "androidx.gridlayout:gridlayout:1.0.0"
-    implementation "androidx.browser:browser:1.4.0"
+    implementation "androidx.browser:browser:1.5.0"
     implementation "androidx.viewpager2:viewpager2:1.0.0"
     implementation "androidx.palette:palette-ktx:1.0.0"
     implementation "androidx.window:window:1.0.0"
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 50efa61c..9ef79f4f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -117,6 +117,9 @@
         <meta-data
             android:name="is_self_build"
             android:value="${is_self_build}" />
+        <meta-data
+            android:name="enable_new_ui"
+            android:value="${enable_new_ui}" />
 
         <activity
             android:name=".activities.MainActivity"
@@ -140,7 +143,7 @@
         <activity
             android:name=".MainActivityV2"
             android:configChanges="screenSize|screenLayout|orientation|smallestScreenSize|keyboard|navigation|keyboardHidden"
-            android:enabled="true"
+            android:enabled="${enable_new_ui}"
             android:exported="true"
             android:icon="@mipmap/ic_launcher_new"
             android:roundIcon="@mipmap/ic_launcher_new_round"
diff --git a/app/src/main/java/com/huanchengfly/tieba/post/App.kt b/app/src/main/java/com/huanchengfly/tieba/post/App.kt
index 201d99ef..00cf4089 100644
--- a/app/src/main/java/com/huanchengfly/tieba/post/App.kt
+++ b/app/src/main/java/com/huanchengfly/tieba/post/App.kt
@@ -26,6 +26,7 @@ import com.github.panpf.sketch.decode.GifMovieDrawableDecoder
 import com.github.panpf.sketch.decode.HeifAnimatedDrawableDecoder
 import com.github.panpf.sketch.decode.WebpAnimatedDrawableDecoder
 import com.github.panpf.sketch.http.OkHttpStack
+import com.github.panpf.sketch.request.PauseLoadWhenScrollingDrawableDecodeInterceptor
 import com.huanchengfly.tieba.post.activities.BaseActivity
 import com.huanchengfly.tieba.post.components.ClipBoardLinkDetector
 import com.huanchengfly.tieba.post.components.dialogs.LoadingDialog
@@ -102,6 +103,7 @@ class App : Application(), IApp, IGetter, SketchFactory {
             setWebViewPath(this)
         }
         val isSelfBuild = applicationMetaData.getBoolean("is_self_build")
+        val enableNewUi = applicationMetaData.getBoolean("enable_new_ui")
         if (!isSelfBuild) {
             Distribute.setUpdateTrack(if (appPreferences.checkCIUpdate) UpdateTrack.PRIVATE else UpdateTrack.PUBLIC)
             Distribute.setListener(MyDistributeListener())
@@ -112,7 +114,7 @@ class App : Application(), IApp, IGetter, SketchFactory {
         }
         AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM)
         ThemeUtils.init(ThemeDelegate)
-        AppIconUtil.setIcon()
+        if (enableNewUi) AppIconUtil.setIcon()
         registerActivityLifecycleCallbacks(ClipBoardLinkDetector)
         PluginManager.init(this)
         CoroutineScope(Dispatchers.IO).apply {
@@ -702,6 +704,7 @@ class App : Application(), IApp, IGetter, SketchFactory {
             userAgent(System.getProperty("http.agent"))
         }.build())
         components {
+            addDrawableDecodeInterceptor(PauseLoadWhenScrollingDrawableDecodeInterceptor())
             addDrawableDecoder(
                 when {
                     Build.VERSION.SDK_INT >= Build.VERSION_CODES.P -> GifAnimatedDrawableDecoder.Factory()