|
@@ -131,18 +131,19 @@ fun ServerList(
|
|
|
) {
|
|
|
ShowSearchBar(serverListViewModel, basePreferenceHelper, navHostController)
|
|
|
|
|
|
+ val currentPageIndex = if (Screen.ServerList.isTrue) 1 else 0
|
|
|
+ val scope = rememberCoroutineScope()
|
|
|
val serverTabItems = listOf("Recommended", "All Locations")
|
|
|
- val pagerState = rememberPagerState(pageCount = {serverTabItems.size})
|
|
|
+ val pagerState = rememberPagerState(initialPage = currentPageIndex, pageCount = {serverTabItems.size})
|
|
|
val selectedIndex by remember { derivedStateOf { pagerState.currentPage } }
|
|
|
- val scope = rememberCoroutineScope()
|
|
|
|
|
|
- if (Screen.ServerList.isTrue) {
|
|
|
- LaunchedEffect(key1 = true) {
|
|
|
- scope.launch {
|
|
|
- pagerState.animateScrollToPage(1)
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
+// if (Screen.ServerList.isTrue) {
|
|
|
+// LaunchedEffect(key1 = true) {
|
|
|
+// scope.launch {
|
|
|
+// pagerState.animateScrollToPage(1)
|
|
|
+// }
|
|
|
+// }
|
|
|
+// }
|
|
|
|
|
|
// Tab Row [Recommended, All Locations]
|
|
|
|
|
@@ -177,14 +178,17 @@ fun ServerList(
|
|
|
) {
|
|
|
serverTabItems.forEachIndexed { index, currentTab ->
|
|
|
|
|
|
- val color = remember { Animatable(Color.White) }
|
|
|
+// val color = remember { Animatable(Color.White) }
|
|
|
+ var colorTab by remember { mutableStateOf(Color.White) }
|
|
|
+ colorTab = if (selectedIndex == index) Color(0xFFE9EDF9)
|
|
|
+ else Color.White
|
|
|
|
|
|
- LaunchedEffect(key1 = selectedIndex == index) {
|
|
|
- color.animateTo(
|
|
|
- if (selectedIndex == index) Color(0xFFE9EDF9)
|
|
|
- else Color.White
|
|
|
- )
|
|
|
- }
|
|
|
+// LaunchedEffect(key1 = selectedIndex == index) {
|
|
|
+// color.animateTo(
|
|
|
+// if (selectedIndex == index) Color(0xFFE9EDF9)
|
|
|
+// else Color.White
|
|
|
+// )
|
|
|
+// }
|
|
|
|
|
|
Tab(
|
|
|
selected = selectedIndex == index,
|
|
@@ -205,7 +209,7 @@ fun ServerList(
|
|
|
top = 10.dp, bottom = 10.dp
|
|
|
)
|
|
|
.background(
|
|
|
- color = color.value,
|
|
|
+ color = colorTab,
|
|
|
shape = RoundedCornerShape(20.dp)
|
|
|
)
|
|
|
|