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 557d4bed2..ef4a07ad6 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 @@ -438,23 +438,29 @@ private fun ScreenContentApp( AnimatedPane { when (screen) { is Screen.DetailsReview -> DetailsReviewScreen( + packageName = app.packageName, onNavigateUp = ::showMainPane ) is Screen.DetailsExodus -> DetailsExodusScreen( + packageName = app.packageName, onNavigateUp = ::showMainPane ) is Screen.DetailsMore -> DetailsMoreScreen( + packageName = app.packageName, onNavigateUp = ::showMainPane, onNavigateToAppDetails = onNavigateToAppDetails ) is Screen.DetailsPermission -> DetailsPermissionScreen( + packageName = app.packageName, onNavigateUp = ::showMainPane ) is Screen.DetailsScreenshot -> DetailsScreenshotScreen( + packageName = app.packageName, index = screen.index, onNavigateUp = ::showMainPane ) is Screen.DetailsManualDownload -> DetailsManualDownloadScreen( + packageName = app.packageName, onNavigateUp = ::showMainPane ) is Screen.DevProfile -> DevProfileScreen( diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsExodusScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsExodusScreen.kt index 5ae239996..82fcb0c78 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsExodusScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsExodusScreen.kt @@ -38,8 +38,9 @@ import com.aurora.store.viewmodel.details.DetailsExodusViewModel @Composable fun DetailsExodusScreen( + packageName: String, onNavigateUp: () -> Unit, - appDetailsViewModel: AppDetailsViewModel = hiltViewModel(), + appDetailsViewModel: AppDetailsViewModel = hiltViewModel(key = packageName), detailsExodusViewModel: DetailsExodusViewModel = hiltViewModel { factory: DetailsExodusViewModel.Factory -> factory.create(appDetailsViewModel.exodusReport.value!!) }, diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsManualDownloadScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsManualDownloadScreen.kt index be41d1ff4..7149cc7ad 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsManualDownloadScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsManualDownloadScreen.kt @@ -56,8 +56,9 @@ import kotlinx.coroutines.android.awaitFrame @Composable fun DetailsManualDownloadScreen( + packageName: String, onNavigateUp: () -> Unit, - viewModel: AppDetailsViewModel = hiltViewModel(), + viewModel: AppDetailsViewModel = hiltViewModel(key = packageName), windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo() ) { val context = LocalContext.current diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsMoreScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsMoreScreen.kt index 8f5248e90..497981219 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsMoreScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsMoreScreen.kt @@ -48,9 +48,10 @@ import java.util.Locale @Composable fun DetailsMoreScreen( + packageName: String, onNavigateUp: () -> Unit, onNavigateToAppDetails: (packageName: String) -> Unit, - appDetailsViewModel: AppDetailsViewModel = hiltViewModel(), + appDetailsViewModel: AppDetailsViewModel = hiltViewModel(key = packageName), detailsMoreViewModel: DetailsMoreViewModel = hiltViewModel { factory: DetailsMoreViewModel.Factory -> factory.create(appDetailsViewModel.app.value!!.dependencies.dependentPackages) } diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsPermissionScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsPermissionScreen.kt index 442c0e5ea..1f294019f 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsPermissionScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsPermissionScreen.kt @@ -38,8 +38,9 @@ import java.util.Locale @Composable fun DetailsPermissionScreen( + packageName: String, onNavigateUp: () -> Unit, - appDetailsViewModel: AppDetailsViewModel = hiltViewModel(), + appDetailsViewModel: AppDetailsViewModel = hiltViewModel(key = packageName), detailsPermissionViewModel: DetailsPermissionViewModel = hiltViewModel { factory: DetailsPermissionViewModel.Factory -> factory.create(appDetailsViewModel.app.value!!.permissions) }, diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt index 99489b0c1..3dfcc4bb5 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsReviewScreen.kt @@ -53,8 +53,9 @@ import kotlin.random.Random @Composable fun DetailsReviewScreen( + packageName: String, onNavigateUp: () -> Unit, - appDetailsViewModel: AppDetailsViewModel = hiltViewModel(), + appDetailsViewModel: AppDetailsViewModel = hiltViewModel(key = packageName), detailsReviewViewModel: DetailsReviewViewModel = hiltViewModel { factory: DetailsReviewViewModel.Factory -> factory.create(appDetailsViewModel.app.value!!.packageName) }, diff --git a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsScreenshotScreen.kt b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsScreenshotScreen.kt index 78129da93..bb80919ec 100644 --- a/app/src/main/java/com/aurora/store/compose/ui/details/DetailsScreenshotScreen.kt +++ b/app/src/main/java/com/aurora/store/compose/ui/details/DetailsScreenshotScreen.kt @@ -31,9 +31,10 @@ import com.aurora.store.viewmodel.details.AppDetailsViewModel @Composable fun DetailsScreenshotScreen( + packageName: String, index: Int, onNavigateUp: () -> Unit, - viewModel: AppDetailsViewModel = hiltViewModel(), + viewModel: AppDetailsViewModel = hiltViewModel(key = packageName), windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo() ) { val app by viewModel.app.collectAsStateWithLifecycle()