Feat/#5 mypage screen구현

core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/Spinner.kt

@@ -23,7 +23,7 @@ import com.umcspot.spot.ui.extension.screenWidthDp
 @Composable
 fun SpotSpinner(
     modifier: Modifier = Modifier,
-    size: Dp = 24.dp,
+    size: Dp = screenWidthDp(24.dp),
     speed: Float = 1f,
     isPlaying: Boolean = true,
     iterations: Int = LottieConstants.IterateForever,
@@ -53,7 +53,7 @@ fun SpotSpinner(
         speed = speed,
         dynamicProperties = dynamicProps,
         modifier = modifier
-            .size(screenWidthDp(size))
+            .size(size)
             .semantics {
                 if (contentDescription != null) this.contentDescription = contentDescription
             }

core/designsystem/src/main/java/com/umcspot/spot/designsystem/component/study/StudyItem.kt

@@ -2,17 +2,15 @@ package com.umcspot.spot.designsystem.component.study
 
 import androidx.annotation.DrawableRes
 import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 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.size
 import androidx.compose.foundation.layout.width
-import androidx.compose.material3.HorizontalDivider
+import androidx.compose.foundation.layout.wrapContentWidth
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -25,12 +23,10 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
 import com.umcspot.spot.designsystem.R
 import com.umcspot.spot.designsystem.component.button.ClickSurface
 import com.umcspot.spot.designsystem.shapes.SpotShapes
-import com.umcspot.spot.designsystem.theme.G300
 import com.umcspot.spot.designsystem.theme.SpotTheme
 import com.umcspot.spot.model.ImageRef
 import com.umcspot.spot.study.model.StudyResult
@@ -42,15 +38,17 @@ fun StudyListItem(
     item: StudyResult,
     modifier: Modifier = Modifier,
     onClick: (StudyResult) -> Unit = {},
+    meetballSlot: (@Composable () -> Unit)? = null,
+    checkAppliedSlot: (@Composable () -> Unit)? = null
 ) {
     ClickSurface(
-        onClick = { onClick(item)},
+        onClick = { onClick(item) },
         modifier = modifier
     ) {
         Row(
             modifier = Modifier.padding(screenWidthDp(7.dp)),
             horizontalArrangement = Arrangement.spacedBy(13.dp),
-            verticalAlignment = Alignment.CenterVertically
+            verticalAlignment = Alignment.Top
         ) {
             StudyThumbnail(
                 imageRef = item.profileImageUrl,
@@ -62,22 +60,31 @@ fun StudyListItem(
             // 텍스트 + 통계
             Column(
                 modifier = Modifier
-                    .fillMaxWidth()
+                    .wrapContentWidth()
                     .height(screenHeightDp(73.dp))
                     .padding(screenHeightDp(4.dp))
-            ){
-                Text(
-                    text = item.name,
-                    style = SpotTheme.typography.h5,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
-                )
-                Text(
-                    text = item.description,
-                    style = SpotTheme.typography.regular_400,
-                    maxLines = 1,
-                    overflow = TextOverflow.Ellipsis
-                )
+            ) {
+                Row{
+                    Column{
+                        Text(
+                            text = item.name,
+                            style = SpotTheme.typography.h5,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis
+                        )
+                        Text(
+                            text = item.description,
+                            style = SpotTheme.typography.regular_400,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis
+                        )
+                    }
+                    if (checkAppliedSlot != null) {
+                        Spacer(modifier = Modifier.weight(1f))
+
+                        checkAppliedSlot()
+                    }
+                }
 
                 Spacer(modifier = Modifier.weight(1f))
 
@@ -95,6 +102,11 @@ fun StudyListItem(
                     )
                 }
             }
+            Spacer(modifier = Modifier.weight(1f))
+
+            if (meetballSlot != null) {
+                meetballSlot()
+            }
         }
     }
 }
@@ -109,6 +121,9 @@ private fun Stat(
     val display = if (count1 != 0) "${cap(count1)} / ${cap(count2)}" else cap(count2)
 
     Row(
+        modifier = Modifier
+            .width(screenWidthDp(56.dp))
+            .height(screenHeightDp(17.dp)),
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(screenWidthDp(4.dp))
     ) {
@@ -142,6 +157,7 @@ fun StudyThumbnail(
                 modifier = modifier
             )
         }
+
         is ImageRef.Url -> {
             AsyncImage(
                 model = img.url,
@@ -151,6 +167,7 @@ fun StudyThumbnail(
                 modifier = modifier
             )
         }
+
         ImageRef.None, null -> {
             Image(
                 painter = painterResource(placeholder),
@@ -174,10 +191,10 @@ fun StudyThumbnail(
 
 /* ============== Preview ============== */
 
-@Preview(showBackground = true, widthDp = 300)
+@Preview(showBackground = true, widthDp = 326)
 @Composable
 private fun StudyListItemPreview() {
-    SpotTheme{
+    SpotTheme {
         StudyListItem(
             item = StudyResult(
                 id = 1,
@@ -189,9 +206,10 @@ private fun StudyListItemPreview() {
                 isLiked = false,
                 hitCount = 1200,
                 profileImageUrl = ImageRef.Name("spot_logo"),
+                isOwner = false
             ),
             modifier = Modifier.padding(10.dp),
-            onClick = {}
+            onClick = {},
         )
     }
 }

data/study/src/main/java/com/umcspot/spot/study/datasource/StudyDataSource.kt

@@ -38,4 +38,10 @@ interface StudyDataSource {
         cursor: Long?,
         size: Int
     ): BaseResponse<StudyResponseDto>
+
+    suspend fun getMyPageStudy(
+        statuses : List<String>,
+        cursor: Long?,
+        size: Int
+    ): BaseResponse<StudyResponseDto>
 }

data/study/src/main/java/com/umcspot/spot/study/datasourceimpl/StudyDataSourceImpl.kt

@@ -84,4 +84,15 @@ class StudyDataSourceImpl @Inject constructor(
             cursor = cursor,
             size = size
         )
+
+    override suspend fun getMyPageStudy(
+        statuses: List<String>,
+        cursor: Long?,
+        size: Int
+    ): BaseResponse<StudyResponseDto> =
+        studyService.getMyPageStudy(
+            statuses = statuses,
+            cursor = cursor,
+            size = size
+        )
 }

data/study/src/main/java/com/umcspot/spot/study/dto/response/StudyResponseDto.kt

@@ -42,6 +42,9 @@ data class Study (
     @SerialName("isLiked")
     val isLiked: Boolean,
 
+    @SerialName("isOwner")
+    val isOwner: Boolean,
+
     @SerialName("hitCount")
     val hitCount: Int = 0,
 

data/study/src/main/java/com/umcspot/spot/study/mapper/StudyMapper.kt

@@ -28,6 +28,7 @@ fun Study.toDomain() : StudyResult =
         currentMembers = this.currentMembers,
         likeCount = this.likeCount,
         isLiked = this.isLiked,
+        isOwner = this.isOwner,
         hitCount = this.hitCount,
         profileImageUrl = this.profileImageUrl.toImageRef()
     )

data/study/src/main/java/com/umcspot/spot/study/repositoryimpl/StudyRepositoryImpl.kt

@@ -129,4 +129,49 @@ class StudyRepositoryImpl @Inject constructor(
         }.onFailure { e ->
             Log.e("StudyRepository", "getLikedStudies failed", e)
         }
+
+    override suspend fun getParticipatingStudy(
+        cursor: Long?,
+        size: Int
+    ): Result<StudyResultList> =
+        runCatching {
+            val response = studyDataSource.getMyPageStudy(
+                statuses = listOf("OWNER","APPROVED"),
+                cursor = cursor,
+                size = size
+            )
+            response.result.toDomainList()
+        }.onFailure { e ->
+            Log.e("StudyRepository", "getParticipatingStudy failed", e)
+        }
+
+    override suspend fun getRecruitingStudy(
+        cursor: Long?,
+        size: Int
+    ): Result<StudyResultList> =
+        runCatching {
+            val response = studyDataSource.getMyPageStudy(
+                statuses = listOf("OWNER"),
+                cursor = cursor,
+                size = size
+            )
+            response.result.toDomainList()
+        }.onFailure { e ->
+            Log.e("StudyRepository", "getRecruitingStudy failed", e)
+        }
+
+    override suspend fun getWaitingStudy(
+        cursor: Long?,
+        size: Int
+    ): Result<StudyResultList> =
+        runCatching {
+            val response = studyDataSource.getMyPageStudy(
+                statuses = listOf("APPLIED"),
+                cursor = cursor,
+                size = size
+            )
+            response.result.toDomainList()
+        }.onFailure { e ->
+            Log.e("StudyRepository", "getRecruitingStudy failed", e)
+        }
 }

data/study/src/main/java/com/umcspot/spot/study/service/StudyService.kt

@@ -66,4 +66,11 @@ interface StudyService {
         @Part request: MultipartBody.Part,
         @Part imageFile: MultipartBody.Part?
     ): BaseResponse<CreateStudyResponseDto>
+
+    @GET("/api/studies/me")
+    suspend fun getMyPageStudy(
+        @Query("statuses") statuses: List<String>,
+        @Query("cursor") cursor: Long?,
+        @Query("size") size: Int
+    ): BaseResponse<StudyResponseDto>
 }

data/weather/src/main/java/com/umcspot/spot/weather/dto/response/WeatherResponseDto.kt

@@ -1,10 +1,8 @@
 package com.umcspot.spot.weather.dto.response
 
 import android.annotation.SuppressLint
-import com.umcspot.spot.model.WeatherType
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
-import java.time.LocalTime
 
 @SuppressLint("UnsafeOptInUsageError")
 @Serializable
@@ -20,7 +18,7 @@ data class WeatherResponse(
     val header: WeatherHeader,
 
     @SerialName("body")
-    val body: WeatherBody
+    val body: WeatherBody? = null
 )
 
 @SuppressLint("UnsafeOptInUsageError")

data/weather/src/main/java/com/umcspot/spot/weather/mapper/WeatherMapper.kt

@@ -7,7 +7,7 @@ import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 
 fun WeatherResponseDto.toDomain(): WeatherResult {
-    val items = response.body.items.item
+    val items = response.body!!.items.item
 
     // 기준 시간 (HHmm)
     val time = items.firstOrNull()?.baseTime

domain/study/src/main/java/com/umcspot/spot/study/model/StudyResult.kt

@@ -27,6 +27,7 @@ data class StudyResult(
     val currentMembers: Int = 0,
     val likeCount: Int = 0,
     val isLiked : Boolean,
+    val isOwner : Boolean,
     val hitCount: Int = 0,
     val profileImageUrl: ImageRef
 ) {
@@ -51,6 +52,7 @@ data class StudyResult(
                 currentMembers = mem,
                 likeCount = 10 + index * 2,
                 isLiked = index%2 == 0,
+                isOwner = index%2 == 1,
                 hitCount = 150 + index * 20,
                 profileImageUrl = ImageRef.Name("ic_study_default")
             )

domain/study/src/main/java/com/umcspot/spot/study/repository/StudyRepository.kt

@@ -45,4 +45,19 @@ interface StudyRepository {
         cursor: Long?,
         size: Int,
     ): Result<StudyResultList>
+
+    suspend fun getParticipatingStudy(
+        cursor: Long?,
+        size: Int,
+    ): Result<StudyResultList>
+
+    suspend fun getRecruitingStudy(
+        cursor: Long?,
+        size: Int,
+    ): Result<StudyResultList>
+
+    suspend fun getWaitingStudy(
+        cursor: Long?,
+        size: Int,
+    ): Result<StudyResultList>
 }