From 860ea01f34ab3cb62333b66c0c30fe96f54cb266 Mon Sep 17 00:00:00 2001
From: HuanCheng65 <22636177+HuanCheng65@users.noreply.github.com>
Date: Thu, 5 Oct 2023 18:08:17 +0800
Subject: [PATCH] =?UTF-8?q?pref:=20=E9=BB=98=E8=AE=A4=E5=90=AF=E7=94=A8?=
 =?UTF-8?q?=E6=96=B0=E7=89=88=20UI?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                     | 1 -
 app/src/main/AndroidManifest.xml     | 9 +++++----
 app/src/main/res/values/arrays.xml   | 1 -
 app/src/main/res/xml/preferences.xml | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a9fc0b6e..c2f20af9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -43,7 +43,6 @@ android {
         }
         manifestPlaceholders = [
                 is_self_build: "$isSelfBuild",
-                enable_new_ui: "${debug || isSelfBuild}",
         ]
     }
     buildFeatures {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b159da8a..51bb4b59 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -50,10 +50,10 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_descriptor"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_launcher_new"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher_new_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         android:usesCleartextTraffic="true"
@@ -128,10 +128,11 @@
             android:value="${is_self_build}" />
         <meta-data
             android:name="enable_new_ui"
-            android:value="${enable_new_ui}" />
+            android:value="true" />
 
         <activity
             android:name=".activities.MainActivity"
+            android:enabled="false"
             android:configChanges="screenSize|screenLayout|orientation|smallestScreenSize|keyboardHidden"
             android:exported="true"
             android:icon="@mipmap/ic_launcher"
@@ -152,7 +153,7 @@
         <activity
             android:name=".MainActivityV2"
             android:configChanges="screenSize|screenLayout|orientation|smallestScreenSize|keyboard|navigation|keyboardHidden"
-            android:enabled="${enable_new_ui}"
+            android:enabled="true"
             android:exported="true"
             android:icon="@mipmap/ic_launcher_new"
             android:roundIcon="@mipmap/ic_launcher_new_round"
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index ef459175..02d01087 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -18,7 +18,6 @@
     </string-array>
 
     <string-array name="experimental_features">
-        <item>oksign_use_official_oksign</item>
         <item>checkCIUpdate</item>
     </string-array>
 
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index b8cad54f..ca7bf872 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -260,7 +260,7 @@
             android:title="@string/title_check_ci_update" />
 
         <SwitchPreference
-            android:defaultValue="false"
+            android:defaultValue="true"
             android:icon="@drawable/ic_round_fiber_new"
             android:key="enableNewUi"
             android:summary="@string/summary_enable_new_ui"