Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/add colors #9

Merged
merged 1 commit into from
Jul 29, 2024
Merged

Feature/add colors #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
36 changes: 29 additions & 7 deletions core/designsystem/src/main/java/com/goalpanzi/mission_mate/core/designsystem/theme/Color.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,35 @@
package com.goalpanzi.mission_mate.core.designsystem.theme

import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.Color

val Purple80 = Color(0xFFD0BCFF)
val PurpleGrey80 = Color(0xFFCCC2DC)
val Pink80 = Color(0xFFEFB8C8)
val ColorFFFFFFFF = Color(0xFFFFFFFF)
val ColorFF000000 = Color(0xFF000000)
val ColorFF404249 = Color(0xFF404249)
val ColorFF4F505B = Color(0xFF4F505B)
val ColorFF727483 = Color(0xFF727483)

val Purple40 = Color(0xFF6650a4)
val PurpleGrey40 = Color(0xFF625b71)
val Pink40 = Color(0xFF7D5260)
val ColorFFE5E5E5 = Color(0xFFE5E5E5)
val ColorFFF5F6F9 = Color(0xFFF5F6F9)
val Color80919293 = Color(0x80919293)
val Color80B3B3B3 = Color(0x80B3B3B3)

val Orange01 = Color(0xFFF5EDEA)
val ColorFFED645F = Color(0xFFED645F)
val ColorFFED6341 = Color(0xFFED6341)
val ColorFFFBE5E5 = Color(0xFFFBE5E5)
val ColorFFFBE5A4 = Color(0xFFFBE5A4)
val ColorFFF2BD42 = Color(0xFFF2BD42)

val ColorFFCAE59B = Color(0xFFCAE59B)
val ColorFFC4E6FD = Color(0xFFC4E6FD)
val ColorFFC3D7FC = Color(0xFFC3D7FC)
val ColorFFF3D9B8 = Color(0xFFF3D9B8)

val ColorFFF5EDEA = Color(0xFFF5EDEA)

val ColorFFFF5F3C = Color(0xFFFF5F3C)
val ColorFFFFAE50 = Color(0xFFFFAE50)

val Gradient_FFFF5F3C_FFFFAE50 = Brush.verticalGradient(
listOf(ColorFFFF5F3C, ColorFFFFAE50)
)
12 changes: 6 additions & 6 deletions core/designsystem/src/main/java/com/goalpanzi/mission_mate/core/designsystem/theme/Theme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.platform.LocalContext

private val DarkColorScheme = darkColorScheme(
primary = Purple80,
secondary = PurpleGrey80,
tertiary = Pink80
primary = ColorFFED645F,
secondary = ColorFFFBE5A4,
tertiary = ColorFFC4E6FD
)

private val LightColorScheme = lightColorScheme(
primary = Purple40,
secondary = PurpleGrey40,
tertiary = Pink40
primary = ColorFFED6341,
secondary = ColorFFF2BD42,
tertiary = ColorFFC3D7FC
)

@Composable
Expand Down
4 changes: 2 additions & 2 deletions feature/login/src/main/java/com/goalpanzi/mission_mate/feature/login/LoginScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import com.goalpanzi.mission_mate.core.designsystem.theme.ColorFFF5EDEA
import com.goalpanzi.mission_mate.core.designsystem.theme.MissionMateTypography
import com.goalpanzi.mission_mate.core.designsystem.theme.Orange01

@Composable
fun LoginRoute(
Expand All @@ -54,7 +54,7 @@ fun LoginScreen(
Column(
modifier = modifier
.fillMaxSize()
.background(color = Orange01)
.background(color = ColorFFF5EDEA)
.padding(horizontal = 24.dp),
verticalArrangement = Arrangement.Center
) {
Expand Down
Loading