Migrate to Compose

.gitmodules

@@ -1,3 +1,3 @@
-[submodule "blockmiui"]
-	path = blockmiui
-	url = https://github.com/Block-Network/blockmiui.git
+[submodule "hyperx-compose"]
+	path = hyperx-compose
+	url = https://github.com/HowieHChen/hyperx-compose.git

app/build.gradle.kts

@@ -5,6 +5,7 @@ plugins {
     autowire(libs.plugins.org.jetbrains.kotlin.android)
     autowire(libs.plugins.org.jetbrains.kotlin.plugin.serialization)
     autowire(libs.plugins.com.google.devtools.ksp)
+    autowire(libs.plugins.org.jetbrains.kotlin.plugin.compose)
 }
 
 android {
@@ -85,17 +86,19 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_17
-        targetCompatibility = JavaVersion.VERSION_17
+        sourceCompatibility = JavaVersion.VERSION_21
+        targetCompatibility = JavaVersion.VERSION_21
     }
 
     kotlinOptions {
-        jvmTarget = JavaVersion.VERSION_17.majorVersion
+        jvmTarget = JavaVersion.VERSION_21.majorVersion
     }
 }
 
 dependencies {
-    implementation(projects.blockmiui)
+    implementation(projects.hyperxCompose)
+
+    implementation(org.jetbrains.kotlinx.kotlinx.serialization.json)
     compileOnly(de.robv.android.xposed.api)
     implementation(com.highcapable.yukihookapi.api)
     ksp(com.highcapable.yukihookapi.ksp.xposed)

app/gradle.properties

@@ -5,5 +5,5 @@ project.compileSdk=${project.targetSdk}
 project.targetSdk=35
 project.minSdk=31
 
-project.versionCode = 3000
-project.versionName = "3.0"
+project.versionCode = 3100
+project.versionName = "3.1-compose"

app/proguard-rules.pro

@@ -23,4 +23,4 @@
     *** inflate(android.view.LayoutInflater);
 }
 -keep class kotlin.Unit
--keep class com.gswxxn.restoresplashscreen.ui.BaseActivity
+-keep class com.gswxxn.restoresplashscreen.ui.MainActivity

app/src/main/AndroidManifest.xml

@@ -19,27 +19,12 @@
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/Starting">
-
-        <activity
-            android:name=".ui.AboutPageActivity"
-            android:exported="true" />
-        <activity
-            android:name=".ui.ColorSelectActivity"
-            android:exported="true" />
-        <activity
-            android:name=".ui.ConfigAppsActivity"
-            android:exported="true"
-            android:launchMode="singleTask" />
         <activity
-            android:name=".ui.SubSettings"
+            android:name=".ui.MainActivity"
             android:exported="true"
-            android:parentActivityName=".ui.MainSettingsActivity" />
-        <activity
-            android:name=".ui.MainSettingsActivity"
-            android:exported="true">
+            android:windowSoftInputMode="adjustResize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="de.robv.android.xposed.category.MODULE_SETTINGS" />
             </intent-filter>
         </activity>
@@ -49,10 +34,9 @@
             android:enabled="true"
             android:exported="true"
             android:label="@string/app_name"
-            android:targetActivity=".ui.MainSettingsActivity">
+            android:targetActivity=".ui.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity-alias>

app/src/main/java/com/gswxxn/restoresplashscreen/data/DataConst.kt

@@ -56,4 +56,10 @@ object DataConst {
     // 开发者设置
     val ENABLE_DEV_SETTINGS = PrefsData("enable_dev_settings", false)
     val DEV_ICON_ROUND_CORNER_RATE = PrefsData("dev_icon_round_corner", 25)
+    val HAZE_TINT_ALPHA_LIGHT = PrefsData("module_blur_tint_light", 60)
+    val HAZE_TINT_ALPHA_DARK = PrefsData("module_blur_tint_dark", 50)
+
+    // 模块应用设置
+    val BLUR = PrefsData("module_blur", true)
+    val SPLIT_VIEW = PrefsData("module_split", false)
 }

app/src/main/java/com/gswxxn/restoresplashscreen/data/Pages.kt

@@ -0,0 +1,24 @@
+package com.gswxxn.restoresplashscreen.data
+
+object Pages {
+    const val MAIN = "MainPage"
+    const val ABOUT = "AboutPage"
+    const val BASIC_SETTINGS = "BasicPage"
+    const val SCOPE_SETTINGS = "ScopePage"
+    const val ICON_SETTINGS = "IconPage"
+    const val BOTTOM_SETTINGS = "BottomPage"
+    const val BACKGROUND_SETTINGS = "BackgroundPage"
+    const val DISPLAY_SETTINGS = "DisplayPage"
+    const val DEVELOPER_SETTINGS = "DevPage"
+
+    const val CONFIG_CUSTOM_SCOPE = "CCustomScopePage"
+    const val CONFIG_IGNORE_APP_ICON = "CIgnoreAppIconPage"
+    const val CONFIG_HIDE_SPLASH_ICON = "CHideIconPage"
+    const val CONFIG_REMOVE_BRANDING = "CRemoveBrandingPage"
+    const val CONFIG_BACKGROUND_EXCEPT = "CBackgroundExceptPage"
+    const val CONFIG_BACKGROUND_INDIVIDUALLY = "CBgIndividualPage"
+    const val CONFIG_MIN_DURATION = "CMinDurationPage"
+    const val CONFIG_FORCE_SHOW_SPLASH = "CForceSplashPage"
+
+    const val CONFIG_COLOR_PICKER = "CColorPickerPage"
+}

app/src/main/java/com/gswxxn/restoresplashscreen/hook/systemui/IconHookHandler.kt

@@ -1,6 +1,7 @@
 package com.gswxxn.restoresplashscreen.hook.systemui
 
 import android.content.ComponentName
+import android.content.Context
 import android.content.res.Configuration
 import android.graphics.Color
 import android.graphics.Outline
@@ -10,12 +11,12 @@ import android.graphics.Shader
 import android.graphics.drawable.AdaptiveIconDrawable
 import android.graphics.drawable.ColorDrawable
 import android.graphics.drawable.Drawable
+import android.util.TypedValue
 import android.view.Gravity
 import android.view.View
 import android.view.ViewOutlineProvider
 import android.widget.FrameLayout
 import android.widget.ImageView
-import cn.fkj233.ui.activity.dp2px
 import com.gswxxn.restoresplashscreen.data.DataConst
 import com.gswxxn.restoresplashscreen.hook.NewSystemUIHooker
 import com.gswxxn.restoresplashscreen.hook.base.BaseHookHandler
@@ -348,4 +349,6 @@ object IconHookHandler : BaseHookHandler() {
         }
         return null
     }
-}
+}
+
+fun dp2px(context: Context, dpValue: Float): Int = TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dpValue, context.resources.displayMetrics).toInt()