compose: PermissionsScreen -> PermissionRationaleScreen

Avoid confusion with the child PermissionScreen of AppDetailsScreen

Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
Aayush Gupta
2025-09-11 17:13:10 +08:00
parent 16cacdeeb7
commit fc7ef5e345
5 changed files with 13 additions and 11 deletions

View File

@@ -18,7 +18,7 @@ import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
import com.aurora.store.compose.ui.commons.BlacklistScreen import com.aurora.store.compose.ui.commons.BlacklistScreen
import com.aurora.store.compose.ui.details.AppDetailsScreen import com.aurora.store.compose.ui.details.AppDetailsScreen
import com.aurora.store.compose.ui.dev.DevProfileScreen import com.aurora.store.compose.ui.dev.DevProfileScreen
import com.aurora.store.compose.ui.commons.PermissionsScreen import com.aurora.store.compose.ui.commons.PermissionRationaleScreen
import com.aurora.store.compose.ui.search.SearchScreen import com.aurora.store.compose.ui.search.SearchScreen
/** /**
@@ -71,8 +71,8 @@ fun NavDisplay(startDestination: NavKey) {
) )
} }
entry<Screen.Permissions> { screen -> entry<Screen.PermissionRationale> { screen ->
PermissionsScreen( PermissionRationaleScreen(
onNavigateUp = { onNavigateUp() }, onNavigateUp = { onNavigateUp() },
) )
} }

View File

@@ -35,5 +35,7 @@ sealed class Screen : NavKey, Parcelable {
data object Search : Screen() data object Search : Screen()
@Serializable @Serializable
data class Permissions(val requiredPermissions: Set<PermissionType> = emptySet()) : Screen() data class PermissionRationale(
val requiredPermissions: Set<PermissionType> = emptySet()
) : Screen()
} }

View File

@@ -47,18 +47,18 @@ import com.aurora.store.data.model.Permission
import com.aurora.store.data.model.PermissionType import com.aurora.store.data.model.PermissionType
import com.aurora.store.data.providers.PermissionProvider.Companion.isGranted import com.aurora.store.data.providers.PermissionProvider.Companion.isGranted
import com.aurora.store.util.PackageUtil import com.aurora.store.util.PackageUtil
import com.aurora.store.viewmodel.commons.PermissionsViewModel import com.aurora.store.viewmodel.commons.PermissionRationaleViewModel
import kotlin.random.Random import kotlin.random.Random
private const val TAG = "PermissionsScreen" private const val TAG = "PermissionsScreen"
@Composable @Composable
fun PermissionsScreen( fun PermissionRationaleScreen(
isOnboarding: Boolean = false, isOnboarding: Boolean = false,
requiredPermissions: Set<PermissionType> = emptySet(), requiredPermissions: Set<PermissionType> = emptySet(),
onNavigateUp: () -> Unit, onNavigateUp: () -> Unit,
onPermissionCallback: (type: PermissionType) -> Unit = {}, onPermissionCallback: (type: PermissionType) -> Unit = {},
viewModel: PermissionsViewModel = hiltViewModel() viewModel: PermissionRationaleViewModel = hiltViewModel()
) { ) {
val permissions by viewModel.permissions.collectAsStateWithLifecycle() val permissions by viewModel.permissions.collectAsStateWithLifecycle()

View File

@@ -78,7 +78,7 @@ import com.aurora.store.compose.ui.details.components.Tags
import com.aurora.store.compose.ui.details.components.Testing import com.aurora.store.compose.ui.details.components.Testing
import com.aurora.store.compose.ui.details.navigation.ExtraScreen import com.aurora.store.compose.ui.details.navigation.ExtraScreen
import com.aurora.store.compose.ui.dev.DevProfileScreen import com.aurora.store.compose.ui.dev.DevProfileScreen
import com.aurora.store.compose.ui.commons.PermissionsScreen import com.aurora.store.compose.ui.commons.PermissionRationaleScreen
import com.aurora.store.data.installer.AppInstaller import com.aurora.store.data.installer.AppInstaller
import com.aurora.store.data.model.AppState import com.aurora.store.data.model.AppState
import com.aurora.store.data.model.PermissionType import com.aurora.store.data.model.PermissionType
@@ -251,7 +251,7 @@ private fun ScreenContentApp(
if (app.fileList.requiresObbDir()) PermissionType.STORAGE_MANAGER else null, if (app.fileList.requiresObbDir()) PermissionType.STORAGE_MANAGER else null,
if (app.fileList.requiresObbDir()) PermissionType.EXTERNAL_STORAGE else null if (app.fileList.requiresObbDir()) PermissionType.EXTERNAL_STORAGE else null
) )
showExtraPane(Screen.Permissions(requiredPermissions = requiredPermissions)) showExtraPane(Screen.PermissionRationale(requiredPermissions = requiredPermissions))
} }
} }
@@ -494,7 +494,7 @@ private fun ScreenContentApp(
onNavigateToAppDetails = { onNavigateToAppDetails(it) } onNavigateToAppDetails = { onNavigateToAppDetails(it) }
) )
is Screen.Permissions -> PermissionsScreen( is Screen.PermissionRationale -> PermissionRationaleScreen(
onNavigateUp = ::onNavigateBack, onNavigateUp = ::onNavigateBack,
requiredPermissions = screen.requiredPermissions, requiredPermissions = screen.requiredPermissions,
onPermissionCallback = { onInstall() } onPermissionCallback = { onInstall() }

View File

@@ -22,7 +22,7 @@ import kotlinx.coroutines.flow.asStateFlow
import javax.inject.Inject import javax.inject.Inject
@HiltViewModel @HiltViewModel
class PermissionsViewModel @Inject constructor( class PermissionRationaleViewModel @Inject constructor(
@ApplicationContext private val context: Context @ApplicationContext private val context: Context
) : ViewModel() { ) : ViewModel() {