Feature#137 : 마이페이지 디테일 수정 및 이전 활동내역 작업 완료

app/src/main/java/com/yapp/app/official/navigation/YappNavHost.kt

@@ -8,6 +8,7 @@ import androidx.navigation.compose.NavHost
 import com.yapp.app.official.ui.NavigatorState
 import com.yapp.app.official.ui.clearBackStackNavOptions
 import com.yapp.feature.history.navigation.attendanceHistoryNavGraph
+import com.yapp.feature.history.navigation.previousHistoryNavGraph
 import com.yapp.feature.home.navigation.homeNavGraph
 import com.yapp.feature.home.navigation.settingNavGraph
 import com.yapp.feature.login.navigation.loginNavGraph
@@ -81,11 +82,14 @@ fun YappNavHost(
         profileNavGraph(
             onNavigateToSetting = { navigator.navigateSettingScreen() },
             onNavigateToLogin = { navigator.navigateLoginScreen(clearBackStackNavOptions) },
-            onNavigateToPreviousHistory = {},
+            onNavigateToPreviousHistory = { navigator.navigateToPreviousHistory() },
             onNavigateToAttendHistory = { navigator.navigateToAttendance() }
         )
         attendanceHistoryNavGraph(
             navigateToBack = { navigator.popBackStack() }
         )
+        previousHistoryNavGraph(
+            navigateToBack = { navigator.popBackStack() }
+        )
     }
 }

app/src/main/java/com/yapp/app/official/ui/Navigator.kt

@@ -14,6 +14,7 @@ import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navOptions
 import com.yapp.app.official.navigation.TopLevelDestination
 import com.yapp.feature.history.navigation.navigateToAttendance
+import com.yapp.feature.history.navigation.navigateToPreviousHistory
 import com.yapp.feature.home.navigation.navigateToHome
 import com.yapp.feature.home.navigation.navigateToSetting
 import com.yapp.feature.login.navigation.LoginRoute
@@ -86,6 +87,10 @@ class NavigatorState(
         navController.navigateToAttendance()
     }
 
+    fun navigateToPreviousHistory() {
+        navController.navigateToPreviousHistory()
+    }
+
     fun popBackStack() {
         navController.popBackStack()
     }

core/data-api/src/main/java/com/yapp/dataapi/UserRepository.kt

@@ -1,10 +1,12 @@
 package com.yapp.dataapi
 
+import com.yapp.model.ActivityHistory
 import com.yapp.model.UserInfo
 import kotlinx.coroutines.flow.Flow
 
 interface UserRepository {
     suspend fun getUserAccessToken() : Flow<String>
     suspend fun deleteAccount()
     suspend fun getUserProfile(): Flow<UserInfo>
+    fun getUserActivityHistories(): Flow<ActivityHistory>
 }

core/data/src/main/java/com/yapp/core/data/data/repository/ScheduleRepositoryImpl.kt

@@ -10,7 +10,7 @@ internal class ScheduleRepositoryImpl @Inject constructor(
     private val scheduleApi: ScheduleApi
 ): ScheduleRepository{
     override fun getSessions() = flow {
-        emit(scheduleApi.getSessions().map { result ->
+        emit(scheduleApi.getSessions().sessions.map { result ->
             Sessions(
                 id = result.id,
                 name = result.name,

core/data/src/main/java/com/yapp/core/data/data/repository/UserRepositoryImpl.kt

@@ -3,6 +3,7 @@ package com.yapp.core.data.data.repository
 import com.yapp.core.data.local.SecurityPreferences
 import com.yapp.core.data.remote.api.UserApi
 import com.yapp.dataapi.UserRepository
+import com.yapp.model.ActivityHistory
 import com.yapp.model.UserInfo
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.flow
@@ -22,4 +23,7 @@ internal class UserRepositoryImpl @Inject constructor(
     }
 
     override suspend fun getUserProfile() = flow<UserInfo> {  emit(userApi.getUserProfile().toModel())}
-}
+    override fun getUserActivityHistories() = flow {
+        emit(userApi.getUserActivityHistories().toModel())
+    }
+}

core/data/src/main/java/com/yapp/core/data/remote/api/ScheduleApi.kt

@@ -7,7 +7,7 @@ import retrofit2.http.Query
 
 interface ScheduleApi {
     @GET("v1/sessions")
-    suspend fun getSessions(): List<SessionResponse>
+    suspend fun getSessions(): SessionResponse
 
     @GET("v1/schedules")
     suspend fun getSchedules(

core/data/src/main/java/com/yapp/core/data/remote/api/UserApi.kt

@@ -1,5 +1,6 @@
 package com.yapp.core.data.remote.api
 
+import com.yapp.core.data.remote.model.response.UserActivityHistoryResponse
 import com.yapp.core.data.remote.model.response.UserProfileResponse
 import retrofit2.http.DELETE
 import retrofit2.http.GET
@@ -10,4 +11,7 @@ interface UserApi {
 
     @DELETE("v1/auth/user")
     suspend fun deleteUser()
+
+    @GET("v1/users/activity-histories")
+    suspend fun getUserActivityHistories(): UserActivityHistoryResponse
 }

core/data/src/main/java/com/yapp/core/data/remote/model/response/SessionResponse.kt

@@ -4,12 +4,17 @@ import kotlinx.serialization.Serializable
 
 @Serializable
 data class SessionResponse(
-    val id: String,
-    val name: String,
-    val place: String?,
-    val date: String,
-    val endDate: String?,
-    val time: String?,
-    val type: String,
-    val progressPhase: String
-)
+    val sessions: List<Session>
+) {
+    @Serializable
+    data class Session(
+        val id: String,
+        val name: String,
+        val place: String?,
+        val date: String,
+        val endDate: String?,
+        val time: String?,
+        val type: String,
+        val progressPhase: String
+    )
+}

core/data/src/main/java/com/yapp/core/data/remote/model/response/UserActivityHistoryResponse.kt

@@ -0,0 +1,30 @@
+package com.yapp.core.data.remote.model.response
+
+import com.yapp.model.ActivityHistory
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UserActivityHistoryResponse(
+    val activityUnits: List<Unit>
+) {
+    @Serializable
+    data class Unit(
+        val generation: Int,
+        val position: String,
+        val activityStartDate: String?,
+        val activityEndDate: String?
+    )
+
+    fun toModel(): ActivityHistory {
+        return ActivityHistory(
+            activityUnits = activityUnits.map {
+                ActivityHistory.Unit(
+                    generation = it.generation,
+                    position = it.position,
+                    activityStartDate = it.activityStartDate,
+                    activityEndDate = it.activityEndDate
+                )
+            }
+        )
+    }
+}

core/model/src/main/java/com/yapp/model/ActivityHistory.kt

@@ -0,0 +1,12 @@
+package com.yapp.model
+
+data class ActivityHistory(
+    val activityUnits: List<Unit>
+) {
+    data class Unit(
+        val generation: Int,
+        val position: String,
+        val activityStartDate: String?,
+        val activityEndDate: String?
+    )
+}

core/model/src/main/java/com/yapp/model/Sessions.kt

@@ -11,6 +11,6 @@ data class Sessions(
     val progressPhase: String
 ) {
     enum class AttendType {
-
+        OFFLINE, TEAM
     }
 }

feature/history/src/main/java/com/yapp/feature/history/AttendHistoryContract.kt → feature/history/src/main/java/com/yapp/feature/history/attend/AttendHistoryContract.kt

@@ -1,4 +1,4 @@
-package com.yapp.feature.history
+package com.yapp.feature.history.attend
 
 import com.yapp.model.Sessions
 

feature/history/src/main/java/com/yapp/feature/history/AttendHistoryScreen.kt → feature/history/src/main/java/com/yapp/feature/history/attend/AttendHistoryScreen.kt

@@ -1,4 +1,4 @@
-package com.yapp.feature.history
+package com.yapp.feature.history.attend
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
@@ -18,13 +18,14 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.yapp.core.designsystem.component.header.YappHeaderActionbar
 import com.yapp.core.designsystem.theme.YappTheme
-import com.yapp.feature.history.components.AttendanceStatusSection
-import com.yapp.feature.history.components.StatusItem
+import com.yapp.feature.history.R
+import com.yapp.feature.history.attend.components.AttendanceStatusSection
+import com.yapp.feature.history.attend.components.StatusItem
 import com.yapp.model.Sessions
 import kotlinx.coroutines.flow.launchIn
 import kotlinx.coroutines.flow.onEach
-import com.yapp.feature.history.AttendHistoryIntent as Intent
-import com.yapp.feature.history.AttendHistorySideEffect as SideEffect
+import com.yapp.feature.history.attend.AttendHistoryIntent as Intent
+import com.yapp.feature.history.attend.AttendHistorySideEffect as SideEffect
 import com.yapp.core.designsystem.R as coreDesignR
 
 @Composable

feature/history/src/main/java/com/yapp/feature/history/AttendHistoryUseCase.kt → feature/history/src/main/java/com/yapp/feature/history/attend/AttendHistoryUseCase.kt

@@ -1,17 +1,17 @@
-package com.yapp.feature.history
+package com.yapp.feature.history.attend
 
 import com.yapp.dataapi.AttendanceRepository
-import com.yapp.dataapi.SessionRepository
+import com.yapp.dataapi.ScheduleRepository
 import kotlinx.coroutines.flow.combine
 import javax.inject.Inject
 
 internal class AttendHistoryUseCase @Inject constructor(
     private val attendanceRepository: AttendanceRepository,
-    private val sessionRepository: SessionRepository
+    private val scheduleRepository: ScheduleRepository
 ){
     operator fun invoke() = combine(
         attendanceRepository.getAttendanceStatistics(),
-        sessionRepository.getSessions()
+        scheduleRepository.getSessions()
     ) { attendStatistics, sessions ->
         attendStatistics to sessions
     }

feature/history/src/main/java/com/yapp/feature/history/AttendHistoryViewModel.kt → feature/history/src/main/java/com/yapp/feature/history/attend/AttendHistoryViewModel.kt

@@ -1,4 +1,4 @@
-package com.yapp.feature.history
+package com.yapp.feature.history.attend
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope

feature/history/src/main/java/com/yapp/feature/history/components/AttendanceStatusSession.kt → feature/history/src/main/java/com/yapp/feature/history/attend/components/AttendanceStatusSession.kt

@@ -1,7 +1,10 @@
-package com.yapp.feature.history.components
+package com.yapp.feature.history.attend.components
 
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.Canvas
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.RowScope
@@ -17,6 +20,9 @@ import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.geometry.Size
+import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.yapp.core.designsystem.theme.YappTheme
@@ -32,13 +38,14 @@ internal fun AttendanceStatusSection(
     Card(
         modifier = modifier.fillMaxWidth(),
         shape = RoundedCornerShape(8.dp),
-        colors = CardDefaults.cardColors(containerColor = YappTheme.colorScheme.backgroundNormalAlternative)
+        colors = CardDefaults.cardColors(containerColor = YappTheme.colorScheme.staticWhite),
+        border = BorderStroke(width = 1.dp, color = YappTheme.colorScheme.lineSolidAlternative)
     ) {
         Column {
             Row(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .background(YappTheme.colorScheme.labelDisable)
+                    .background(YappTheme.colorScheme.backgroundElevatedAlternative)
                     .padding(horizontal = 16.dp, vertical = 10.dp),
                 horizontalArrangement = Arrangement.SpaceEvenly,
                 verticalAlignment = Alignment.CenterVertically
@@ -50,11 +57,28 @@ internal fun AttendanceStatusSection(
                 )
                 Text(style = YappTheme.typography.label2Medium, text = subTitle)
                 Spacer(modifier = Modifier.width(8.dp))
-                Text(
-                    style = YappTheme.typography.body2NormalBold,
-                    text = totalRate,
-                    color = YappTheme.colorScheme.primaryNormal
-                )
+                Box(
+                    contentAlignment = Alignment.Center,
+                ) {
+                    Canvas(modifier = Modifier
+                        .matchParentSize()
+                    ) {
+                        val canvasHeight = size.height
+                        val canvasWidth = size.width
+
+                        drawRect(
+                            color = Color(0xFFFA6027).copy(alpha = 0.1f),
+                            topLeft = Offset(0f, canvasHeight / 2f),
+                            size = Size(canvasWidth, canvasHeight / 2f)
+                        )
+                    }
+
+                    Text(
+                        text = totalRate,
+                        style = YappTheme.typography.body2NormalBold,
+                        color = YappTheme.colorScheme.primaryNormal
+                    )
+                }
             }
             Row(
                 modifier = Modifier

feature/history/src/main/java/com/yapp/feature/history/components/SessionAttendanceItem.kt → feature/history/src/main/java/com/yapp/feature/history/attend/components/SessionAttendanceItem.kt

@@ -1,4 +1,4 @@
-package com.yapp.feature.history.components
+package com.yapp.feature.history.attend.components
 
 import androidx.compose.runtime.Composable
 

feature/history/src/main/java/com/yapp/feature/history/components/StatusItem.kt → feature/history/src/main/java/com/yapp/feature/history/attend/components/StatusItem.kt

@@ -1,4 +1,4 @@
-package com.yapp.feature.history.components
+package com.yapp.feature.history.attend.components
 
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row

feature/history/src/main/java/com/yapp/feature/history/navigation/HistoryNavigatoion.kt → feature/history/src/main/java/com/yapp/feature/history/navigation/HistoryNavigation.kt

@@ -3,20 +3,36 @@ package com.yapp.feature.history.navigation
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.composable
-import com.yapp.feature.history.AttendHistoryRoute
+import com.yapp.feature.history.attend.AttendHistoryRoute
+import com.yapp.feature.history.previous.PreviousHistoryRoute
 import kotlinx.serialization.Serializable
 
 @Serializable
 data object AttendanceHistory
 
+@Serializable
+data object PreviousHistory
+
 fun NavController.navigateToAttendance() {
     navigate(AttendanceHistory)
 }
 
+fun NavController.navigateToPreviousHistory() {
+    navigate(PreviousHistory)
+}
+
 fun NavGraphBuilder.attendanceHistoryNavGraph(
     navigateToBack: () -> Unit
 ) {
     composable<AttendanceHistory> {
         AttendHistoryRoute(navigateToBack = navigateToBack)
     }
 }
+
+fun NavGraphBuilder.previousHistoryNavGraph(
+    navigateToBack: () -> Unit
+) {
+    composable<PreviousHistory> {
+        PreviousHistoryRoute(navigateToBack = navigateToBack)
+    }
+}