From 9ec9b7d6f795e2a791d9f5c659a7d21a304b298e Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 23 Nov 2025 10:52:24 +0100 Subject: [PATCH 1/3] Android: Replace dialog_login.xml's invisible with gone LoginDialog sets these to gone when a login starts or fails. Whether we use gone or invisible needs to be consistent between LoginDialog and the XML file, otherwise we'll blank space that shows up or disappears when login starts or fails. --- Source/Android/app/src/main/res/layout/dialog_login.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Android/app/src/main/res/layout/dialog_login.xml b/Source/Android/app/src/main/res/layout/dialog_login.xml index 320aed0e6a0..608660817f3 100644 --- a/Source/Android/app/src/main/res/layout/dialog_login.xml +++ b/Source/Android/app/src/main/res/layout/dialog_login.xml @@ -61,7 +61,7 @@ android:text="@string/achievements_login_in_progress" android:textAlignment="center" android:textColor="?attr/colorOnErrorContainer" - android:visibility="invisible" + android:visibility="gone" android:clickable="false" android:focusable="false" app:layout_constraintBottom_toTopOf="@id/login_failed" @@ -77,7 +77,7 @@ android:text="@string/achievements_login_failed" android:textAlignment="center" android:textColor="?attr/colorOnErrorContainer" - android:visibility="invisible" + android:visibility="gone" android:clickable="false" android:focusable="false" app:layout_constraintBottom_toTopOf="@id/button_cancel" From 738dcf86a6df5b2a440906e94be568f7af4bbcd1 Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 23 Nov 2025 10:55:42 +0100 Subject: [PATCH 2/3] Android: Remove unnecessary gravity in dialog_login.xml Android Studio was complaining about these because their directions didn't match the text alignment, but in this layout they have no effect anyway. --- Source/Android/app/src/main/res/layout/dialog_login.xml | 2 -- 1 file changed, 2 deletions(-) diff --git a/Source/Android/app/src/main/res/layout/dialog_login.xml b/Source/Android/app/src/main/res/layout/dialog_login.xml index 608660817f3..22d11614b7d 100644 --- a/Source/Android/app/src/main/res/layout/dialog_login.xml +++ b/Source/Android/app/src/main/res/layout/dialog_login.xml @@ -57,7 +57,6 @@ android:id="@+id/login_in_progress" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" android:text="@string/achievements_login_in_progress" android:textAlignment="center" android:textColor="?attr/colorOnErrorContainer" @@ -73,7 +72,6 @@ android:id="@+id/login_failed" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="bottom" android:text="@string/achievements_login_failed" android:textAlignment="center" android:textColor="?attr/colorOnErrorContainer" From 604e7fe83315ed9c61beb0f3146dbf44c4c8ae7f Mon Sep 17 00:00:00 2001 From: JosJuice Date: Sun, 23 Nov 2025 11:01:48 +0100 Subject: [PATCH 3/3] Android: Use same margin above login text as below This makes the login dialog look more balanced when "Logging In" or "Login Failed" is visible. --- Source/Android/app/src/main/res/layout/dialog_login.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Source/Android/app/src/main/res/layout/dialog_login.xml b/Source/Android/app/src/main/res/layout/dialog_login.xml index 22d11614b7d..9cba2d98c02 100644 --- a/Source/Android/app/src/main/res/layout/dialog_login.xml +++ b/Source/Android/app/src/main/res/layout/dialog_login.xml @@ -57,6 +57,7 @@ android:id="@+id/login_in_progress" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_large" android:text="@string/achievements_login_in_progress" android:textAlignment="center" android:textColor="?attr/colorOnErrorContainer" @@ -72,6 +73,7 @@ android:id="@+id/login_failed" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/spacing_large" android:text="@string/achievements_login_failed" android:textAlignment="center" android:textColor="?attr/colorOnErrorContainer"