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.

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

[ADD/#35] Color 속성 추가 #36

Merged
merged 3 commits into from
Jul 10, 2024
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 @@ -5,12 +5,14 @@ import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.material3.TopAppBarDefaults
import androidx.compose.runtime.Composable
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.style.TextAlign
import com.terning.core.R
import com.terning.core.designsystem.theme.TerningTheme
import com.terning.core.designsystem.theme.White

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down Expand Up @@ -49,5 +51,6 @@ fun TerningBasicTopAppBar(
action()
}
},
colors = TopAppBarDefaults.topAppBarColors(White)
)
}
17 changes: 11 additions & 6 deletions core/src/main/java/com/terning/core/designsystem/theme/Color.kt
Original file line number Diff line number Diff line change
Expand Up @@ -17,22 +17,27 @@ val Black = Color(0xFF171717)
val TerningMain = Color(0xFF1EA65E)
val TerningMain2 = Color(0xFF179653)

// Sub Color
val TerningSub1 = Color(0xFF179653)
val TerningSub2 = Color(0xFF52C689)
val TerningSub3 = Color(0XFFE2F1E9)
val TerningSub4 = Color(0XFFE9F8F0)
val TerningSub5 = Color(0XFFF8FFFB)

// Background
val Back = Color(0xFFF8F8F8)
val ToastGrey = Color(0XFF666666)

// Calendar Color
val CalRed = Color(0xFFED4E54)

val CalOrange1 = Color(0xFFEE7647)
val CalOrange2 = Color(0xFF5397F3)

val CalYellow = Color(0xFFF5E660)

val CalGreen1 = Color(0xFFC4E953)
val CalGreen2 = Color(0xFF84D558)

val CalBlue1 = Color(0xFF45D0CC)
val CalBlue2 = Color(0xFF4119F2)

val CalPurple = Color(0xFF9B64E2)

val CalPink = Color(0xFFF260AC)

// Other
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import androidx.compose.runtime.staticCompositionLocalOf

private val LightColorScheme = lightColorScheme(
primary = TerningMain,
background = White
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

White 설정 아주 굿이에욤~!!

)

private val LocalTerningTypography = staticCompositionLocalOf<TerningTypography> {
Expand Down
Loading