#11 프로필 & 좋아요 리스트 구현 중

app/src/main/AndroidManifest.xml

@@ -18,9 +18,9 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:icon="@mipmap/ic_alddeul_logo_foreground"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_alddeul_logo_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.AlddeulBabsang"
         android:usesCleartextTraffic="true"

app/src/main/java/com/hackathon/alddeul_babsang/core_ui/component/AlddeulButton.kt

@@ -1,31 +1,49 @@
 package com.hackathon.alddeul_babsang.core_ui.component
 
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import com.hackathon.alddeul_babsang.core_ui.theme.Orange900
 import com.hackathon.alddeul_babsang.core_ui.theme.White
 import com.hackathon.alddeul_babsang.core_ui.theme.title4Bold
 
 @Composable
 fun AlddeulButton(
     text: Int,
+    textColor: Color = White,
+    color: Color = Orange900,
+    stroke: Color = Orange900,
     onClick: () -> Unit
 ) {
     Button(
         modifier = Modifier
-            .fillMaxWidth(),
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(40.dp)),
+        border = BorderStroke(
+            width = 1.dp,
+            color = stroke
+        ),
+        colors = ButtonDefaults.buttonColors(
+            containerColor = color
+        ),
         contentPadding = PaddingValues(vertical = 19.dp),
         onClick = { onClick() }
     ) {
         Text(
             text = stringResource(id = text),
             style = title4Bold,
-            color = White
+            color = textColor
         )
     }
 }

app/src/main/java/com/hackathon/alddeul_babsang/core_ui/component/AlddeulHeader.kt

@@ -0,0 +1,22 @@
+package com.hackathon.alddeul_babsang.core_ui.component
+
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.hackathon.alddeul_babsang.core_ui.theme.Gray900
+import com.hackathon.alddeul_babsang.core_ui.theme.head7Semi
+
+@Composable
+fun AlddeulHeader(
+    text: Int
+) {
+    Text(
+        modifier = Modifier.padding(top = 20.dp, bottom = 12.dp),
+        text = stringResource(id = text),
+        style = head7Semi,
+        color = Gray900
+    )
+}

app/src/main/java/com/hackathon/alddeul_babsang/core_ui/component/AuthTextField.kt

@@ -0,0 +1,60 @@
+package com.hackathon.alddeul_babsang.core_ui.component
+
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.hackathon.alddeul_babsang.core_ui.theme.Gray200
+import com.hackathon.alddeul_babsang.core_ui.theme.Orange900
+import com.hackathon.alddeul_babsang.core_ui.theme.Regular
+import com.hackathon.alddeul_babsang.core_ui.theme.body1Regular
+
+@Composable
+fun AuthTextField(
+    modifier: Modifier = Modifier,
+    value: String,
+    onValueChange: (String) -> Unit,
+    placeholderText: String,
+    textAlign: TextAlign = TextAlign.Start
+) {
+    TextField(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(horizontal = 18.dp),
+        value = value,
+        onValueChange = onValueChange,
+        placeholder = {
+            Text(
+                modifier = Modifier.fillMaxWidth(),
+                text = placeholderText,
+                style = body1Regular,
+                color = Gray200,
+                textAlign = textAlign
+            )
+        },
+        textStyle = body1Regular.copy(textAlign = textAlign),
+        colors = TextFieldDefaults.colors(
+            focusedContainerColor = Color.Transparent,
+            unfocusedContainerColor = Color.Transparent,
+            focusedIndicatorColor = Orange900,
+            unfocusedIndicatorColor = Regular
+        )
+    )
+}
+
+@Preview(showBackground = true)
+@Composable
+fun AuthTextFieldPreview() {
+    AuthTextField(
+        value = "",
+        onValueChange = {},
+        placeholderText = "아이디",
+    )
+}

app/src/main/java/com/hackathon/alddeul_babsang/core_ui/component/ReportTextField.kt

@@ -0,0 +1,49 @@
+package com.hackathon.alddeul_babsang.core_ui.component
+
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import com.hackathon.alddeul_babsang.core_ui.theme.Gray200
+import com.hackathon.alddeul_babsang.core_ui.theme.White
+import com.hackathon.alddeul_babsang.core_ui.theme.body1Regular
+
+@Composable
+fun ReportTextField(
+    value: String,
+    onValueChange: (String) -> Unit,
+    placeholder: Int,
+) {
+    TextField(
+        modifier = Modifier
+            .fillMaxWidth()
+            .border(
+                width = 1.dp,
+                color = Gray200,
+                shape = RoundedCornerShape(10.dp)
+            ),
+        value = value,
+        onValueChange = onValueChange,
+        placeholder = {
+            Text(
+                text = stringResource(id = placeholder),
+                style = body1Regular,
+                color = Gray200
+            )
+        },
+        textStyle = body1Regular,
+        colors = TextFieldDefaults.colors(
+            focusedContainerColor = White,
+            unfocusedContainerColor = White,
+            focusedIndicatorColor = Color.Transparent,
+            unfocusedIndicatorColor = Color.Transparent
+        )
+    )
+}

app/src/main/java/com/hackathon/alddeul_babsang/core_ui/component/ReportWriteArea.kt

@@ -0,0 +1,18 @@
+package com.hackathon.alddeul_babsang.core_ui.component
+
+import androidx.compose.runtime.Composable
+
+@Composable
+fun ReportWriteArea(
+    text: Int,
+    value: String,
+    onValueChange: (String) -> Unit,
+    placeholder: Int
+) {
+    AlddeulHeader(text = text)
+    ReportTextField(
+        value = value,
+        onValueChange = onValueChange,
+        placeholder = placeholder
+    )
+}

app/src/main/java/com/hackathon/alddeul_babsang/core_ui/component/AlddeulTextField.kt → app/src/main/java/com/hackathon/alddeul_babsang/core_ui/component/ReviewTextField.kt

@@ -18,7 +18,7 @@ import com.hackathon.alddeul_babsang.core_ui.theme.White
 import com.hackathon.alddeul_babsang.core_ui.theme.body4Regular
 
 @Composable
-fun AlddeulTextField(
+fun ReviewTextField(
     value: String,
     onValueChange: (String) -> Unit,
     placeholder: Int,

app/src/main/java/com/hackathon/alddeul_babsang/core_ui/theme/Color.kt

@@ -39,6 +39,9 @@ val Blue = Color(0xFFFF5A82EA)
 val Yellow = Color(0xFFFAB935)
 val Red = Color(0xFFFF0400)
 val Pink = Color(0xFFFF8886)
+val Peach200 = Color(0xFFFECC90)
+val Peach100 = Color(0xFFFFEFD3)
+val Peach50 = Color(0xFFFFFBF6)
 val White = Color(0xFFFFFFFF)
 
 // Font

app/src/main/java/com/hackathon/alddeul_babsang/core_ui/theme/Type.kt

@@ -23,6 +23,7 @@ val Typography = Typography(
 val pretendardBold = FontFamily(Font(R.font.pretendard_bold, FontWeight.Bold))
 val pretendardSemiBold = FontFamily(Font(R.font.pretendard_semibold, FontWeight.SemiBold))
 val pretendardRegular = FontFamily(Font(R.font.pretendard_regular, FontWeight.Normal))
+val bmDohyeon = FontFamily(Font(R.font.bm_dohyeon, FontWeight.Normal))
 
 // Head1
 val head1Bold =
@@ -345,3 +346,9 @@ val body7Regular =
         fontSize = 9.sp,
         lineHeight = 16.sp,
     )
+
+// BmDohyeon
+val bmDohyeonRegular = TextStyle(
+    fontFamily = bmDohyeon,
+    fontSize = 36.sp,
+)

app/src/main/java/com/hackathon/alddeul_babsang/presentation/auth/navigation/AuthNavGraph.kt

@@ -0,0 +1,31 @@
+package com.hackathon.alddeul_babsang.presentation.auth.navigation
+
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.compose.composable
+import com.hackathon.alddeul_babsang.presentation.auth.screen.LoginRoute
+import com.hackathon.alddeul_babsang.presentation.auth.screen.SignUp1Route
+import com.hackathon.alddeul_babsang.presentation.auth.screen.SignUp2Route
+
+fun NavGraphBuilder.loginNavGraph(
+    navigator: AuthNavigator
+) {
+    composable(route = "login") {
+        LoginRoute(navigator)
+    }
+}
+
+fun NavGraphBuilder.signUp1NavGraph(
+    navigator: AuthNavigator
+) {
+    composable(route = "signUp1") {
+        SignUp1Route(navigator)
+    }
+}
+
+fun NavGraphBuilder.signUp2NavGraph(
+    navigator: AuthNavigator
+) {
+    composable(route = "signUp2") {
+        SignUp2Route(navigator)
+    }
+}