Moved pull-to-refresh indicator below tabs (#1028)

Signed-off-by: Arnau Mora Gras <arnyminerz@proton.me>
bitfireAT · Sep 16, 2024 · 5180b99 · 5180b99
1 parent dcb7e31
commit 5180b99
Showing 1 changed file with 50 additions and 49 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
@@ -297,70 +297,71 @@ fun AccountScreen(
                 SnackbarHost(snackbarHostState)
             }
         ) { padding ->
-            PullToRefreshBox(
-                isRefreshing = isRefreshing,
-                onRefresh = { isRefreshing = true; onSync() },
+            Column(
                 modifier = Modifier.padding(padding)
             ) {
-                Column {
-                    if (nrPages > 0) {
-                        TabRow(selectedTabIndex = pagerState.currentPage) {
-                            if (idxCalDav != null) {
-                                Tab(
-                                    selected = pagerState.currentPage == idxCalDav,
-                                    onClick = {
-                                        scope.launch {
-                                            pagerState.scrollToPage(idxCalDav)
-                                        }
+                if (nrPages > 0) {
+                    TabRow(selectedTabIndex = pagerState.currentPage) {
+                        if (idxCalDav != null) {
+                            Tab(
+                                selected = pagerState.currentPage == idxCalDav,
+                                onClick = {
+                                    scope.launch {
+                                        pagerState.scrollToPage(idxCalDav)
                                     }
-                                ) {
-                                    Text(
-                                        stringResource(R.string.account_caldav),
-                                        modifier = Modifier.padding(8.dp)
-                                    )
                                 }
+                            ) {
+                                Text(
+                                    stringResource(R.string.account_caldav),
+                                    modifier = Modifier.padding(8.dp)
+                                )
                             }
+                        }
 
-                            if (idxCardDav != null) {
-                                Tab(
-                                    selected = pagerState.currentPage == idxCardDav,
-                                    onClick = {
-                                        scope.launch {
-                                            pagerState.scrollToPage(idxCardDav)
-                                        }
+                        if (idxCardDav != null) {
+                            Tab(
+                                selected = pagerState.currentPage == idxCardDav,
+                                onClick = {
+                                    scope.launch {
+                                        pagerState.scrollToPage(idxCardDav)
                                     }
-                                ) {
-                                    Text(
-                                        stringResource(R.string.account_carddav),
-                                        modifier = Modifier.padding(8.dp)
-                                    )
                                 }
+                            ) {
+                                Text(
+                                    stringResource(R.string.account_carddav),
+                                    modifier = Modifier.padding(8.dp)
+                                )
                             }
+                        }
 
-                            if (idxWebcal != null) {
-                                Tab(
-                                    selected = pagerState.currentPage == idxWebcal,
-                                    onClick = {
-                                        scope.launch {
-                                            pagerState.scrollToPage(idxWebcal)
-                                        }
+                        if (idxWebcal != null) {
+                            Tab(
+                                selected = pagerState.currentPage == idxWebcal,
+                                onClick = {
+                                    scope.launch {
+                                        pagerState.scrollToPage(idxWebcal)
                                     }
-                                ) {
-                                    Text(
-                                        stringResource(R.string.account_webcal),
-                                        modifier = Modifier.padding(8.dp)
-                                    )
                                 }
+                            ) {
+                                Text(
+                                    stringResource(R.string.account_webcal),
+                                    modifier = Modifier.padding(8.dp)
+                                )
                             }
                         }
+                    }
 
-                        HorizontalPager(
-                            pagerState,
-                            verticalAlignment = Alignment.Top,
-                            modifier = Modifier
-                                .fillMaxWidth()
-                                .weight(1f)
-                        ) { index ->
+                    HorizontalPager(
+                        pagerState,
+                        verticalAlignment = Alignment.Top,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .weight(1f)
+                    ) { index ->
+                        PullToRefreshBox(
+                            isRefreshing = isRefreshing,
+                            onRefresh = { isRefreshing = true; onSync() }
+                        ) {
                             when (index) {
                                 idxCardDav ->
                                     AccountScreen_ServiceTab(