From fb79eddc738d0e65721cc87aeeef5f804c4bffb8 Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Tue, 3 Mar 2026 17:26:51 +0800
Subject: [PATCH] Remove rikka layoutinflater and insets dependencies

These View-system utilities are no longer needed after the Compose
migration. Compose handles insets natively via WindowInsets APIs.

Made-with: Cursor
---
 app/apk/build.gradle.kts                                     | 3 ---
 .../src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt    | 5 -----
 app/gradle/libs.versions.toml                                | 5 -----
 3 files changed, 13 deletions(-)

diff --git a/app/apk/build.gradle.kts b/app/apk/build.gradle.kts
index a0edbaa31..fa799aa1c 100644
--- a/app/apk/build.gradle.kts
+++ b/app/apk/build.gradle.kts
@@ -32,9 +32,6 @@ dependencies {
     implementation(project(":core"))
     coreLibraryDesugaring(libs.jdk.libs)
 
-    implementation(libs.rikka.layoutinflater)
-    implementation(libs.rikka.insets)
-
     implementation(libs.appcompat)
     implementation(libs.material)
 
diff --git a/app/apk/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt b/app/apk/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt
index 95ac701ff..842357045 100644
--- a/app/apk/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt
+++ b/app/apk/src/main/java/com/topjohnwu/magisk/arch/UIActivity.kt
@@ -18,8 +18,6 @@ import com.topjohnwu.magisk.core.base.IActivityExtension
 import com.topjohnwu.magisk.core.isRunningAsStub
 import com.topjohnwu.magisk.core.ktx.reflectField
 import com.topjohnwu.magisk.core.wrap
-import rikka.insets.WindowInsetsHelper
-import rikka.layoutinflater.view.LayoutInflaterFactory
 
 abstract class UIActivity
     : AppCompatActivity(), ViewModelHolder, IActivityExtension {
@@ -38,9 +36,6 @@ abstract class UIActivity
     }
 
     override fun onCreate(savedInstanceState: Bundle?) {
-        layoutInflater.factory2 = LayoutInflaterFactory(delegate)
-            .addOnViewCreatedListener(WindowInsetsHelper.LISTENER)
-
         extension.onCreate(savedInstanceState)
         if (isRunningAsStub) {
             val delegate = delegate
diff --git a/app/gradle/libs.versions.toml b/app/gradle/libs.versions.toml
index 1343f3027..7462b7868 100644
--- a/app/gradle/libs.versions.toml
+++ b/app/gradle/libs.versions.toml
@@ -2,7 +2,6 @@
 kotlin = "2.3.0"
 android = "9.0.1"
 ksp = "2.3.4"
-rikka = "1.3.0"
 libsu = "6.0.0"
 okhttp = "5.3.2"
 retrofit = "3.0.0"
@@ -49,10 +48,6 @@ libsu-core = { module = "com.github.topjohnwu.libsu:core", version.ref = "libsu"
 libsu-service = { module = "com.github.topjohnwu.libsu:service", version.ref = "libsu" }
 libsu-nio = { module = "com.github.topjohnwu.libsu:nio", version.ref = "libsu" }
 
-# Rikka
-rikka-layoutinflater = { module = "dev.rikka.rikkax.layoutinflater:layoutinflater", version.ref = "rikka" }
-rikka-insets = { module = "dev.rikka.rikkax.insets:insets", version.ref = "rikka" }
-
 # Compose
 activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activity-compose" }
 compose-bom = { module = "androidx.compose:compose-bom", version.ref = "compose-bom" }