From f66dc64ef86dee23ec9f673aa256f03f39c17995 Mon Sep 17 00:00:00 2001 From: erinc00 Date: Tue, 12 May 2026 14:38:26 +0300 Subject: [PATCH 1/2] fix(android-auth): replace heart icon with app logo on login/signup --- .../features/auth/presentation/LoginScreen.kt | 7 ++----- .../features/auth/presentation/SignupScreen.kt | 7 ++----- .../com/neph/ui/components/display/BrandLogo.kt | 17 +++++++++++++++++ 3 files changed, 21 insertions(+), 10 deletions(-) diff --git a/android/app/src/main/java/com/neph/features/auth/presentation/LoginScreen.kt b/android/app/src/main/java/com/neph/features/auth/presentation/LoginScreen.kt index feb4f170..c086e6b6 100644 --- a/android/app/src/main/java/com/neph/features/auth/presentation/LoginScreen.kt +++ b/android/app/src/main/java/com/neph/features/auth/presentation/LoginScreen.kt @@ -43,7 +43,7 @@ import com.neph.features.auth.util.isValidEmail import com.neph.ui.components.buttons.PrimaryButton import com.neph.ui.components.buttons.SecondaryButton import com.neph.ui.components.buttons.TextActionButton -import com.neph.ui.components.display.BrandLogo +import com.neph.ui.components.display.AuthHeaderAppLogo import com.neph.ui.components.display.Divider import com.neph.ui.components.display.HelperText import com.neph.ui.components.inputs.AppTextField @@ -212,10 +212,7 @@ fun LoginScreen( title = "Welcome back", subtitle = "Log in to manage your emergency information and stay ready.", logoContent = { - BrandLogo( - size = 64.dp, - showWordmark = false - ) + AuthHeaderAppLogo(size = 64.dp) }, footerContent = { AuthFooterLinks( diff --git a/android/app/src/main/java/com/neph/features/auth/presentation/SignupScreen.kt b/android/app/src/main/java/com/neph/features/auth/presentation/SignupScreen.kt index fa138500..ded41ccf 100644 --- a/android/app/src/main/java/com/neph/features/auth/presentation/SignupScreen.kt +++ b/android/app/src/main/java/com/neph/features/auth/presentation/SignupScreen.kt @@ -43,7 +43,7 @@ import com.neph.features.auth.presentation.components.SocialAuthMode import com.neph.features.auth.util.isValidEmail import com.neph.ui.components.buttons.PrimaryButton import com.neph.ui.components.buttons.SecondaryButton -import com.neph.ui.components.display.BrandLogo +import com.neph.ui.components.display.AuthHeaderAppLogo import com.neph.ui.components.display.Divider import com.neph.ui.components.display.HelperText import com.neph.ui.components.inputs.AppTextField @@ -260,10 +260,7 @@ fun SignupScreen( title = "Create Account", subtitle = "Set up your account and get ready before emergencies happen.", logoContent = { - BrandLogo( - size = 64.dp, - showWordmark = false - ) + AuthHeaderAppLogo(size = 64.dp) }, footerContent = { AuthFooterLinks( diff --git a/android/app/src/main/java/com/neph/ui/components/display/BrandLogo.kt b/android/app/src/main/java/com/neph/ui/components/display/BrandLogo.kt index ac4ce726..1d1c8c32 100644 --- a/android/app/src/main/java/com/neph/ui/components/display/BrandLogo.kt +++ b/android/app/src/main/java/com/neph/ui/components/display/BrandLogo.kt @@ -1,5 +1,6 @@ package com.neph.ui.components.display +import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -14,9 +15,12 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.ContentScale +import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp +import com.neph.R import com.neph.ui.theme.LocalNephSpacing import com.neph.ui.theme.NephShapeTokens @@ -113,3 +117,16 @@ fun BrandLogoCompact( ) } } + +@Composable +fun AuthHeaderAppLogo( + modifier: Modifier = Modifier, + size: Dp = 64.dp +) { + Image( + painter = painterResource(id = R.mipmap.ic_launcher_round), + contentDescription = "NEPH", + modifier = modifier.size(size), + contentScale = ContentScale.Fit + ) +} From 0ceb1729d888a79cd1bfe3a3b30831ce554a2854 Mon Sep 17 00:00:00 2001 From: erinc00 Date: Tue, 12 May 2026 14:40:12 +0300 Subject: [PATCH 2/2] fix(android-auth): use app logo on welcome screen --- .../com/neph/features/auth/presentation/WelcomeScreen.kt | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/android/app/src/main/java/com/neph/features/auth/presentation/WelcomeScreen.kt b/android/app/src/main/java/com/neph/features/auth/presentation/WelcomeScreen.kt index 899a94d5..b863ebe3 100644 --- a/android/app/src/main/java/com/neph/features/auth/presentation/WelcomeScreen.kt +++ b/android/app/src/main/java/com/neph/features/auth/presentation/WelcomeScreen.kt @@ -7,7 +7,7 @@ import androidx.compose.ui.unit.dp import com.neph.ui.components.buttons.PrimaryButton import com.neph.ui.components.buttons.SecondaryButton import com.neph.ui.components.buttons.TextActionButton -import com.neph.ui.components.display.BrandLogo +import com.neph.ui.components.display.AuthHeaderAppLogo import com.neph.ui.layout.AuthScaffold import com.neph.ui.theme.LocalNephSpacing @@ -23,10 +23,7 @@ fun WelcomeScreen( title = "Welcome to NEPH", subtitle = "Prepare, connect, and stay ready with your neighborhood emergency hub.", logoContent = { - BrandLogo( - size = 72.dp, - showWordmark = false - ) + AuthHeaderAppLogo(size = 72.dp) } ) { Column(