compose: PermissionsScreen -> PermissionRationaleScreen
Avoid confusion with the child PermissionScreen of AppDetailsScreen Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
@@ -18,7 +18,7 @@ import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
|
||||
import com.aurora.store.compose.ui.commons.BlacklistScreen
|
||||
import com.aurora.store.compose.ui.details.AppDetailsScreen
|
||||
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
|
||||
|
||||
/**
|
||||
@@ -71,8 +71,8 @@ fun NavDisplay(startDestination: NavKey) {
|
||||
)
|
||||
}
|
||||
|
||||
entry<Screen.Permissions> { screen ->
|
||||
PermissionsScreen(
|
||||
entry<Screen.PermissionRationale> { screen ->
|
||||
PermissionRationaleScreen(
|
||||
onNavigateUp = { onNavigateUp() },
|
||||
)
|
||||
}
|
||||
|
||||
@@ -35,5 +35,7 @@ sealed class Screen : NavKey, Parcelable {
|
||||
data object Search : Screen()
|
||||
|
||||
@Serializable
|
||||
data class Permissions(val requiredPermissions: Set<PermissionType> = emptySet()) : Screen()
|
||||
data class PermissionRationale(
|
||||
val requiredPermissions: Set<PermissionType> = emptySet()
|
||||
) : Screen()
|
||||
}
|
||||
|
||||
@@ -47,18 +47,18 @@ import com.aurora.store.data.model.Permission
|
||||
import com.aurora.store.data.model.PermissionType
|
||||
import com.aurora.store.data.providers.PermissionProvider.Companion.isGranted
|
||||
import com.aurora.store.util.PackageUtil
|
||||
import com.aurora.store.viewmodel.commons.PermissionsViewModel
|
||||
import com.aurora.store.viewmodel.commons.PermissionRationaleViewModel
|
||||
import kotlin.random.Random
|
||||
|
||||
private const val TAG = "PermissionsScreen"
|
||||
|
||||
@Composable
|
||||
fun PermissionsScreen(
|
||||
fun PermissionRationaleScreen(
|
||||
isOnboarding: Boolean = false,
|
||||
requiredPermissions: Set<PermissionType> = emptySet(),
|
||||
onNavigateUp: () -> Unit,
|
||||
onPermissionCallback: (type: PermissionType) -> Unit = {},
|
||||
viewModel: PermissionsViewModel = hiltViewModel()
|
||||
viewModel: PermissionRationaleViewModel = hiltViewModel()
|
||||
) {
|
||||
val permissions by viewModel.permissions.collectAsStateWithLifecycle()
|
||||
|
||||
@@ -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.navigation.ExtraScreen
|
||||
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.model.AppState
|
||||
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.EXTERNAL_STORAGE else null
|
||||
)
|
||||
showExtraPane(Screen.Permissions(requiredPermissions = requiredPermissions))
|
||||
showExtraPane(Screen.PermissionRationale(requiredPermissions = requiredPermissions))
|
||||
}
|
||||
}
|
||||
|
||||
@@ -494,7 +494,7 @@ private fun ScreenContentApp(
|
||||
onNavigateToAppDetails = { onNavigateToAppDetails(it) }
|
||||
)
|
||||
|
||||
is Screen.Permissions -> PermissionsScreen(
|
||||
is Screen.PermissionRationale -> PermissionRationaleScreen(
|
||||
onNavigateUp = ::onNavigateBack,
|
||||
requiredPermissions = screen.requiredPermissions,
|
||||
onPermissionCallback = { onInstall() }
|
||||
|
||||
@@ -22,7 +22,7 @@ import kotlinx.coroutines.flow.asStateFlow
|
||||
import javax.inject.Inject
|
||||
|
||||
@HiltViewModel
|
||||
class PermissionsViewModel @Inject constructor(
|
||||
class PermissionRationaleViewModel @Inject constructor(
|
||||
@ApplicationContext private val context: Context
|
||||
) : ViewModel() {
|
||||
|
||||
Reference in New Issue
Block a user