Release/1.2.3 to develop (Wrong Version Number)

app/build.gradle.kts

@@ -23,8 +23,8 @@ android {
 
     defaultConfig {
         applicationId = "com.yapp.app.official"
-        versionCode = 8
-        versionName = "1.1.3"
+        versionCode = 9
+        versionName = "1.2.3"
 
         targetSdk = 35
 

build-logic/src/main/java/com/yapp/KotlinAndroid.kt

@@ -46,6 +46,7 @@ internal fun Project.configureKotlinAndroid() {
             }
         }
 
+        defaultConfig.testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     configureKotlinCommon(jvmTarget = JvmTarget.JVM_17)
     val libs = extensions.libs

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

@@ -81,4 +81,5 @@ fun SessionResponse.Session.toHomeSessionModel(): HomeSession {
 
 fun String.toSessionProgressPhase() =
     SessionProgressPhase.entries.firstOrNull { it.title == this }
-        ?: SessionProgressPhase.PENDING
+        ?: SessionProgressPhase.entries.firstOrNull { it.name == this }
+            ?: SessionProgressPhase.NONE

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

@@ -17,7 +17,9 @@ data class UpcomingSessionAttendanceResponse(
     val place: String?,
     val relativeDays: Int,
     val canCheckIn: Boolean,
-    val status: String?
+    val status: String?,
+    val progressPhase: String,
+    val notices: List<UpcomingSessionNoticeResponse>
 ) {
     fun toUpcomingSessionInfoModel() = UpcomingSessionInfo(
         sessionId = sessionId,
@@ -31,6 +33,8 @@ data class UpcomingSessionAttendanceResponse(
         location = place,
         remainingDays = max(0, -relativeDays),
         canCheckIn = canCheckIn,
-        status = status.toAttendanceStatus()
+        status = status.toAttendanceStatus(),
+        progressPhase = progressPhase.toSessionProgressPhase(),
+        notices = notices.map { it.toModel() }
     )
 }

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

@@ -0,0 +1,15 @@
+package com.yapp.core.data.remote.model.response
+
+import com.yapp.model.UpcomingSessionNotice
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpcomingSessionNoticeResponse(
+    val id: String,
+    val title: String
+)
+
+fun UpcomingSessionNoticeResponse.toModel() = UpcomingSessionNotice(
+    id = id,
+    title = title,
+)

core/designsystem/src/main/java/com/yapp/core/designsystem/component/button/solid/SolidButton.kt

@@ -19,6 +19,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Shape
+import androidx.compose.ui.semantics.semantics
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Dp
@@ -46,6 +47,7 @@ fun YappSolidButtonBasic(
     CompositionLocalProvider(value = LocalRippleConfiguration provides colors.ripple) {
         Box(
             modifier = modifier
+                .semantics(mergeDescendants = true) {}
                 .clip(shape = shape)
                 .background(colors.backgroundColor(enable = enable))
                 .yappClickable(

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

@@ -1,18 +1,10 @@
 package com.yapp.model
 
-import java.time.LocalDate
-
-data class HomeSessionDetail(
-    val notices: List<NoticeInfo>
-)
 data class HomeSessionList(
     val sessions: List<HomeSession>,
     val upcomingSessionId: String?,
     val upcomingNotice: List<NoticeInfo> = emptyList()
-) {
-    val lastSessions: HomeSession?
-        get() = sessions.find { session -> LocalDate.parse(session.date) == LocalDate.now() }
-}
+)
 
 data class HomeSession(
     val id: String,
@@ -37,9 +29,9 @@ data class HomeSession(
 }
 
 enum class SessionProgressPhase(val title: String) {
-    DONE("완료"),
+    DONE("종료"),
+    ONGOING("진행 중"),
     TODAY("당일"),
-    UPCOMING("임박"),
-    NONE("없음"),
-    PENDING("예정");
+    PENDING("예정"),
+    NONE("없음");
 }

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

@@ -12,5 +12,7 @@ data class UpcomingSessionInfo(
     val location: String?,
     val remainingDays: Int,
     val canCheckIn: Boolean,
-    val status: AttendanceStatus?
+    val status: AttendanceStatus?,
+    val progressPhase: SessionProgressPhase,
+    val notices: List<UpcomingSessionNotice>
 )

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

@@ -0,0 +1,6 @@
+package com.yapp.model
+
+data class UpcomingSessionNotice(
+    val id: String,
+    val title: String,
+)

core/ui/src/main/java/com/yapp/core/ui/component/SessionChip.kt

@@ -1,50 +1,56 @@
 package com.yapp.core.ui.component
 
-import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
 import com.yapp.core.designsystem.component.chip.ChipColorType
 import com.yapp.core.designsystem.component.chip.YappChipSmall
+import com.yapp.core.designsystem.theme.YappTheme
 import com.yapp.model.SessionProgressPhase
 
 @Composable
 fun SessionChip(
     modifier: Modifier = Modifier,
     progressPhase: SessionProgressPhase,
 ) {
-    val colorType = when (progressPhase) {
-        SessionProgressPhase.TODAY -> {
-            ChipColorType.Main
+    val (colorType, isFill) = when (progressPhase) {
+        SessionProgressPhase.TODAY, SessionProgressPhase.ONGOING -> {
+            ChipColorType.Main to true
         }
-        SessionProgressPhase.DONE, SessionProgressPhase.PENDING -> {
-            ChipColorType.Gray
+        SessionProgressPhase.DONE -> {
+            ChipColorType.Gray to true
         }
-        SessionProgressPhase.UPCOMING -> {
-            ChipColorType.Sub
+        SessionProgressPhase.PENDING -> {
+            ChipColorType.Sub to false
         }
         SessionProgressPhase.NONE -> {
-            ChipColorType.Yellow
+            ChipColorType.Yellow to true
         }
     }
 
     YappChipSmall(
         modifier = modifier,
         text = progressPhase.title,
         colorType = colorType,
-        isFill = true
+        isFill = isFill
     )
 }
 
 @Preview(showBackground = true)
 @Composable
 private fun SessionChipPreview() {
-    YappBackground {
-        Row {
+    YappTheme {
+        Column(
+            verticalArrangement = Arrangement.spacedBy(4.dp),
+        ) {
             SessionChip(progressPhase = SessionProgressPhase.TODAY)
             SessionChip(progressPhase = SessionProgressPhase.DONE)
             SessionChip(progressPhase = SessionProgressPhase.PENDING)
-            SessionChip(progressPhase = SessionProgressPhase.UPCOMING)
+            SessionChip(progressPhase = SessionProgressPhase.ONGOING)
+            SessionChip(progressPhase = SessionProgressPhase.NONE)
         }
     }
 }