fix: change :hidden_api namespace and remove SafeR

lisonge · lisonge · commit 4d69ef47ced5 · 2025-12-08T18:25:09.000+08:00
diff --git a/app/src/main/kotlin/li/songe/gkd/App.kt b/app/src/main/kotlin/li/songe/gkd/App.kt
@@ -30,7 +30,6 @@ import li.songe.gkd.shizuku.initShizuku
 import li.songe.gkd.store.initStore
 import li.songe.gkd.util.AndroidTarget
 import li.songe.gkd.util.PKG_FLAGS
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.initAppState
 import li.songe.gkd.util.initSubsState
 import li.songe.gkd.util.initToast
@@ -69,7 +68,7 @@ data class AppMeta(
     val versionCode: Int = selfAppInfo.versionCode,
     val versionName: String = selfAppInfo.versionName!!,
     val appId: String = app.packageName!!,
-    val appName: String = app.getString(SafeR.app_name)
+    val appName: String = app.getString(R.string.app_name)
 ) {
     val commitUrl = "https://github.com/gkd-kit/gkd/".run {
         plus(if (tagName != null) "tree/$tagName" else "commit/$commitId")
diff --git a/app/src/main/kotlin/li/songe/gkd/notif/Notif.kt b/app/src/main/kotlin/li/songe/gkd/notif/Notif.kt
@@ -13,6 +13,7 @@ import androidx.core.net.toUri
 import kotlinx.atomicfu.atomic
 import li.songe.gkd.META
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.app
 import li.songe.gkd.permission.notificationState
 import li.songe.gkd.service.ActivityService
@@ -21,7 +22,6 @@ import li.songe.gkd.service.EventService
 import li.songe.gkd.service.HttpService
 import li.songe.gkd.service.ScreenshotService
 import li.songe.gkd.util.AndroidTarget
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.componentName
 import kotlin.reflect.KClass
 
@@ -31,7 +31,7 @@ private val pendingIntentReqId = atomic(0)
 data class Notif(
     val channel: NotifChannel = NotifChannel.Default,
     val id: Int,
-    val smallIcon: Int = SafeR.ic_status,
+    val smallIcon: Int = R.drawable.ic_status,
     val title: String,
     val text: String? = null,
     val ongoing: Boolean = true,
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AboutPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/AboutPage.kt
@@ -59,6 +59,7 @@ import kotlinx.coroutines.flow.update
 import kotlinx.coroutines.isActive
 import li.songe.gkd.META
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.app
 import li.songe.gkd.store.storeFlow
 import li.songe.gkd.ui.component.PerfIcon
@@ -78,7 +79,6 @@ import li.songe.gkd.ui.style.titleItemPadding
 import li.songe.gkd.util.ISSUES_URL
 import li.songe.gkd.util.PLAY_STORE_URL
 import li.songe.gkd.util.REPOSITORY_URL
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.ShortUrlSet
 import li.songe.gkd.util.UpdateChannelOption
 import li.songe.gkd.util.buildLogFile
@@ -476,9 +476,9 @@ private fun AnimatedLogoIcon(
     modifier: Modifier = Modifier
 ) {
     val darkTheme = LocalDarkTheme.current
-    val colorRid = if (darkTheme) SafeR.better_white else SafeR.better_black
+    val colorRid = if (darkTheme) R.color.better_white else R.color.better_black
     var atEnd by remember { mutableStateOf(false) }
-    val animation = AnimatedImageVector.animatedVectorResource(id = SafeR.ic_anim_logo)
+    val animation = AnimatedImageVector.animatedVectorResource(id = R.drawable.ic_anim_logo)
     val painter = rememberAnimatedVectorPainter(
         animation,
         atEnd
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/AdvancedPage.kt
@@ -54,6 +54,7 @@ import com.ramcosta.composedestinations.generated.destinations.ActivityLogPageDe
 import com.ramcosta.composedestinations.generated.destinations.SnapshotPageDestination
 import kotlinx.coroutines.flow.update
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.permission.canDrawOverlaysState
 import li.songe.gkd.permission.foregroundServiceSpecialUseState
 import li.songe.gkd.permission.notificationState
@@ -85,7 +86,6 @@ import li.songe.gkd.ui.style.iconTextSize
 import li.songe.gkd.ui.style.itemPadding
 import li.songe.gkd.ui.style.titleItemPadding
 import li.songe.gkd.util.AndroidTarget
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.ShortUrlSet
 import li.songe.gkd.util.appInfoMapFlow
 import li.songe.gkd.util.launchAsFn
@@ -530,7 +530,7 @@ fun AdvancedPage() {
                         onClick = throttle {
                             showCaptureScreenshotDlg = true
                         },
-                        id = SafeR.ic_page_info,
+                        id = R.drawable.ic_page_info,
                         contentDescription = "截屏快照设置",
                     )
                 },
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/BlockA11yAppListPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/BlockA11yAppListPage.kt
@@ -44,6 +44,7 @@ import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import kotlinx.coroutines.flow.update
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.data.AppInfo
 import li.songe.gkd.service.fixRestartService
 import li.songe.gkd.store.blockA11yAppListFlow
@@ -77,7 +78,6 @@ import li.songe.gkd.ui.style.menuPadding
 import li.songe.gkd.ui.style.scaffoldPadding
 import li.songe.gkd.util.AppListString
 import li.songe.gkd.util.AppSortOption
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.launchAsFn
 import li.songe.gkd.util.mapState
 import li.songe.gkd.util.switchItem
@@ -211,7 +211,7 @@ fun BlockA11yAppListPage() {
                                                     showSearchBar = true
                                                 }
                                             },
-                                            id = SafeR.ic_anim_search_close,
+                                            id = R.drawable.ic_anim_search_close,
                                             atEnd = showSearchBar,
                                         )
                                         PerfIconButton(imageVector = PerfIcon.Sort, onClick = {
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/SubsAppListPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/SubsAppListPage.kt
@@ -35,6 +35,7 @@ import com.ramcosta.composedestinations.generated.destinations.SubsAppGroupListP
 import com.ramcosta.composedestinations.generated.destinations.UpsertRuleGroupPageDestination
 import kotlinx.coroutines.flow.update
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.data.AppConfig
 import li.songe.gkd.db.DbSet
 import li.songe.gkd.store.storeFlow
@@ -58,7 +59,6 @@ import li.songe.gkd.ui.style.menuPadding
 import li.songe.gkd.ui.style.scaffoldPadding
 import li.songe.gkd.util.AppSortOption
 import li.songe.gkd.util.LOCAL_SUBS_IDS
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.launchAsFn
 import li.songe.gkd.util.throttle
 
@@ -135,7 +135,7 @@ fun SubsAppListPage(
                             showSearchBar = true
                         }
                     },
-                    id = SafeR.ic_anim_search_close,
+                    id = R.drawable.ic_anim_search_close,
                     atEnd = showSearchBar,
                 )
                 PerfIconButton(
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/SubsGlobalGroupExcludePage.kt b/app/src/main/kotlin/li/songe/gkd/ui/SubsGlobalGroupExcludePage.kt
@@ -37,6 +37,7 @@ import androidx.lifecycle.viewmodel.compose.viewModel
 import com.ramcosta.composedestinations.annotation.Destination
 import com.ramcosta.composedestinations.annotation.RootGraph
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.a11y.launcherAppId
 import li.songe.gkd.data.ExcludeData
 import li.songe.gkd.data.RawSubscription
@@ -75,7 +76,6 @@ import li.songe.gkd.ui.style.itemPadding
 import li.songe.gkd.ui.style.menuPadding
 import li.songe.gkd.ui.style.scaffoldPadding
 import li.songe.gkd.util.AppSortOption
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.launchAsFn
 import li.songe.gkd.util.systemAppsFlow
 import li.songe.gkd.util.throttle
@@ -205,7 +205,7 @@ fun SubsGlobalGroupExcludePage(subsItemId: Long, groupKey: Int) {
                                             showSearchBar = true
                                         }
                                     },
-                                    id = SafeR.ic_anim_search_close,
+                                    id = R.drawable.ic_anim_search_close,
                                     atEnd = showSearchBar,
                                 )
                                 var expanded by remember { mutableStateOf(false) }
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/component/AnimatedIcon.kt b/app/src/main/kotlin/li/songe/gkd/ui/component/AnimatedIcon.kt
@@ -10,7 +10,7 @@ import androidx.compose.material3.LocalContentColor
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
-import li.songe.gkd.util.SafeR
+import li.songe.gkd.R
 
 @Composable
 private fun AnimatedIcon(
@@ -58,6 +58,6 @@ fun AnimatedIconButton(
 }
 
 private fun getIconDesc(@DrawableRes id: Int, atEnd: Boolean): String? = when (id) {
-    SafeR.ic_anim_search_close -> if (atEnd) "关闭搜索" else "打开搜索"
+    R.drawable.ic_anim_search_close -> if (atEnd) "关闭搜索" else "打开搜索"
     else -> null
 }
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/AppListPage.kt
@@ -48,6 +48,7 @@ import com.ramcosta.composedestinations.generated.destinations.AppConfigPageDest
 import com.ramcosta.composedestinations.generated.destinations.EditBlockAppListPageDestination
 import kotlinx.coroutines.flow.update
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.data.AppInfo
 import li.songe.gkd.permission.canQueryPkgState
 import li.songe.gkd.store.blockMatchAppListFlow
@@ -73,7 +74,6 @@ import li.songe.gkd.ui.style.EmptyHeight
 import li.songe.gkd.ui.style.appItemPadding
 import li.songe.gkd.ui.style.menuPadding
 import li.songe.gkd.util.AppSortOption
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.appListAuthAbnormalFlow
 import li.songe.gkd.util.getUpDownTransform
 import li.songe.gkd.util.ruleSummaryFlow
@@ -201,7 +201,7 @@ fun useAppListPage(): ScaffoldExt {
                             vm.showSearchBarFlow.value = true
                         }
                     },
-                    id = SafeR.ic_anim_search_close,
+                    id = R.drawable.ic_anim_search_close,
                     atEnd = showSearchBar,
                     contentDescription = if (showSearchBar) "关闭搜索" else "搜索应用列表",
                 )
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/ControlPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/ControlPage.kt
@@ -41,6 +41,7 @@ import com.ramcosta.composedestinations.generated.destinations.AppConfigPageDest
 import com.ramcosta.composedestinations.generated.destinations.AuthA11YPageDestination
 import com.ramcosta.composedestinations.generated.destinations.WebViewPageDestination
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.data.SubsConfig
 import li.songe.gkd.permission.writeSecureSettingsState
 import li.songe.gkd.service.A11yService
@@ -61,7 +62,6 @@ import li.songe.gkd.ui.style.itemHorizontalPadding
 import li.songe.gkd.ui.style.itemVerticalPadding
 import li.songe.gkd.ui.style.surfaceCardColors
 import li.songe.gkd.util.HOME_PAGE_URL
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.latestRecordDescFlow
 import li.songe.gkd.util.latestRecordFlow
 import li.songe.gkd.util.launchAsFn
@@ -79,7 +79,7 @@ fun useControlPage(): ScaffoldExt {
         modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection),
         topBar = {
             PerfTopAppBar(scrollBehavior = scrollBehavior, title = {
-                Text(text = stringResource(SafeR.app_name))
+                Text(text = stringResource(R.string.app_name))
             }, actions = {
                 PerfIconButton(
                     imageVector = PerfIcon.RocketLaunch,
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/SettingsPage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/SettingsPage.kt
@@ -57,6 +57,7 @@ import kotlinx.coroutines.flow.debounce
 import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.flow.update
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.app
 import li.songe.gkd.permission.ignoreBatteryOptimizationsState
 import li.songe.gkd.permission.requiredPermission
@@ -85,7 +86,6 @@ import li.songe.gkd.ui.style.itemHorizontalPadding
 import li.songe.gkd.ui.style.titleItemPadding
 import li.songe.gkd.util.AndroidTarget
 import li.songe.gkd.util.DarkThemeOption
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.findOption
 import li.songe.gkd.util.launchAsFn
 import li.songe.gkd.util.mapState
@@ -352,7 +352,7 @@ fun useSettingsPage(): ScaffoldExt {
                         iconSize = 20.dp,
                         onClickLabel = "打开提示设置弹窗",
                         onClick = throttle { showToastSettingsDlg = true },
-                        id = SafeR.ic_page_info,
+                        id = R.drawable.ic_page_info,
                         contentDescription = "提示设置",
                     )
                 },
diff --git a/app/src/main/kotlin/li/songe/gkd/ui/home/SubsManagePage.kt b/app/src/main/kotlin/li/songe/gkd/ui/home/SubsManagePage.kt
@@ -60,6 +60,7 @@ import com.ramcosta.composedestinations.generated.destinations.WebViewPageDestin
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.update
 import li.songe.gkd.MainActivity
+import li.songe.gkd.R
 import li.songe.gkd.data.Value
 import li.songe.gkd.data.importData
 import li.songe.gkd.db.DbSet
@@ -77,7 +78,6 @@ import li.songe.gkd.ui.share.LocalMainViewModel
 import li.songe.gkd.ui.style.EmptyHeight
 import li.songe.gkd.ui.style.itemVerticalPadding
 import li.songe.gkd.util.LOCAL_SUBS_ID
-import li.songe.gkd.util.SafeR
 import li.songe.gkd.util.ShortUrlSet
 import li.songe.gkd.util.UpdateTimeOption
 import li.songe.gkd.util.checkSubsUpdate
@@ -276,7 +276,7 @@ fun useSubsManagePage(): ScaffoldExt {
                                 storeFlow.mapState(scope) { s -> s.enableMatch }
                             }.collectAsState()
                             PerfIconButton(
-                                id = if (enableMatch) SafeR.ic_flash_on else SafeR.ic_flash_off,
+                                id = if (enableMatch) R.drawable.ic_flash_on else R.drawable.ic_flash_on,
                                 colors = IconButtonDefaults.iconButtonColors(
                                     contentColor = if (!enableMatch) {
                                         CheckboxDefaults.colors().checkedBoxColor
@@ -289,7 +289,7 @@ fun useSubsManagePage(): ScaffoldExt {
                                 onClick = throttle { switchStoreEnableMatch() },
                             )
                             PerfIconButton(
-                                id = SafeR.ic_page_info,
+                                id = R.drawable.ic_page_info,
                                 contentDescription = "订阅设置",
                                 onClickLabel = "打开设置弹窗",
                                 onClick = {
diff --git a/app/src/main/kotlin/li/songe/gkd/util/SafeR.kt b/app/src/main/kotlin/li/songe/gkd/util/SafeR.kt
diff --git a/hidden_api/build.gradle.kts b/hidden_api/build.gradle.kts
@@ -3,27 +3,12 @@ plugins {
 }
 
 android {
-    namespace = rootProject.ext["android.namespace"].toString()
+    namespace = rootProject.ext["android.namespace"].toString() + "." + project.name
     compileSdk = rootProject.ext["android.compileSdk"] as Int
     buildToolsVersion = rootProject.ext["android.buildToolsVersion"].toString()
-
     defaultConfig {
         minSdk = rootProject.ext["android.minSdk"] as Int
     }
-
-    buildTypes {
-        all {
-            isMinifyEnabled = false
-        }
-    }
-
-    compileOptions {
-        sourceCompatibility = rootProject.ext["android.javaVersion"] as JavaVersion
-        targetCompatibility = rootProject.ext["android.javaVersion"] as JavaVersion
-    }
-    buildFeatures {
-        aidl = true
-    }
 }
 
 dependencies {

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import androidx.compose.material3.LocalContentColor`
`10`	`10`	`import androidx.compose.runtime.Composable`
`11`	`11`	`import androidx.compose.ui.Modifier`
`12`	`12`	`import androidx.compose.ui.graphics.Color`
`13`		`-import li.songe.gkd.util.SafeR`
	`13`	`+import li.songe.gkd.R`
`14`	`14`
`15`	`15`	`@Composable`
`16`	`16`	`private fun AnimatedIcon(`
`@@ -58,6 +58,6 @@ fun AnimatedIconButton(`
`58`	`58`	`}`
`59`	`59`
`60`	`60`	`private fun getIconDesc(@DrawableRes id: Int, atEnd: Boolean): String? = when (id) {`
`61`		`- SafeR.ic_anim_search_close -> if (atEnd) "关闭搜索" else "打开搜索"`
	`61`	`+ R.drawable.ic_anim_search_close -> if (atEnd) "关闭搜索" else "打开搜索"`
`62`	`62`	`else -> null`
`63`	`63`	`}`