Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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(
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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

Expand Down Expand Up @@ -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
)
}
Loading