diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e7263e2..1b1f803 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,12 +12,12 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.Hustle" + android:theme="@style/Theme.Hustle.Starting" tools:targetApi="31"> + android:theme="@style/Theme.Hustle.Starting"> diff --git a/app/src/main/java/com/cornellappdev/hustle/MainActivity.kt b/app/src/main/java/com/cornellappdev/hustle/MainActivity.kt index 4361720..400bfb0 100644 --- a/app/src/main/java/com/cornellappdev/hustle/MainActivity.kt +++ b/app/src/main/java/com/cornellappdev/hustle/MainActivity.kt @@ -24,7 +24,7 @@ class MainActivity : ComponentActivity() { enableEdgeToEdge() setContent { - HustleTheme { + HustleTheme(dynamicColor = false) { val rootUiState = rootViewModel.collectUiStateValue() if (!rootUiState.isLoading) { HustleApp(isSignedIn = rootUiState.isSignedIn) diff --git a/app/src/main/java/com/cornellappdev/hustle/data/remote/HustleFirebaseMessagingService.kt b/app/src/main/java/com/cornellappdev/hustle/data/remote/HustleFirebaseMessagingService.kt index b6d2f75..4efbb88 100644 --- a/app/src/main/java/com/cornellappdev/hustle/data/remote/HustleFirebaseMessagingService.kt +++ b/app/src/main/java/com/cornellappdev/hustle/data/remote/HustleFirebaseMessagingService.kt @@ -78,11 +78,10 @@ class HustleFirebaseMessagingService : FirebaseMessagingService() { PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE ) - // TODO: Replace with actual app icon val notification = NotificationCompat.Builder(this, CHANNEL_ID) .setContentTitle(title) .setContentText(body) - .setSmallIcon(R.drawable.ic_google) + .setSmallIcon(R.drawable.ic_hustle_logo) .setAutoCancel(true) .setPriority(NotificationCompat.PRIORITY_HIGH) .setContentIntent(pendingIntent) diff --git a/app/src/main/java/com/cornellappdev/hustle/ui/components/onboarding/GoogleSignInButton.kt b/app/src/main/java/com/cornellappdev/hustle/ui/components/onboarding/GoogleSignInButton.kt deleted file mode 100644 index db55306..0000000 --- a/app/src/main/java/com/cornellappdev/hustle/ui/components/onboarding/GoogleSignInButton.kt +++ /dev/null @@ -1,70 +0,0 @@ -package com.cornellappdev.hustle.ui.components.onboarding - -import androidx.compose.foundation.BorderStroke -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.size -import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.Icon -import androidx.compose.material3.OutlinedButton -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.cornellappdev.hustle.R - -@Composable -fun GoogleSignInButton( - onClick: () -> Unit, - modifier: Modifier = Modifier, - isLoading: Boolean = false -) { - OutlinedButton( - onClick = onClick, - enabled = !isLoading, - modifier = modifier - .fillMaxWidth() - .height(48.dp), - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.White, - contentColor = Color.Black - ), - border = BorderStroke(1.dp, Color.Gray.copy(alpha = 0.3f)) - ) { - Row( - verticalAlignment = Alignment.CenterVertically, - horizontalArrangement = Arrangement.spacedBy(12.dp) - ) { - if (isLoading) { - CircularProgressIndicator( - modifier = Modifier.size(20.dp), - strokeWidth = 2.dp - ) - } else { - Icon( - painter = painterResource(id = R.drawable.ic_google), - contentDescription = "Google Logo", - modifier = Modifier.size(20.dp), - tint = Color.Unspecified - ) - } - - Text( - text = if (isLoading) "Signing in..." else "Continue with Google", - ) - } - } -} - -@Preview(showBackground = true) -@Composable -private fun GoogleSignInButtonPreview() { - GoogleSignInButton(onClick = {}, isLoading = false) -} \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/hustle/ui/components/onboarding/SignInButton.kt b/app/src/main/java/com/cornellappdev/hustle/ui/components/onboarding/SignInButton.kt new file mode 100644 index 0000000..8a35268 --- /dev/null +++ b/app/src/main/java/com/cornellappdev/hustle/ui/components/onboarding/SignInButton.kt @@ -0,0 +1,71 @@ +package com.cornellappdev.hustle.ui.components.onboarding + +import androidx.compose.animation.animateContentSize +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.cornellappdev.hustle.ui.theme.HustleColors +import com.cornellappdev.hustle.ui.theme.HustleSpacing +import com.cornellappdev.hustle.ui.theme.HustleTheme + +@Composable +fun SignInButton( + onClick: () -> Unit, + modifier: Modifier = Modifier, + isLoading: Boolean = false +) { + Button( + onClick = onClick, + enabled = !isLoading, + modifier = modifier.fillMaxWidth(), + colors = ButtonDefaults.buttonColors( + containerColor = HustleColors.accentGreen, + contentColor = HustleColors.hustleGreen, + disabledContainerColor = HustleColors.accentGreen, + disabledContentColor = HustleColors.hustleGreen + ), + contentPadding = PaddingValues( + vertical = HustleSpacing.medium + ), + shape = RoundedCornerShape(15.dp) + ) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(HustleSpacing.small), + modifier = Modifier.animateContentSize() + ) { + if (isLoading) { + CircularProgressIndicator( + color = HustleColors.hustleGreen, + modifier = Modifier.size(24.dp) + ) + } + Text( + text = if (isLoading) "Signing in..." else "Log in with NetID", + style = MaterialTheme.typography.titleLarge + ) + } + + } +} + +@Preview(showBackground = true) +@Composable +private fun SignInButtonPreview() { + HustleTheme(dynamicColor = false) { + SignInButton(onClick = {}, isLoading = true) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/hustle/ui/navigation/HustleNavigation.kt b/app/src/main/java/com/cornellappdev/hustle/ui/navigation/HustleNavigation.kt index fabc973..2afcffe 100644 --- a/app/src/main/java/com/cornellappdev/hustle/ui/navigation/HustleNavigation.kt +++ b/app/src/main/java/com/cornellappdev/hustle/ui/navigation/HustleNavigation.kt @@ -10,6 +10,7 @@ import com.cornellappdev.hustle.ui.navigation.navgraphs.homeNavGraph import com.cornellappdev.hustle.ui.navigation.navgraphs.messagesNavGraph import com.cornellappdev.hustle.ui.navigation.navgraphs.onboardingNavGraph import com.cornellappdev.hustle.ui.navigation.navgraphs.profileNavGraph +import com.cornellappdev.hustle.ui.theme.HustleColors @Composable fun HustleNavigation( @@ -23,7 +24,8 @@ fun HustleNavigation( if (isSignedIn) { BottomNavigationBar(navController = navController) } - } + }, + containerColor = if (!isSignedIn) HustleColors.hustleGreen else HustleColors.white ) { innerPadding -> NavHost( navController = navController, diff --git a/app/src/main/java/com/cornellappdev/hustle/ui/screens/onboarding/SignInScreen.kt b/app/src/main/java/com/cornellappdev/hustle/ui/screens/onboarding/SignInScreen.kt index 601e6da..c5e19c0 100644 --- a/app/src/main/java/com/cornellappdev/hustle/ui/screens/onboarding/SignInScreen.kt +++ b/app/src/main/java/com/cornellappdev/hustle/ui/screens/onboarding/SignInScreen.kt @@ -1,19 +1,38 @@ package com.cornellappdev.hustle.ui.screens.onboarding +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.text.SpanStyle +import androidx.compose.ui.text.buildAnnotatedString +import androidx.compose.ui.text.font.FontStyle +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.PreviewParameter import androidx.compose.ui.tooling.preview.PreviewParameterProvider +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel +import com.cornellappdev.hustle.R import com.cornellappdev.hustle.ui.components.general.ErrorMessage -import com.cornellappdev.hustle.ui.components.onboarding.GoogleSignInButton +import com.cornellappdev.hustle.ui.components.onboarding.SignInButton +import com.cornellappdev.hustle.ui.theme.HustleColors +import com.cornellappdev.hustle.ui.theme.HustleSpacing +import com.cornellappdev.hustle.ui.theme.HustleTheme +import com.cornellappdev.hustle.ui.theme.InstrumentSans import com.cornellappdev.hustle.ui.viewmodels.ActionState import com.cornellappdev.hustle.ui.viewmodels.onboarding.SignInScreenViewModel @@ -49,13 +68,23 @@ private fun SignInScreenContent( onDismissError: () -> Unit, modifier: Modifier = Modifier, ) { - Box(modifier = modifier.fillMaxSize()) { + Box( + modifier = modifier + .fillMaxSize() + .background(HustleColors.hustleGreen) + .padding( + horizontal = HustleSpacing.leftRightMargin + ) + ) { Column( horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center, + verticalArrangement = Arrangement.spacedBy( + 89.dp, alignment = Alignment.CenterVertically + ), modifier = Modifier.fillMaxSize() ) { - GoogleSignInButton( + WelcomeHeader() + SignInButton( onClick = onGoogleSignInButtonClick, isLoading = isSignInLoading ) } @@ -69,6 +98,59 @@ private fun SignInScreenContent( } } +@Composable +private fun WelcomeHeader() { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(HustleSpacing.medium) + ) { + Icon( + painter = painterResource(id = R.drawable.ic_hustle_logo), + contentDescription = "Hustle Logo", + tint = Color.Unspecified + ) + WelcomeText() + } +} + +@Composable +private fun WelcomeText() { + Column( + horizontalAlignment = Alignment.CenterHorizontally, + verticalArrangement = Arrangement.spacedBy(HustleSpacing.extraSmall) + ) { + Text( + buildAnnotatedString { + withStyle( + style = SpanStyle( + color = HustleColors.white, + fontFamily = InstrumentSans, + fontSize = 36.sp, + ) + ) { + append("Welcome to ") + } + withStyle( + style = SpanStyle( + color = HustleColors.white, + fontFamily = InstrumentSans, + fontSize = 36.sp, + fontWeight = FontWeight.Bold, + fontStyle = FontStyle.Italic + ) + ) { + append("Hustle") + } + } + ) + Text( + text = "Browse. Buy. Book.", + color = HustleColors.white, + style = MaterialTheme.typography.headlineMedium + ) + } +} + class SignInErrorMessageProvider : PreviewParameterProvider { override val values = sequenceOf( null, @@ -81,9 +163,11 @@ class SignInErrorMessageProvider : PreviewParameterProvider { private fun SignInScreenPreview( @PreviewParameter(SignInErrorMessageProvider::class) errorMessage: String? ) { - SignInScreenContent( - onGoogleSignInButtonClick = {}, - isSignInLoading = false, - errorMessage = errorMessage, - onDismissError = {}) + HustleTheme(dynamicColor = false) { + SignInScreenContent( + onGoogleSignInButtonClick = {}, + isSignInLoading = false, + errorMessage = errorMessage, + onDismissError = {}) + } } \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/hustle/ui/theme/Color.kt b/app/src/main/java/com/cornellappdev/hustle/ui/theme/Color.kt index 3e39a40..1ae6fd9 100644 --- a/app/src/main/java/com/cornellappdev/hustle/ui/theme/Color.kt +++ b/app/src/main/java/com/cornellappdev/hustle/ui/theme/Color.kt @@ -2,10 +2,15 @@ package com.cornellappdev.hustle.ui.theme import androidx.compose.ui.graphics.Color -val Purple80 = Color(0xFFD0BCFF) -val PurpleGrey80 = Color(0xFFCCC2DC) -val Pink80 = Color(0xFFEFB8C8) - -val Purple40 = Color(0xFF6650a4) -val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +object HustleColors { + val hustleGreen = Color(0xFF004346) + val accentGreen = Color(0xFFD5EFB4) + val primaryBlack = Color(0xFF000000) + val tertiaryGray = Color(0xFF2D2D2D) + val secondaryGray = Color(0xFF7D8288) + val iconInactive = Color(0xFFBEBEBE) + val stroke = Color(0xFFD6D6D6) + val wash = Color(0xFFF5F5F5) + val tint = Color(0xFFB2B3B6) + val white = Color(0xFFFFFFFF) +} diff --git a/app/src/main/java/com/cornellappdev/hustle/ui/theme/Spacing.kt b/app/src/main/java/com/cornellappdev/hustle/ui/theme/Spacing.kt new file mode 100644 index 0000000..8ee19cb --- /dev/null +++ b/app/src/main/java/com/cornellappdev/hustle/ui/theme/Spacing.kt @@ -0,0 +1,16 @@ +package com.cornellappdev.hustle.ui.theme + +import androidx.compose.ui.unit.dp + +object HustleSpacing { + val extraSmall = 8.dp + val small = 12.dp + val medium = 16.dp + val large = 24.dp + val extraLarge = 36.dp + val huge = 64.dp + + val topMarginBig = huge + val topMarginNormal = extraLarge + val leftRightMargin = large +} \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/hustle/ui/theme/Theme.kt b/app/src/main/java/com/cornellappdev/hustle/ui/theme/Theme.kt index eb9d415..cf8e5e5 100644 --- a/app/src/main/java/com/cornellappdev/hustle/ui/theme/Theme.kt +++ b/app/src/main/java/com/cornellappdev/hustle/ui/theme/Theme.kt @@ -10,16 +10,39 @@ import androidx.compose.material3.lightColorScheme import androidx.compose.runtime.Composable import androidx.compose.ui.platform.LocalContext +// TODO: Replace with dark mode colors when decided private val DarkColorScheme = darkColorScheme( - primary = Purple80, - secondary = PurpleGrey80, - tertiary = Pink80 + primary = HustleColors.hustleGreen, + onPrimary = HustleColors.white, + secondary = HustleColors.accentGreen, + onSecondary = HustleColors.hustleGreen, + surface = HustleColors.white, + onSurface = HustleColors.primaryBlack, + onSurfaceVariant = HustleColors.secondaryGray, + surfaceVariant = HustleColors.wash, + surfaceContainer = HustleColors.wash, + surfaceContainerHigh = HustleColors.stroke, + background = HustleColors.white, + onBackground = HustleColors.primaryBlack, + outline = HustleColors.stroke, + outlineVariant = HustleColors.iconInactive ) private val LightColorScheme = lightColorScheme( - primary = Purple40, - secondary = PurpleGrey40, - tertiary = Pink40 + primary = HustleColors.hustleGreen, + onPrimary = HustleColors.white, + secondary = HustleColors.accentGreen, + onSecondary = HustleColors.hustleGreen, + surface = HustleColors.white, + onSurface = HustleColors.primaryBlack, + onSurfaceVariant = HustleColors.secondaryGray, + surfaceVariant = HustleColors.wash, + surfaceContainer = HustleColors.wash, + surfaceContainerHigh = HustleColors.stroke, + background = HustleColors.white, + onBackground = HustleColors.primaryBlack, + outline = HustleColors.stroke, + outlineVariant = HustleColors.iconInactive /* Other default colors to override background = Color(0xFFFFFBFE), @@ -51,7 +74,7 @@ fun HustleTheme( MaterialTheme( colorScheme = colorScheme, - typography = Typography, + typography = HustleTypography, content = content ) } \ No newline at end of file diff --git a/app/src/main/java/com/cornellappdev/hustle/ui/theme/Type.kt b/app/src/main/java/com/cornellappdev/hustle/ui/theme/Type.kt index 0396e67..29f83cd 100644 --- a/app/src/main/java/com/cornellappdev/hustle/ui/theme/Type.kt +++ b/app/src/main/java/com/cornellappdev/hustle/ui/theme/Type.kt @@ -2,33 +2,79 @@ package com.cornellappdev.hustle.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.Font import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.sp +import com.cornellappdev.hustle.R -// Set of Material typography styles to start with -val Typography = Typography( +val InstrumentSans = FontFamily( + Font(R.font.instrument_sans_regular, FontWeight.Normal), + Font(R.font.instrument_sans_medium, FontWeight.Medium), + Font(R.font.instrument_sans_bold, FontWeight.Bold), + Font(R.font.instrument_sans_bold_italic, FontWeight.Bold, FontStyle.Italic) +) + +val HelveticaNeue = FontFamily( + Font(R.font.helvetica_neue_regular, FontWeight.Normal), + Font(R.font.helvetica_neue_medium, FontWeight.Medium), + Font(R.font.helvetica_neue_bold, FontWeight.Bold) +) +val HustleTypography = Typography( + displayLarge = TextStyle( + fontFamily = InstrumentSans, + fontWeight = FontWeight.Bold, + fontSize = 64.sp + ), + headlineLarge = TextStyle( + fontFamily = InstrumentSans, + fontWeight = FontWeight.Medium, + fontSize = 36.sp + ), + headlineMedium = TextStyle( + fontFamily = InstrumentSans, + fontWeight = FontWeight.Medium, + fontSize = 24.sp + ), + headlineSmall = TextStyle( + fontFamily = InstrumentSans, + fontWeight = FontWeight.Bold, + fontSize = 18.sp + ), bodyLarge = TextStyle( - fontFamily = FontFamily.Default, + fontFamily = InstrumentSans, fontWeight = FontWeight.Normal, - fontSize = 16.sp, - lineHeight = 24.sp, - letterSpacing = 0.5.sp - ) - /* Other default text styles to override - titleLarge = TextStyle( - fontFamily = FontFamily.Default, + fontSize = 18.sp + ), + bodyMedium = TextStyle( + fontFamily = InstrumentSans, fontWeight = FontWeight.Normal, - fontSize = 22.sp, - lineHeight = 28.sp, - letterSpacing = 0.sp + fontSize = 16.sp + ), + titleLarge = TextStyle( + fontFamily = HelveticaNeue, + fontWeight = FontWeight.Bold, + fontSize = 24.sp + ), + titleMedium = TextStyle( + fontFamily = HelveticaNeue, + fontWeight = FontWeight.Medium, + fontSize = 16.sp ), - labelSmall = TextStyle( - fontFamily = FontFamily.Default, + titleSmall = TextStyle( + fontFamily = HelveticaNeue, fontWeight = FontWeight.Medium, - fontSize = 11.sp, - lineHeight = 16.sp, - letterSpacing = 0.5.sp + fontSize = 14.sp + ), + labelLarge = TextStyle( + fontFamily = HelveticaNeue, + fontWeight = FontWeight.Normal, + fontSize = 14.sp + ), + labelMedium = TextStyle( + fontFamily = HelveticaNeue, + fontWeight = FontWeight.Normal, + fontSize = 12.sp ) - */ ) \ No newline at end of file diff --git a/app/src/main/res/drawable/hustle_logo_splash.xml b/app/src/main/res/drawable/hustle_logo_splash.xml new file mode 100644 index 0000000..9ced04e --- /dev/null +++ b/app/src/main/res/drawable/hustle_logo_splash.xml @@ -0,0 +1,24 @@ + + + + + + + + diff --git a/app/src/main/res/drawable/ic_google.xml b/app/src/main/res/drawable/ic_google.xml deleted file mode 100644 index d602db0..0000000 --- a/app/src/main/res/drawable/ic_google.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/ic_hustle_logo.xml b/app/src/main/res/drawable/ic_hustle_logo.xml new file mode 100644 index 0000000..5d5283c --- /dev/null +++ b/app/src/main/res/drawable/ic_hustle_logo.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/font/helvetica_neue_bold.otf b/app/src/main/res/font/helvetica_neue_bold.otf new file mode 100644 index 0000000..f44af64 Binary files /dev/null and b/app/src/main/res/font/helvetica_neue_bold.otf differ diff --git a/app/src/main/res/font/helvetica_neue_medium.otf b/app/src/main/res/font/helvetica_neue_medium.otf new file mode 100644 index 0000000..1a2a9df Binary files /dev/null and b/app/src/main/res/font/helvetica_neue_medium.otf differ diff --git a/app/src/main/res/font/helvetica_neue_regular.otf b/app/src/main/res/font/helvetica_neue_regular.otf new file mode 100644 index 0000000..4961505 Binary files /dev/null and b/app/src/main/res/font/helvetica_neue_regular.otf differ diff --git a/app/src/main/res/font/instrument_sans_bold.ttf b/app/src/main/res/font/instrument_sans_bold.ttf new file mode 100644 index 0000000..f602dce Binary files /dev/null and b/app/src/main/res/font/instrument_sans_bold.ttf differ diff --git a/app/src/main/res/font/instrument_sans_bold_italic.ttf b/app/src/main/res/font/instrument_sans_bold_italic.ttf new file mode 100644 index 0000000..122b273 Binary files /dev/null and b/app/src/main/res/font/instrument_sans_bold_italic.ttf differ diff --git a/app/src/main/res/font/instrument_sans_medium.ttf b/app/src/main/res/font/instrument_sans_medium.ttf new file mode 100644 index 0000000..a9df6c6 Binary files /dev/null and b/app/src/main/res/font/instrument_sans_medium.ttf differ diff --git a/app/src/main/res/font/instrument_sans_regular.ttf b/app/src/main/res/font/instrument_sans_regular.ttf new file mode 100644 index 0000000..14c6113 Binary files /dev/null and b/app/src/main/res/font/instrument_sans_regular.ttf differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index f8c6127..cd280e7 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,10 +1,6 @@ - #FFBB86FC - #FF6200EE - #FF3700B3 - #FF03DAC5 - #FF018786 #FF000000 #FFFFFFFF + #004346 \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 56625cb..12c642a 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,9 @@ - \ No newline at end of file