From a7f840d8114f852cec8e915772b7d85a9b6638a0 Mon Sep 17 00:00:00 2001
From: ShirkNeko <109797057+ShirkNeko@users.noreply.github.com>
Date: Tue, 11 Nov 2025 16:00:54 +0800
Subject: [PATCH] =?UTF-8?q?manager:=20fix=20template=20status=20display=20?=
 =?UTF-8?q?issue=20(#2910)=20manager:=20=E4=BF=AE=E5=A4=8D=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
 =?UTF-8?q?=20(#2910)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复当 app 设置过模板后再使用自定义配置，离开页面后再次打开，管理器显示应用使用的是模板而不是自定义配置的问题

- bump AGP version

Co-authored-by: u9521 <63995396+u9521@users.noreply.github.com>
---
 .../com/sukisu/ultra/ui/screen/AppProfile.kt   | 18 +++++++++++++-----
 manager/gradle/libs.versions.toml              |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/AppProfile.kt b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/AppProfile.kt
index bb8eca00..7764cb00 100644
--- a/manager/app/src/main/java/com/sukisu/ultra/ui/screen/AppProfile.kt
+++ b/manager/app/src/main/java/com/sukisu/ultra/ui/screen/AppProfile.kt
@@ -248,7 +248,12 @@ private fun AppProfileInner(
                             ProfileBox(mode, true) {
                                 // template mode shouldn't change profile here!
                                 if (it == Mode.Default || it == Mode.Custom) {
-                                    onProfileChange(profile.copy(rootUseDefault = it == Mode.Default))
+                                    onProfileChange(
+                                        profile.copy(
+                                            rootUseDefault = it == Mode.Default,
+                                            rootTemplate = null
+                                        )
+                                    )
                                 }
                                 mode = it
                             }
@@ -479,7 +484,10 @@ private fun ProfileBox(
 
 @SuppressLint("UnusedBoxWithConstraintsScope")
 @Composable
-private fun AppMenuBox(packageName: String, content: @Composable () -> Unit) {
+private fun AppMenuBox(
+    packageName: String,
+    content: @Composable () -> Unit
+) {
     var expanded by remember { mutableStateOf(false) }
     var touchPoint: Offset by remember { mutableStateOf(Offset.Zero) }
     val density = LocalDensity.current
@@ -499,15 +507,15 @@ private fun AppMenuBox(packageName: String, content: @Composable () -> Unit) {
         content()
 
         val (offsetX, offsetY) = with(density) {
-            (touchPoint.x.toDp()) to (touchPoint.y.toDp())
+            (touchPoint.x.toDp()) to (-touchPoint.y.toDp())
         }
 
         DropdownMenu(
             expanded = expanded,
-            offset = DpOffset(offsetX, -offsetY),
+            offset = DpOffset(offsetX, offsetY),
             onDismissRequest = {
                 expanded = false
-            },
+            }
         ) {
             AppMenuOption(
                 text = stringResource(id = R.string.launch_app),
diff --git a/manager/gradle/libs.versions.toml b/manager/gradle/libs.versions.toml
index fd065596..d9e7dd22 100644
--- a/manager/gradle/libs.versions.toml
+++ b/manager/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
 [versions]
 accompanist-drawablepainter = "0.37.3"
-agp = "8.13.0"
+agp = "8.13.1"
 gson = "2.13.2"
 kotlin = "2.2.21"
 ksp = "2.2.21-2.0.4"