fixup! compose: details: Specify key for hiltViewModel
Signed-off-by: Aayush Gupta <aayushgupta219@gmail.com>
This commit is contained in:
@@ -438,23 +438,29 @@ private fun ScreenContentApp(
|
|||||||
AnimatedPane {
|
AnimatedPane {
|
||||||
when (screen) {
|
when (screen) {
|
||||||
is Screen.DetailsReview -> DetailsReviewScreen(
|
is Screen.DetailsReview -> DetailsReviewScreen(
|
||||||
|
packageName = app.packageName,
|
||||||
onNavigateUp = ::showMainPane
|
onNavigateUp = ::showMainPane
|
||||||
)
|
)
|
||||||
is Screen.DetailsExodus -> DetailsExodusScreen(
|
is Screen.DetailsExodus -> DetailsExodusScreen(
|
||||||
|
packageName = app.packageName,
|
||||||
onNavigateUp = ::showMainPane
|
onNavigateUp = ::showMainPane
|
||||||
)
|
)
|
||||||
is Screen.DetailsMore -> DetailsMoreScreen(
|
is Screen.DetailsMore -> DetailsMoreScreen(
|
||||||
|
packageName = app.packageName,
|
||||||
onNavigateUp = ::showMainPane,
|
onNavigateUp = ::showMainPane,
|
||||||
onNavigateToAppDetails = onNavigateToAppDetails
|
onNavigateToAppDetails = onNavigateToAppDetails
|
||||||
)
|
)
|
||||||
is Screen.DetailsPermission -> DetailsPermissionScreen(
|
is Screen.DetailsPermission -> DetailsPermissionScreen(
|
||||||
|
packageName = app.packageName,
|
||||||
onNavigateUp = ::showMainPane
|
onNavigateUp = ::showMainPane
|
||||||
)
|
)
|
||||||
is Screen.DetailsScreenshot -> DetailsScreenshotScreen(
|
is Screen.DetailsScreenshot -> DetailsScreenshotScreen(
|
||||||
|
packageName = app.packageName,
|
||||||
index = screen.index,
|
index = screen.index,
|
||||||
onNavigateUp = ::showMainPane
|
onNavigateUp = ::showMainPane
|
||||||
)
|
)
|
||||||
is Screen.DetailsManualDownload -> DetailsManualDownloadScreen(
|
is Screen.DetailsManualDownload -> DetailsManualDownloadScreen(
|
||||||
|
packageName = app.packageName,
|
||||||
onNavigateUp = ::showMainPane
|
onNavigateUp = ::showMainPane
|
||||||
)
|
)
|
||||||
is Screen.DevProfile -> DevProfileScreen(
|
is Screen.DevProfile -> DevProfileScreen(
|
||||||
|
|||||||
@@ -38,8 +38,9 @@ import com.aurora.store.viewmodel.details.DetailsExodusViewModel
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DetailsExodusScreen(
|
fun DetailsExodusScreen(
|
||||||
|
packageName: String,
|
||||||
onNavigateUp: () -> Unit,
|
onNavigateUp: () -> Unit,
|
||||||
appDetailsViewModel: AppDetailsViewModel = hiltViewModel(),
|
appDetailsViewModel: AppDetailsViewModel = hiltViewModel(key = packageName),
|
||||||
detailsExodusViewModel: DetailsExodusViewModel = hiltViewModel { factory: DetailsExodusViewModel.Factory ->
|
detailsExodusViewModel: DetailsExodusViewModel = hiltViewModel { factory: DetailsExodusViewModel.Factory ->
|
||||||
factory.create(appDetailsViewModel.exodusReport.value!!)
|
factory.create(appDetailsViewModel.exodusReport.value!!)
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -56,8 +56,9 @@ import kotlinx.coroutines.android.awaitFrame
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DetailsManualDownloadScreen(
|
fun DetailsManualDownloadScreen(
|
||||||
|
packageName: String,
|
||||||
onNavigateUp: () -> Unit,
|
onNavigateUp: () -> Unit,
|
||||||
viewModel: AppDetailsViewModel = hiltViewModel(),
|
viewModel: AppDetailsViewModel = hiltViewModel(key = packageName),
|
||||||
windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()
|
windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()
|
||||||
) {
|
) {
|
||||||
val context = LocalContext.current
|
val context = LocalContext.current
|
||||||
|
|||||||
@@ -48,9 +48,10 @@ import java.util.Locale
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DetailsMoreScreen(
|
fun DetailsMoreScreen(
|
||||||
|
packageName: String,
|
||||||
onNavigateUp: () -> Unit,
|
onNavigateUp: () -> Unit,
|
||||||
onNavigateToAppDetails: (packageName: String) -> Unit,
|
onNavigateToAppDetails: (packageName: String) -> Unit,
|
||||||
appDetailsViewModel: AppDetailsViewModel = hiltViewModel(),
|
appDetailsViewModel: AppDetailsViewModel = hiltViewModel(key = packageName),
|
||||||
detailsMoreViewModel: DetailsMoreViewModel = hiltViewModel { factory: DetailsMoreViewModel.Factory ->
|
detailsMoreViewModel: DetailsMoreViewModel = hiltViewModel { factory: DetailsMoreViewModel.Factory ->
|
||||||
factory.create(appDetailsViewModel.app.value!!.dependencies.dependentPackages)
|
factory.create(appDetailsViewModel.app.value!!.dependencies.dependentPackages)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,8 +38,9 @@ import java.util.Locale
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DetailsPermissionScreen(
|
fun DetailsPermissionScreen(
|
||||||
|
packageName: String,
|
||||||
onNavigateUp: () -> Unit,
|
onNavigateUp: () -> Unit,
|
||||||
appDetailsViewModel: AppDetailsViewModel = hiltViewModel(),
|
appDetailsViewModel: AppDetailsViewModel = hiltViewModel(key = packageName),
|
||||||
detailsPermissionViewModel: DetailsPermissionViewModel = hiltViewModel { factory: DetailsPermissionViewModel.Factory ->
|
detailsPermissionViewModel: DetailsPermissionViewModel = hiltViewModel { factory: DetailsPermissionViewModel.Factory ->
|
||||||
factory.create(appDetailsViewModel.app.value!!.permissions)
|
factory.create(appDetailsViewModel.app.value!!.permissions)
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -53,8 +53,9 @@ import kotlin.random.Random
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DetailsReviewScreen(
|
fun DetailsReviewScreen(
|
||||||
|
packageName: String,
|
||||||
onNavigateUp: () -> Unit,
|
onNavigateUp: () -> Unit,
|
||||||
appDetailsViewModel: AppDetailsViewModel = hiltViewModel(),
|
appDetailsViewModel: AppDetailsViewModel = hiltViewModel(key = packageName),
|
||||||
detailsReviewViewModel: DetailsReviewViewModel = hiltViewModel { factory: DetailsReviewViewModel.Factory ->
|
detailsReviewViewModel: DetailsReviewViewModel = hiltViewModel { factory: DetailsReviewViewModel.Factory ->
|
||||||
factory.create(appDetailsViewModel.app.value!!.packageName)
|
factory.create(appDetailsViewModel.app.value!!.packageName)
|
||||||
},
|
},
|
||||||
|
|||||||
@@ -31,9 +31,10 @@ import com.aurora.store.viewmodel.details.AppDetailsViewModel
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun DetailsScreenshotScreen(
|
fun DetailsScreenshotScreen(
|
||||||
|
packageName: String,
|
||||||
index: Int,
|
index: Int,
|
||||||
onNavigateUp: () -> Unit,
|
onNavigateUp: () -> Unit,
|
||||||
viewModel: AppDetailsViewModel = hiltViewModel(),
|
viewModel: AppDetailsViewModel = hiltViewModel(key = packageName),
|
||||||
windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()
|
windowAdaptiveInfo: WindowAdaptiveInfo = currentWindowAdaptiveInfo()
|
||||||
) {
|
) {
|
||||||
val app by viewModel.app.collectAsStateWithLifecycle()
|
val app by viewModel.app.collectAsStateWithLifecycle()
|
||||||
|
|||||||
Reference in New Issue
Block a user