Fix SpaLib build after Compose 1.3.0

1. Add OptIn to fix build for settingsTopAppBarColors
   OptIn ExperimentalMaterial3Api for new version of Compose library.

2. Fix return is not allowed in remember.

Bug: 235727273
Test: m SpaLib
Test: m SpaPrivilegedLib
Change-Id: I2c8ba698b79178bf7940f29574b5dc6a38b0d0cf
This commit is contained in:
Chaohui Wang
2022-10-07 16:27:10 +08:00
parent 862f455db7
commit 507227d8e5
3 changed files with 11 additions and 7 deletions

View File

@@ -61,6 +61,7 @@ fun SettingsScaffold(
)
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
internal fun settingsTopAppBarColors() = TopAppBarDefaults.largeTopAppBarColors(
containerColor = SettingsTheme.colorScheme.surfaceHeader,

View File

@@ -32,10 +32,11 @@ fun AppInfoPage(
) {
RegularScaffold(title = title) {
val appInfoProvider = remember {
val packageInfo = PackageManagers.getPackageInfoAsUser(packageName, userId)
?: return@RegularScaffold
AppInfoProvider(packageInfo)
}
PackageManagers.getPackageInfoAsUser(packageName, userId)?.let { packageInfo ->
AppInfoProvider(packageInfo)
}
} ?: return@RegularScaffold
appInfoProvider.AppInfo(displayVersion = true)
content()

View File

@@ -143,9 +143,11 @@ private fun <T : AppRecord> createSwitchModel(
userId: Int,
): TogglePermissionSwitchModel<T>? {
val record = remember {
val app = PackageManagers.getApplicationInfoAsUser(packageName, userId) ?: return null
listModel.transformItem(app)
}
PackageManagers.getApplicationInfoAsUser(packageName, userId)?.let { app ->
listModel.transformItem(app)
}
} ?: return null
val context = LocalContext.current
val isAllowed = listModel.isAllowed(record)
return remember {