diff --git a/app/src/main/java/li/songe/gkd/shizuku/ShizukuApi.kt b/app/src/main/java/li/songe/gkd/shizuku/ShizukuApi.kt index 2efbe0af..8545556c 100644 --- a/app/src/main/java/li/songe/gkd/shizuku/ShizukuApi.kt +++ b/app/src/main/java/li/songe/gkd/shizuku/ShizukuApi.kt @@ -58,7 +58,7 @@ fun IActivityTaskManager.safeGetTasks(): List? getTasksFcType = -1 LogUtils.d(DeviceInfo.instance) LogUtils.d(fcs) - ToastUtils.showShort("Shizuku获取方法签名错误,[设置-问题反馈]可反应此问题") + ToastUtils.showShort("Shizuku获取方法签名错误") } } } diff --git a/app/src/main/java/li/songe/gkd/ui/SettingsPage.kt b/app/src/main/java/li/songe/gkd/ui/SettingsPage.kt index 5bf152af..9c0ba9ec 100644 --- a/app/src/main/java/li/songe/gkd/ui/SettingsPage.kt +++ b/app/src/main/java/li/songe/gkd/ui/SettingsPage.kt @@ -1,7 +1,6 @@ package li.songe.gkd.ui import android.content.Intent -import android.net.Uri import android.provider.Settings import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -246,19 +245,6 @@ fun SettingsPage() { } Divider() - SettingItem(title = "问题反馈", onClick = { - appScope.launchTry(Dispatchers.IO) { - // ActivityNotFoundException - // https://bugly.qq.com/v2/crash-reporting/crashes/d0ce46b353/117002?pid=1 - context.startActivity( - Intent( - Intent.ACTION_VIEW, Uri.parse("https://github.com/gkd-kit/gkd") - ) - ) - } - }) - Divider() - TextSwitch(name = "保存日志", desc = "保存最近7天的日志,大概占用您5M的空间", checked = store.log2FileSwitch, diff --git a/app/src/main/java/li/songe/gkd/ui/SubsManagePage.kt b/app/src/main/java/li/songe/gkd/ui/SubsManagePage.kt index ab14ac6b..88bfae17 100644 --- a/app/src/main/java/li/songe/gkd/ui/SubsManagePage.kt +++ b/app/src/main/java/li/songe/gkd/ui/SubsManagePage.kt @@ -246,6 +246,20 @@ fun SubsManagePage() { .padding(16.dp)) Divider() } + if (subsRawVal?.supportUri != null) { + Text(text = "问题反馈", modifier = Modifier + .clickable { + menuSubItem = null + context.startActivity( + Intent( + Intent.ACTION_VIEW, Uri.parse(subsRawVal.supportUri) + ) + ) + } + .fillMaxWidth() + .padding(16.dp)) + Divider() + } if (menuSubItemVal.id != -2L) { Text(text = "删除订阅", modifier = Modifier @@ -371,16 +385,10 @@ fun SubsManagePage() { ) } }, confirmButton = { - if (showSubsRaw.supportUri != null) { - TextButton(onClick = { - context.startActivity( - Intent( - Intent.ACTION_VIEW, Uri.parse(showSubsRaw.supportUri) - ) - ) - }) { - Text(text = "问题反馈") - } + TextButton(onClick = { + setShowSubsRaw(null) + }) { + Text(text = "关闭") } }) }