From c6056fb7bdaecdd68903793f7712a40662d53bce Mon Sep 17 00:00:00 2001 From: Guido Schmit Date: Sun, 14 Jun 2026 18:28:19 +0200 Subject: [PATCH] fix: CircularProgressIndicator no longer clipped in auth buttons Use Modifier.size(20.dp) instead of height(20.dp) so the spinner is constrained on both axes and doesn't get cut off horizontally. Co-Authored-By: Claude Sonnet 4.6 --- .../main/java/com/scarriffle/calendarr/ui/auth/LoginScreen.kt | 3 ++- .../java/com/scarriffle/calendarr/ui/auth/ServerSetupScreen.kt | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/scarriffle/calendarr/ui/auth/LoginScreen.kt b/app/src/main/java/com/scarriffle/calendarr/ui/auth/LoginScreen.kt index bc0f85d..0fd6a11 100644 --- a/app/src/main/java/com/scarriffle/calendarr/ui/auth/LoginScreen.kt +++ b/app/src/main/java/com/scarriffle/calendarr/ui/auth/LoginScreen.kt @@ -9,6 +9,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack @@ -102,7 +103,7 @@ fun LoginScreen( modifier = Modifier.fillMaxWidth(), ) { if (vm.loggingIn) { - CircularProgressIndicator(modifier = Modifier.height(20.dp), strokeWidth = 2.dp) + CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp) } else { Text(tr("auth.login")) } diff --git a/app/src/main/java/com/scarriffle/calendarr/ui/auth/ServerSetupScreen.kt b/app/src/main/java/com/scarriffle/calendarr/ui/auth/ServerSetupScreen.kt index 413e278..e5ec7c9 100644 --- a/app/src/main/java/com/scarriffle/calendarr/ui/auth/ServerSetupScreen.kt +++ b/app/src/main/java/com/scarriffle/calendarr/ui/auth/ServerSetupScreen.kt @@ -7,6 +7,7 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.CalendarMonth @@ -78,7 +79,7 @@ fun ServerSetupScreen( modifier = Modifier.fillMaxWidth(), ) { if (vm.checking) { - CircularProgressIndicator(modifier = Modifier.height(20.dp), strokeWidth = 2.dp) + CircularProgressIndicator(modifier = Modifier.size(20.dp), strokeWidth = 2.dp) } else { Text(tr("auth.continue")) }