feature/mypage: 마이페이지 ui 구현

core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Button.kt

@@ -3,6 +3,7 @@ package com.kusitms.connectdog.core.designsystem.component
 import androidx.compose.foundation.BorderStroke
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
@@ -71,6 +72,25 @@ fun ConnectDogIconBottomButton(
     }
 }
 
+@Composable
+fun NormalButton(
+    content: String,
+    color: Color = MaterialTheme.colorScheme.primary,
+    onClick: () -> Unit = {},
+    textColor: Color = MaterialTheme.colorScheme.onPrimary,
+    modifier: Modifier = Modifier
+        .fillMaxWidth()
+        .height(56.dp)
+) {
+    ConnectDogBottomButton(
+        onClick = onClick,
+        content = content,
+        color = color,
+        modifier = modifier,
+        textColor = textColor
+    )
+}
+
 @Composable
 fun ConnectDogOutlinedButton(
     width: Int,

core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/Card.kt

@@ -1,19 +1,28 @@
 package com.kusitms.connectdog.core.designsystem.component
 
 import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.getValue
-import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.kusitms.connectdog.core.designsystem.theme.Gray3
+import com.kusitms.connectdog.core.designsystem.theme.Gray7
 
 @Composable
 fun ConnectDogCard(
@@ -33,6 +42,36 @@ fun ConnectDogCard(
     )
 }
 
+@Composable
+fun ConnectDogInformationCard(
+    title: String,
+    content: String
+) {
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(4.dp))
+            .background(Gray7)
+            .padding(all = 10.dp)
+    ) {
+        Column(
+            modifier = Modifier.fillMaxWidth()
+        ) {
+            Text(
+                text = title,
+                fontSize = 14.sp,
+                fontWeight = FontWeight.SemiBold
+            )
+            Spacer(modifier = Modifier.height(5.dp))
+            Text(
+                text = content,
+                fontSize = 14.sp,
+                color = Gray3
+            )
+        }
+    }
+}
+
 @Composable
 fun ConnectDogExpandableCard(
     modifier: Modifier = Modifier,

core/designsystem/src/main/java/com/kusitms/connectdog/core/designsystem/component/TopAppBar.kt

@@ -85,8 +85,14 @@ fun ConnectDogTopAppBar(
             Text(
                 text = stringResource(id = titleRes),
                 color = contentColor,
-                style = MaterialTheme.typography.titleMedium,
-                modifier = Modifier.align(Alignment.Center)
+                style = if (navigationType == TopAppBarNavigationType.MYPAGE) {
+                    MaterialTheme.typography.titleLarge
+                } else { MaterialTheme.typography.titleMedium },
+                modifier = if (navigationType == TopAppBarNavigationType.MYPAGE) {
+                    Modifier.align(Alignment.CenterStart).padding(start = 24.dp)
+                } else {
+                    Modifier.align(Alignment.Center)
+                }
             )
         }
     }
@@ -108,7 +114,7 @@ private fun HomeIcon(
     )
 }
 
-enum class TopAppBarNavigationType { BACK, HOME, CLOSE }
+enum class TopAppBarNavigationType { BACK, HOME, CLOSE, MYPAGE }
 
 @Preview
 @Composable

feature/home/build.gradle.kts

@@ -63,6 +63,8 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtimeCompose)
     implementation(libs.androidx.lifecycle.viewModelCompose)
     implementation(libs.androidx.lifecycle.viewModelKtx)
+    implementation(libs.accompanist.pager)
+    implementation(libs.accompanist.pager.indicators)
 
     // compose
     implementation(platform(libs.androidx.compose.bom))

feature/home/src/main/java/com/kusitms/connectdog/feature/home/navigation/HomeNavigation.kt

@@ -15,6 +15,7 @@ import com.kusitms.connectdog.feature.home.screen.CompleteApplyScreen
 import com.kusitms.connectdog.feature.home.screen.DetailScreen
 import com.kusitms.connectdog.feature.home.screen.FilterSearchRoute
 import com.kusitms.connectdog.feature.home.screen.HomeRoute
+import com.kusitms.connectdog.feature.home.screen.IntermediatorProfileScreen
 import com.kusitms.connectdog.feature.home.screen.ReviewScreen
 import com.kusitms.connectdog.feature.home.screen.SearchScreen
 
@@ -68,6 +69,14 @@ fun NavController.navigateComplete() {
     navigate(HomeRoute.complete)
 }
 
+fun NavController.navigateIntermediatorProfile() {
+    navigate(HomeRoute.intermediatorProfile)
+}
+
+fun NavController.navigateNotification() {
+    navigate(HomeRoute.notification)
+}
+
 fun NavGraphBuilder.homeNavGraph(
     onBackClick: () -> Unit,
     onNavigateToSearch: () -> Unit,
@@ -79,6 +88,8 @@ fun NavGraphBuilder.homeNavGraph(
     onNavigateToCertification: () -> Unit,
     onNavigateToApply: () -> Unit,
     onNavigateToComplete: () -> Unit,
+    onNavigateToIntermediatorProfile: () -> Unit,
+    onNavigateToNotification: () -> Unit,
     onShowErrorSnackBar: (throwable: Throwable?) -> Unit
 ) {
     composable(route = HomeRoute.route) {
@@ -87,6 +98,7 @@ fun NavGraphBuilder.homeNavGraph(
             onNavigateToFilterSearch,
             onNavigateToReview,
             onNavigateToDetail,
+            onNavigateToNotification,
             onShowErrorSnackBar
         )
     }
@@ -147,7 +159,8 @@ fun NavGraphBuilder.homeNavGraph(
     composable(route = HomeRoute.detail) {
         DetailScreen(
             onBackClick = onBackClick,
-            onCertificationClick = onNavigateToCertification
+            onCertificationClick = onNavigateToCertification,
+            onIntermediatorProfileClick = onNavigateToIntermediatorProfile
         )
     }
 
@@ -170,6 +183,18 @@ fun NavGraphBuilder.homeNavGraph(
             onClick = onNavigateToSearch
         )
     }
+
+    composable(route = HomeRoute.intermediatorProfile) {
+        IntermediatorProfileScreen(
+            onBackClick = onBackClick
+        )
+    }
+
+    composable(route = HomeRoute.notification) {
+//        NotificationScreen(
+//            onClick = navigateNotification
+//        )
+    }
 }
 
 object HomeRoute {
@@ -182,4 +207,6 @@ object HomeRoute {
     const val certification = "certification"
     const val apply = "apply"
     const val complete = "complete"
+    const val intermediatorProfile = "intermediatorProfile"
+    const val notification = "notification"
 }

feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/ApplyScreen.kt

@@ -33,6 +33,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.kusitms.connectdog.core.designsystem.R
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar
+import com.kusitms.connectdog.core.designsystem.component.NormalButton
 import com.kusitms.connectdog.core.designsystem.component.NormalTextField
 import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType
 import com.kusitms.connectdog.core.designsystem.theme.Gray2

feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CertificationScreen.kt

@@ -22,6 +22,7 @@ import androidx.compose.ui.unit.sp
 import com.kusitms.connectdog.core.designsystem.R
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTextFieldWithButton
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar
+import com.kusitms.connectdog.core.designsystem.component.NormalButton
 import com.kusitms.connectdog.core.designsystem.component.NormalTextField
 import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType
 

feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/CompleteApplyScreen.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.kusitms.connectdog.core.designsystem.R
+import com.kusitms.connectdog.core.designsystem.component.NormalButton
 import com.kusitms.connectdog.core.designsystem.theme.ConnectDogTheme
 import com.kusitms.connectdog.core.designsystem.theme.Gray2
 

feature/home/src/main/java/com/kusitms/connectdog/feature/home/screen/DetailScreen.kt

@@ -20,7 +20,6 @@ import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Button
 import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Divider
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -29,17 +28,17 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.kusitms.connectdog.core.designsystem.component.ConnectDogBottomButton
+import com.kusitms.connectdog.core.designsystem.component.ConnectDogInformationCard
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTag
 import com.kusitms.connectdog.core.designsystem.component.ConnectDogTopAppBar
 import com.kusitms.connectdog.core.designsystem.component.NetworkImage
+import com.kusitms.connectdog.core.designsystem.component.NormalButton
 import com.kusitms.connectdog.core.designsystem.component.TopAppBarNavigationType
 import com.kusitms.connectdog.core.designsystem.theme.Gray1
 import com.kusitms.connectdog.core.designsystem.theme.Gray2
@@ -56,7 +55,8 @@ internal fun DetailScreen(
     imageUrl: String = "",
     title: String = "인천 댕댕구 -> 서울 댕댕구",
     content: String = "내용",
-    onCertificationClick: () -> Unit
+    onCertificationClick: () -> Unit,
+    onIntermediatorProfileClick: () -> Unit
 ) {
     Scaffold(
         topBar = {
@@ -84,30 +84,11 @@ internal fun DetailScreen(
             )
             Content(title, content)
             DogInfo()
-            IntermediatorInfo()
+            IntermediatorInfo(onIntermediatorProfileClick)
         }
     }
 }
 
-@Composable
-fun NormalButton(
-    content: String,
-    color: Color = PetOrange,
-    onClick: () -> Unit = {},
-    textColor: Color = MaterialTheme.colorScheme.onPrimary,
-    modifier: Modifier = Modifier
-        .fillMaxWidth()
-        .height(56.dp)
-) {
-    ConnectDogBottomButton(
-        onClick = onClick,
-        content = content,
-        color = color,
-        modifier = modifier,
-        textColor = textColor
-    )
-}
-
 @Composable
 fun BookmarkButton(onClick: () -> Unit = {}) {
     val shape = RoundedCornerShape(12.dp)
@@ -220,7 +201,7 @@ fun DogInfo() {
         Spacer(modifier = Modifier.height(8.dp))
         DetailInfo("몸무게", "밍밍이")
         Spacer(modifier = Modifier.height(20.dp))
-        Significant()
+        ConnectDogInformationCard(title = "특이사항", content = "특이사항")
     }
     Divider(
         Modifier
@@ -231,34 +212,9 @@ fun DogInfo() {
 }
 
 @Composable
-fun Significant() {
-    Box(
-        modifier = Modifier
-            .fillMaxWidth()
-            .clip(RoundedCornerShape(4.dp))
-            .background(Gray7)
-            .padding(all = 10.dp)
-    ) {
-        Column(
-            modifier = Modifier.fillMaxWidth()
-        ) {
-            Text(
-                text = "특이사항",
-                fontSize = 14.sp,
-                fontWeight = FontWeight.SemiBold
-            )
-            Spacer(modifier = Modifier.height(5.dp))
-            Text(
-                text = "특이사항",
-                fontSize = 14.sp,
-                color = Gray3
-            )
-        }
-    }
-}
-
-@Composable
-fun IntermediatorInfo() {
+fun IntermediatorInfo(
+    onClick: () -> Unit
+) {
     Column(
         modifier = Modifier
             .fillMaxWidth()
@@ -296,7 +252,8 @@ fun IntermediatorInfo() {
                 modifier = Modifier
                     .width(100.dp)
                     .height(34.dp)
-                    .align(Alignment.CenterVertically)
+                    .align(Alignment.CenterVertically),
+                onClick = onClick
             )
         }
     }