[MERGE] #35 -> develop

[ADD/#35] Color 속성 추가

core/src/main/java/com/terning/core/designsystem/component/topappbar/TerningBasicTopAppBar.kt

@@ -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
@@ -49,5 +51,6 @@ fun TerningBasicTopAppBar(
                 action()
             }
         },
+        colors = TopAppBarDefaults.topAppBarColors(White)
     )
 }

core/src/main/java/com/terning/core/designsystem/theme/Color.kt

@@ -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

core/src/main/java/com/terning/core/designsystem/theme/Theme.kt

@@ -10,6 +10,7 @@ import androidx.compose.runtime.staticCompositionLocalOf
 
 private val LightColorScheme = lightColorScheme(
     primary = TerningMain,
+    background = White
 )
 
 private val LocalTerningTypography = staticCompositionLocalOf<TerningTypography> {