|
@@ -97,7 +97,33 @@ fun CountryItem(server: Server, category: String, navHostController: NavHostCont
|
|
|
SplashViewModel(context)
|
|
|
}
|
|
|
|
|
|
-// var countrySize: Int = 0
|
|
|
+ val scope = rememberCoroutineScope()
|
|
|
+ val homeViewModel: HomeViewModel = viewModel {
|
|
|
+ HomeViewModel(context, scope)
|
|
|
+ }
|
|
|
+ var isCountryServerClicked by remember {
|
|
|
+ mutableStateOf(false)
|
|
|
+ }
|
|
|
+
|
|
|
+ if (isCountryServerClicked) {
|
|
|
+ Log.d("ServerCallbacks", "isServerClicked $isCountryServerClicked")
|
|
|
+ onServer.onServerSelected(context, homeViewModel) {
|
|
|
+ isCountryServerClicked = false
|
|
|
+ }
|
|
|
+ navHostController.popBackStack()
|
|
|
+ }
|
|
|
+
|
|
|
+ var isServerServerClicked by remember {
|
|
|
+ mutableStateOf(false)
|
|
|
+ }
|
|
|
+
|
|
|
+ if (isServerServerClicked) {
|
|
|
+ Log.d("ServerCallbacks", "isServerClicked $isServerServerClicked")
|
|
|
+ onServer.onServerSelected(context, homeViewModel) {
|
|
|
+ isServerServerClicked = false
|
|
|
+ }
|
|
|
+ navHostController.popBackStack()
|
|
|
+ }
|
|
|
|
|
|
Log.d("test_countrySize", "countrySize $countrySize")
|
|
|
|
|
@@ -136,7 +162,8 @@ fun CountryItem(server: Server, category: String, navHostController: NavHostCont
|
|
|
// )
|
|
|
// .show()
|
|
|
basePreferenceHelper.setServerObject(server)
|
|
|
- navHostController.popBackStack()
|
|
|
+ isCountryServerClicked = true
|
|
|
+// navHostController.popBackStack()
|
|
|
}
|
|
|
) {
|
|
|
val icon = if (server.enable == 1) Utils.getDrawable(context, server.iso)
|
|
@@ -239,7 +266,8 @@ fun CountryItem(server: Server, category: String, navHostController: NavHostCont
|
|
|
interactionSource = remember { MutableInteractionSource() }
|
|
|
) {
|
|
|
basePreferenceHelper.setServerObject(server)
|
|
|
- navHostController.popBackStack()
|
|
|
+ isServerServerClicked = true
|
|
|
+// navHostController.popBackStack()
|
|
|
}
|
|
|
|
|
|
) {
|