|
@@ -570,7 +570,7 @@ fun ColumnScope.ShowAllLocationsList(
|
|
|
// serverListViewModel.setPagerIndex(index1)
|
|
|
scope.launch {
|
|
|
selectedTabIndex = index1
|
|
|
- pagerState.animateScrollToPage(index1)
|
|
|
+ pagerState.scrollToPage(index1)
|
|
|
// val filterServersData =
|
|
|
// if (data[index1].name?.lowercase().toString() == "servers") {
|
|
|
// data.get(index1).servers?.let {
|
|
@@ -647,7 +647,7 @@ fun ColumnScope.ShowAllLocationsList(
|
|
|
LocalOverscrollConfiguration provides null
|
|
|
) {
|
|
|
Column(modifier = Modifier.fillMaxSize()) {
|
|
|
- Log.d("serverTabPager = ", "filterServersList: ${filterServersList.size} , selectedTabIndex: $selectedTabIndex")
|
|
|
+ Log.d("serverTabPager = ", "serverTabPager: ${serverTabPager} , selectedTabIndex: $selectedTabIndex")
|
|
|
|
|
|
CompositionLocalProvider(
|
|
|
LocalOverscrollConfiguration provides null
|
|
@@ -656,20 +656,22 @@ fun ColumnScope.ShowAllLocationsList(
|
|
|
|
|
|
Log.d("filterServersList", "filterServersList: ${filterServersList.size}")
|
|
|
|
|
|
- if (selectedTabIndex == 0) {
|
|
|
- LazyColumn() {
|
|
|
- items(items = filterServersList, itemContent = {country ->
|
|
|
- CountryItem(server = country, "servers", country.totalServers, navHostController )
|
|
|
- })
|
|
|
+ when (selectedTabIndex) {
|
|
|
+ 0 -> {
|
|
|
+ LazyColumn() {
|
|
|
+ items(items = filterServersList, itemContent = {country ->
|
|
|
+ CountryItem(server = country, "servers", country.totalServers, navHostController)
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
- } else {
|
|
|
- LazyColumn() {
|
|
|
- items(items = filterServersList, itemContent = {country ->
|
|
|
- ServerItem(server = country, navHostController )
|
|
|
- })
|
|
|
+ else -> {
|
|
|
+ LazyColumn() {
|
|
|
+ items(items = filterServersList, itemContent = {country ->
|
|
|
+ ServerItem(server = country, navHostController)
|
|
|
+ })
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
// var serverTitle by rememberSaveable { mutableStateOf("") }
|