Changed color usage to themes, added helvetica bold font and adjusted typographies, adjusted color schemes, added dynamicColor to false for theme to apply properly, used predefined typography for some text

Author: AndrewCheung360

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)

app/src/main/java/com/cornellappdev/hustle/ui/components/onboarding/SignInButton.kt

@@ -1,5 +1,6 @@
 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
@@ -9,17 +10,15 @@ 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.text.font.FontWeight
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import com.cornellappdev.hustle.ui.theme.HelveticaNeue
-import com.cornellappdev.hustle.ui.theme.HustleColors
 import com.cornellappdev.hustle.ui.theme.HustleSpacing
+import com.cornellappdev.hustle.ui.theme.HustleTheme
 
 @Composable
 fun SignInButton(
@@ -32,10 +31,10 @@ fun SignInButton(
         enabled = !isLoading,
         modifier = modifier.fillMaxWidth(),
         colors = ButtonDefaults.buttonColors(
-            containerColor = HustleColors.accentGreen,
-            contentColor = HustleColors.hustleGreen,
-            disabledContainerColor = HustleColors.accentGreen,
-            disabledContentColor = HustleColors.hustleGreen
+            containerColor = MaterialTheme.colorScheme.secondary,
+            contentColor = MaterialTheme.colorScheme.onSecondary,
+            disabledContainerColor = MaterialTheme.colorScheme.secondary,
+            disabledContentColor = MaterialTheme.colorScheme.onSecondary
         ),
         contentPadding = PaddingValues(
             vertical = HustleSpacing.medium
@@ -44,19 +43,18 @@ fun SignInButton(
     ) {
         Row(
             verticalAlignment = Alignment.CenterVertically,
-            horizontalArrangement = Arrangement.spacedBy(HustleSpacing.small)
+            horizontalArrangement = Arrangement.spacedBy(HustleSpacing.small),
+            modifier = Modifier.animateContentSize()
         ) {
             if (isLoading) {
                 CircularProgressIndicator(
-                    color = HustleColors.hustleGreen,
+                    color = MaterialTheme.colorScheme.onSecondary,
                     modifier = Modifier.size(24.dp)
                 )
             }
             Text(
                 text = if (isLoading) "Signing in..." else "Log in with NetID",
-                fontFamily = HelveticaNeue,
-                fontSize = 24.sp,
-                fontWeight = FontWeight.Bold
+                style = MaterialTheme.typography.titleLarge
             )
         }
 
@@ -66,5 +64,7 @@ fun SignInButton(
 @Preview(showBackground = true)
 @Composable
 private fun SignInButtonPreview() {
-    SignInButton(onClick = {}, isLoading = true)
+    HustleTheme(dynamicColor = false) {
+        SignInButton(onClick = {}, isLoading = true)
+    }
 }

app/src/main/java/com/cornellappdev/hustle/ui/navigation/HustleNavigation.kt

@@ -1,6 +1,7 @@
 package com.cornellappdev.hustle.ui.navigation
 
 import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
@@ -10,7 +11,6 @@ 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(
@@ -25,7 +25,7 @@ fun HustleNavigation(
                 BottomNavigationBar(navController = navController)
             }
         },
-        containerColor = if (!isSignedIn) HustleColors.hustleGreen else HustleColors.white
+        containerColor = if (!isSignedIn) MaterialTheme.colorScheme.primary else MaterialTheme.colorScheme.background
     ) { innerPadding ->
         NavHost(
             navController = navController,

app/src/main/java/com/cornellappdev/hustle/ui/screens/onboarding/SignInScreen.kt

@@ -7,6 +7,7 @@ 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
@@ -30,6 +31,7 @@ import com.cornellappdev.hustle.ui.components.general.ErrorMessage
 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
@@ -144,9 +146,7 @@ private fun WelcomeText() {
         Text(
             text = "Browse. Buy. Book.",
             color = HustleColors.white,
-            fontFamily = InstrumentSans,
-            fontSize = 24.sp,
-            fontWeight = FontWeight.Medium
+            style = MaterialTheme.typography.headlineMedium
         )
     }
 }
@@ -163,9 +163,11 @@ class SignInErrorMessageProvider : PreviewParameterProvider<String?> {
 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 = {})
+    }
 }

app/src/main/java/com/cornellappdev/hustle/ui/theme/Color.kt

@@ -5,9 +5,9 @@ import androidx.compose.ui.graphics.Color
 object HustleColors {
     val hustleGreen = Color(0xFF004346)
     val accentGreen = Color(0xFFD5EFB4)
-    val primary = Color(0xFF000000)
-    val tertiary = Color(0xFF2D2D2D)
-    val secondary = Color(0xFF7D8288)
+    val primaryBlack = Color(0xFF000000)
+    val tertiaryGray = Color(0xFF2D2D2D)
+    val secondaryGray = Color(0xFF7D8288)
     val iconInactive = Color(0xFFBEBEBE)
     val stroke = Color(0xFFD6D6D6)
     val wash = Color(0xFFF5F5F5)

app/src/main/java/com/cornellappdev/hustle/ui/theme/Theme.kt

@@ -12,15 +12,37 @@ import androidx.compose.ui.platform.LocalContext
 
 // TODO: Replace with dark mode colors when decided
 private val DarkColorScheme = darkColorScheme(
-    primary = HustleColors.primary,
-    secondary = HustleColors.secondary,
-    tertiary = HustleColors.tertiary
+    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 = HustleColors.primary,
-    secondary = HustleColors.secondary,
-    tertiary = HustleColors.tertiary
+    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),

app/src/main/java/com/cornellappdev/hustle/ui/theme/Type.kt

@@ -12,6 +12,7 @@ import com.cornellappdev.hustle.R
 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)
 )
 
@@ -21,20 +22,25 @@ val HelveticaNeue = FontFamily(
     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 = 32.sp
+        fontSize = 36.sp
     ),
     headlineMedium = TextStyle(
         fontFamily = InstrumentSans,
         fontWeight = FontWeight.Medium,
-        fontSize = 22.sp
+        fontSize = 24.sp
     ),
     headlineSmall = TextStyle(
         fontFamily = InstrumentSans,
-        fontWeight = FontWeight.Medium,
-        fontSize = 20.sp
+        fontWeight = FontWeight.Bold,
+        fontSize = 18.sp
     ),
     bodyLarge = TextStyle(
         fontFamily = InstrumentSans,
@@ -48,8 +54,8 @@ val HustleTypography = Typography(
     ),
     titleLarge = TextStyle(
         fontFamily = HelveticaNeue,
-        fontWeight = FontWeight.Medium,
-        fontSize = 18.sp
+        fontWeight = FontWeight.Bold,
+        fontSize = 24.sp
     ),
     titleMedium = TextStyle(
         fontFamily = HelveticaNeue,
@@ -70,10 +76,5 @@ val HustleTypography = Typography(
         fontFamily = HelveticaNeue,
         fontWeight = FontWeight.Normal,
         fontSize = 12.sp
-    ),
-    labelSmall = TextStyle(
-        fontFamily = InstrumentSans,
-        fontWeight = FontWeight.Normal,
-        fontSize = 14.sp
-    ),
+    )
 )