From fc7ef5e345c4204259cd3c786b6a6e7dedc6be69 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Thu, 11 Sep 2025 17:13:10 +0800 Subject: [PATCH] compose: PermissionsScreen -> PermissionRationaleScreen Avoid confusion with the child PermissionScreen of AppDetailsScreen Signed-off-by: Aayush Gupta --- .../java/com/aurora/store/compose/navigation/NavDisplay.kt | 6 +++--- .../main/java/com/aurora/store/compose/navigation/Screen.kt | 4 +++- .../{PermissionsScreen.kt => PermissionRationaleScreen.kt} | 6 +++--- .../com/aurora/store/compose/ui/details/AppDetailsScreen.kt | 6 +++--- ...missionsViewModel.kt => PermissionRationaleViewModel.kt} | 2 +- 5 files changed, 13 insertions(+), 11 deletions(-) rename app/src/main/java/com/aurora/store/compose/ui/commons/{PermissionsScreen.kt => PermissionRationaleScreen.kt} (97%) rename app/src/main/java/com/aurora/store/viewmodel/commons/{PermissionsViewModel.kt => PermissionRationaleViewModel.kt} (98%) diff --git a/app/src/main/java/com/aurora/store/compose/navigation/NavDisplay.kt b/app/src/main/java/com/aurora/store/compose/navigation/NavDisplay.kt index 286e2bedf..86b18ee6d 100644 --- a/app/src/main/java/com/aurora/store/compose/navigation/NavDisplay.kt +++ b/app/src/main/java/com/aurora/store/compose/navigation/NavDisplay.kt @@ -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 -> - PermissionsScreen( + entry { screen -> + PermissionRationaleScreen( onNavigateUp = { onNavigateUp() }, ) } diff --git a/app/src/main/java/com/aurora/store/compose/navigation/Screen.kt b/app/src/main/java/com/aurora/store/compose/navigation/Screen.kt index 39f9cce33..062776188 100644 --- a/app/src/main/java/com/aurora/store/compose/navigation/Screen.kt +++ b/app/src/main/java/com/aurora/store/compose/navigation/Screen.kt @@ -35,5 +35,7 @@ sealed class Screen : NavKey, Parcelable { data object Search : Screen() @Serializable - data class Permissions(val requiredPermissions: Set = emptySet()) : Screen() + data class PermissionRationale( + val requiredPermissions: Set = emptySet() + ) : Screen() } diff --git a/app/src/main/java/com/aurora/store/compose/ui/commons/PermissionsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/commons/PermissionRationaleScreen.kt similarity index 97% rename from app/src/main/java/com/aurora/store/compose/ui/commons/PermissionsScreen.kt rename to app/src/main/java/com/aurora/store/compose/ui/commons/PermissionRationaleScreen.kt index 1f39a5752..af4b7f3fa 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/commons/PermissionsScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/commons/PermissionRationaleScreen.kt @@ -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 = emptySet(), onNavigateUp: () -> Unit, onPermissionCallback: (type: PermissionType) -> Unit = {}, - viewModel: PermissionsViewModel = hiltViewModel() + viewModel: PermissionRationaleViewModel = hiltViewModel() ) { val permissions by viewModel.permissions.collectAsStateWithLifecycle() diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt index 6346d4ce0..660411978 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/AppDetailsScreen.kt @@ -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() } diff --git a/app/src/main/java/com/aurora/store/viewmodel/commons/PermissionsViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/commons/PermissionRationaleViewModel.kt similarity index 98% rename from app/src/main/java/com/aurora/store/viewmodel/commons/PermissionsViewModel.kt rename to app/src/main/java/com/aurora/store/viewmodel/commons/PermissionRationaleViewModel.kt index 200971ca6..802f9a06e 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/commons/PermissionsViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/commons/PermissionRationaleViewModel.kt @@ -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() {