[Feature] 홈 UI 제작 (#24)

* [build] kotlin-Serialization id 수정 * [init] network 모듈 * [build] hilt : migrate from kapt to ksp * [build] kotlin config * [build] testing 모듈에 JVM 플러그인 적용 * [build] ksp, hilt verson up * [build] Build-logic refactoring * [feat] : app 모듈 theme 패키지 제거 * [refactor] : Application과 App 분리 * [refactor] : FunchButtonTextField 포커스 삭제 및 backgroundColor 파라미터 추가 * [feat] : string 리소스 추가 * [feat] : color 추가 (임시) - 디자인 시스템 완성시 교체 * [feat] : 매칭코드, 나의코드, 내프로필 카드 UI 제작 * [refactor] : 카드 고정값 제거, 내프로필 카드 verticalPadding 12.5f.dp로 변경 * [feat] : 내 프로필 조회 카드 UI 추가 * [chore] : reformat * [chore] : reformat * [chore] : app 모듈 Color 파일명 Colors로 변경 * [refactor] : 내 프로필 카드 clip 추가 및 clickable에서 clickableSingle로 변경 * [refactor] : 매칭 카드 고정 높이 제거 * [refactor] : string resouce 이름 변경 * [refactor] : annotatedString 에서 Text Composable 함수 사용으로 변경 * [feat] : 각 font에 lineHeightStyle 추가 * [feat] : 코드 Text에 lineHeightStyle 추가 * [refactor] : 프로필 카운트 카드 AnnotatedString 제거 및 Text Composable 함수 사용으로 변경 * [chore] : reformat --------- Co-authored-by: murjune <[email protected]>
Nexters · Jan 31, 2024 · dfbbfd1 · dfbbfd1
1 parent c6255b5
commit dfbbfd1
Show file tree

Hide file tree

Showing 12 changed files with 392 additions and 166 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 
     <application
-        android:name=".FunchApp"
+        android:name=".FunchApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"

diff --git a/app/src/main/java/com/moya/funch/FunchApp.kt → ...n/java/com/moya/funch/FunchApplication.kt b/app/src/main/java/com/moya/funch/FunchApp.kt → ...n/java/com/moya/funch/FunchApplication.kt
@@ -5,7 +5,7 @@ import dagger.hilt.android.HiltAndroidApp
 import timber.log.Timber
 
 @HiltAndroidApp
-class FunchApp : Application() {
+class FunchApplication : Application() {
     override fun onCreate() {
         super.onCreate()
         initTimber()

diff --git a/app/src/main/java/com/moya/funch/MainActivity.kt b/app/src/main/java/com/moya/funch/MainActivity.kt
@@ -4,13 +4,11 @@ import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
-import androidx.compose.material3.Text
-import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.tooling.preview.Preview
 import com.moya.funch.theme.FunchTheme
+import com.moya.funch.theme.LocalBackgroundTheme
+import com.moya.funch.ui.FunchApp
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint
@@ -19,33 +17,21 @@ class MainActivity : ComponentActivity() {
         super.onCreate(savedInstanceState)
         setContent {
             FunchTheme {
-                // A surface container using the 'background' color from the theme
+                val backgroundColor = LocalBackgroundTheme.current.color
                 Surface(
                     modifier = Modifier.fillMaxSize(),
-                    color = MaterialTheme.colorScheme.background,
+                    color = backgroundColor,
                 ) {
-                    Greeting(name = "Android")
+                    FunchApp(
+                        matchingCode = "",
+                        onMatchingCodeChange = {},
+                        onSearchClick = {},
+                        myCode = "",
+                        onMyProfileClick = {},
+                        viewCount = 12,
+                    )
                 }
             }
         }
     }
 }
-
-@Composable
-fun Greeting(
-    name: String,
-    modifier: Modifier = Modifier,
-) {
-    Text(
-        text = "Hello $name!",
-        modifier = modifier,
-    )
-}
-
-@Preview(showBackground = true)
-@Composable
-fun GreetingPreview() {
-    FunchTheme {
-        Greeting("Android")
-    }
-}
diff --git a/app/src/main/java/com/moya/funch/theme/Colors.kt b/app/src/main/java/com/moya/funch/theme/Colors.kt
@@ -0,0 +1,18 @@
+package com.moya.funch.theme
+
+import androidx.compose.ui.graphics.Color
+
+internal val Coral500 = Color(0xFFF86E6F)
+internal val Lemon500 = Color(0xFFFFE83B)
+internal val Lemon600 = Color(0xFFE1CA13)
+internal val Lemon900 = Color(0xFF90720A)
+internal val Yellow500 = Color(0xFFFFD240)
+internal val Yellow600 = Color(0xFFE1B012)
+internal val White = Color(0xFFFFFFFF)
+internal val Gray900 = Color(0xFF151515)
+internal val Gray800 = Color(0xFF242627)
+internal val Gray700 = Color(0xFF2C2C2C)
+internal val Gray600 = Color(0xFF363636)
+internal val Gray500 = Color(0xFF404040)
+internal val Gray400 = Color(0xFF6D6D6D)
+internal val Gray300 = Color(0xFF9B9B9B)