Switched CalDAV and CardDAV tab positions (#769)

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>
bitfireAT · May 2, 2024 · e40fa6e · e40fa6e
1 parent c9fd66b
commit e40fa6e
Showing 1 changed file with 12 additions and 11 deletions.
diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountScreen.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/account/AccountScreen.kt
@@ -216,12 +216,12 @@ fun AccountScreen(
         var nextIdx = -1
 
         @Suppress("KotlinConstantConditions")
-        val idxCardDav: Int? = if (hasCardDav) ++nextIdx else null
         val idxCalDav: Int? = if (hasCalDav) ++nextIdx else null
+        val idxCardDav: Int? = if (hasCardDav) ++nextIdx else null
         val idxWebcal: Int? = if (hasWebcal) ++nextIdx else null
         val nrPages =
-            (if (idxCardDav != null) 1 else 0) +
-                    (if (idxCalDav != null) 1 else 0) +
+            (if (idxCalDav != null) 1 else 0) +
+                    (if (idxCardDav != null) 1 else 0) +
                     (if (idxWebcal != null) 1 else 0)
         val pagerState = rememberPagerState(pageCount = { nrPages })
 
@@ -298,32 +298,33 @@ fun AccountScreen(
                 Column {
                     if (nrPages > 0) {
                         TabRow(selectedTabIndex = pagerState.currentPage) {
-                            if (idxCardDav != null)
+                            if (idxCalDav != null) {
                                 Tab(
-                                    selected = pagerState.currentPage == idxCardDav,
+                                    selected = pagerState.currentPage == idxCalDav,
                                     onClick = {
                                         scope.launch {
-                                            pagerState.scrollToPage(idxCardDav)
+                                            pagerState.scrollToPage(idxCalDav)
                                         }
                                     }
                                 ) {
                                     Text(
-                                        stringResource(R.string.account_carddav),
+                                        stringResource(R.string.account_caldav),
                                         modifier = Modifier.padding(8.dp)
                                     )
                                 }
+                            }
 
-                            if (idxCalDav != null) {
+                            if (idxCardDav != null) {
                                 Tab(
-                                    selected = pagerState.currentPage == idxCalDav,
+                                    selected = pagerState.currentPage == idxCardDav,
                                     onClick = {
                                         scope.launch {
-                                            pagerState.scrollToPage(idxCalDav)
+                                            pagerState.scrollToPage(idxCardDav)
                                         }
                                     }
                                 ) {
                                     Text(
-                                        stringResource(R.string.account_caldav),
+                                        stringResource(R.string.account_carddav),
                                         modifier = Modifier.padding(8.dp)
                                     )
                                 }