Feature/#225 : 홈화면 UI 변경건 작업

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

@@ -63,11 +63,14 @@ fun YappNavHost(
                 navigator.navigateToTopLevelDestination(TopLevelDestination.SCHEDULE)
             },
             navigateToNotice = {
-                navigator.navigateToTopLevelDestination(TopLevelDestination.BOARD)
+                navigator.navigateNoticeDetail(it)
             },
             navigateToSessionDetail = { sessionId ->
                 navigator.navigateSessionScreen(sessionId)
             },
+            navigateAttendanceHistory = {
+                navigator.navigateAttendance()
+            },
             handleException = handleException,
         )
         settingNavGraph(

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

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

core/designsystem/src/main/java/com/yapp/core/designsystem/component/chip/ChipDefaults.kt

@@ -25,6 +25,8 @@ object ChipDefaults {
             subFillBackGroundColor = Color(0xFFFFAD31),
             grayFillBackGroundColor = YappTheme.colorScheme.labelNeutral,
             whiteFillBackGroundColor = YappTheme.colorScheme.labelAlternative,
+            yellowFillTextColor = YappTheme.colorScheme.staticWhite,
+            yellowFillBackGroundColor = YappTheme.colorScheme.secondaryNormal
         )
 
     val colorsWeak
@@ -36,7 +38,9 @@ object ChipDefaults {
             mainWeakBackGroundColor = Color(0xFFFFEFE9),
             subWeakBackGroundColor = Color(0xFFFFF7EA),
             grayWeakBackGroundColor = YappTheme.colorScheme.labelDisable,
-            whiteWeakBackGroundColor = YappTheme.colorScheme.backgroundNormalAlternative
+            whiteWeakBackGroundColor = YappTheme.colorScheme.backgroundNormalAlternative,
+            yellowWeakTextColor = YappTheme.colorScheme.staticWhite,
+            yellowWeakBackGroundColor = YappTheme.colorScheme.secondaryNormal
         )
 
     val textStyleLarge
@@ -52,7 +56,7 @@ object ChipDefaults {
 
 
 enum class ChipColorType {
-    Main, Sub, Gray, White
+    Main, Sub, Gray, White, Yellow
 }
 
 
@@ -71,6 +75,8 @@ data class ChipFillColors(
     val subFillBackGroundColor: Color,
     val grayFillBackGroundColor: Color,
     val whiteFillBackGroundColor: Color,
+    val yellowFillBackGroundColor: Color,
+    val yellowFillTextColor: Color,
 ) : ChipStateType() {
     @Stable
     override fun textColor(
@@ -80,6 +86,7 @@ data class ChipFillColors(
         ChipColorType.Sub -> subFillTextColor
         ChipColorType.White -> whiteFillTextColor
         ChipColorType.Gray -> grayFillTextColor
+        ChipColorType.Yellow -> yellowFillTextColor
     }
 
     @Stable
@@ -90,6 +97,7 @@ data class ChipFillColors(
         ChipColorType.Sub -> subFillBackGroundColor
         ChipColorType.White -> whiteFillBackGroundColor
         ChipColorType.Gray -> grayFillBackGroundColor
+        ChipColorType.Yellow -> yellowFillBackGroundColor
     }
 }
 
@@ -104,6 +112,8 @@ data class ChipWeakColors(
     val subWeakBackGroundColor: Color,
     val grayWeakBackGroundColor: Color,
     val whiteWeakBackGroundColor: Color,
+    val yellowWeakBackGroundColor: Color,
+    val yellowWeakTextColor: Color,
 ) : ChipStateType() {
     @Stable
     override fun textColor(
@@ -113,6 +123,7 @@ data class ChipWeakColors(
         ChipColorType.Sub -> subWeakTextColor
         ChipColorType.White -> whiteWeakTextColor
         ChipColorType.Gray -> grayWeakTextColor
+        ChipColorType.Yellow -> yellowWeakTextColor
     }
 
     @Stable
@@ -123,5 +134,6 @@ data class ChipWeakColors(
         ChipColorType.Sub -> subWeakBackGroundColor
         ChipColorType.White -> whiteWeakBackGroundColor
         ChipColorType.Gray -> grayWeakBackGroundColor
+        ChipColorType.Yellow -> yellowWeakBackGroundColor
     }
 }

core/designsystem/src/main/java/com/yapp/core/designsystem/component/header/YappDefaultHeader.kt

@@ -22,6 +22,19 @@ import com.yapp.core.designsystem.extension.yappClickable
 fun YappDefaultHeader(
     modifier: Modifier = Modifier,
     onClickRightIcon: (() -> Unit)? = null,
+    rightIcon: @Composable () -> Unit = {
+        Row(
+            modifier = Modifier
+                .fillMaxWidth(),
+            horizontalArrangement = Arrangement.End
+        ) {
+            Icon(
+                modifier = Modifier.yappClickable(onClick = onClickRightIcon),
+                painter = painterResource(R.drawable.icon_setting),
+                contentDescription = "setting",
+            )
+        }
+    }
 ) {
     Row(
         modifier = modifier
@@ -43,18 +56,7 @@ fun YappDefaultHeader(
             painter = painterResource(R.drawable.icon_yapp_text),
             contentDescription = "logo_text",
         )
-        Row(
-            modifier = Modifier
-                .fillMaxWidth(),
-            horizontalArrangement = Arrangement.End
-        ) {
-            Icon(
-                modifier = Modifier.yappClickable(onClick = onClickRightIcon),
-                painter = painterResource(R.drawable.icon_setting),
-                contentDescription = "setting",
-
-            )
-        }
+        rightIcon()
     }
 }
 

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

@@ -1,9 +1,18 @@
 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 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,
@@ -31,5 +40,6 @@ enum class SessionProgressPhase(val title: String) {
     DONE("완료"),
     TODAY("당일"),
     UPCOMING("임박"),
+    NONE("없음"),
     PENDING("예정");
 }

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

@@ -23,6 +23,9 @@ fun SessionChip(
         SessionProgressPhase.UPCOMING -> {
             ChipColorType.Sub
         }
+        SessionProgressPhase.NONE -> {
+            ChipColorType.Yellow
+        }
     }
 
     YappChipSmall(

feature/home/src/main/java/com/yapp/feature/home/HomeContract.kt

@@ -2,6 +2,7 @@ package com.yapp.feature.home
 
 import com.yapp.model.HomeSessionList
 import com.yapp.model.NoticeList
+import com.yapp.model.NoticeInfo
 import com.yapp.model.UpcomingSessionInfo
 
 data class HomeState(
@@ -28,19 +29,20 @@ sealed interface HomeIntent {
     data object EnterHomeScreen : HomeIntent
     data class ClickSessionItem(val sessionId: String) : HomeIntent
     data object ClickShowAllSession : HomeIntent
-    data object ClickShowAllNotice : HomeIntent
-
     data object Refresh : HomeIntent
-
+    data object ClickShowAllAttendanceHistory : HomeIntent
     data class ChangeAttendanceCodeDigits(val code: List<String>) : HomeIntent
     data object ClickRequestAttendance : HomeIntent
+    data class ClickNotice(val id: String) : HomeIntent
+    data class ClickDetail(val id: String) : HomeIntent
 }
 
 sealed interface HomeSideEffect {
     data object NavigateToSchedule : HomeSideEffect
     data object NavigateToLogin : HomeSideEffect
-    data object NavigateToNotice : HomeSideEffect
+    data object NavigateToAttendanceHistory : HomeSideEffect
     data class NavigateToSessionDetail(val sessionId: String) : HomeSideEffect
     data class ShowToast(val message: String) : HomeSideEffect
     data class HandleException(val exception: Throwable) : HomeSideEffect
+    data class NavigateToNotice(val id: String) : HomeSideEffect
 }

feature/home/src/main/java/com/yapp/feature/home/HomeScreen.kt

@@ -1,11 +1,13 @@
 package com.yapp.feature.home
 
 import android.widget.Toast
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.asPaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.navigationBars
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.statusBars
@@ -20,28 +22,30 @@ import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Brush
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.yapp.core.designsystem.component.header.YappDefaultHeader
 import com.yapp.core.designsystem.theme.YappTheme
 import com.yapp.core.ui.component.YappBackground
 import com.yapp.core.ui.extension.collectWithLifecycle
-import com.yapp.feature.home.component.HomeAttendanceContent
-import com.yapp.feature.home.component.HomeAttendanceNotice
+import com.yapp.feature.home.component.CurrentSessionSection
+import com.yapp.feature.home.component.FAQSection
 import com.yapp.feature.home.component.HomeHeader
+import com.yapp.feature.home.component.OtherSection
 import com.yapp.feature.home.component.HomeNotices
 import com.yapp.feature.home.dialog.AttendanceDialog
 
 @Composable
 internal fun HomeRoute(
     navigateToLogin: () -> Unit,
     navigateToSchedule: () -> Unit,
-    navigateToNotice: () -> Unit,
-    navigateToSessionDetail: (String) -> Unit,
+    navigateToAttendanceHistory: () -> Unit,
     handleException: (Throwable) -> Unit,
+    navigateToNotice: (String) -> Unit,
+    navigateToSessionDetail: (String) -> Unit,
     viewModel: HomeViewModel = hiltViewModel(),
 ) {
     LaunchedEffect(Unit) {
@@ -54,11 +58,12 @@ internal fun HomeRoute(
         when (effect) {
             HomeSideEffect.NavigateToLogin -> navigateToLogin()
             HomeSideEffect.NavigateToSchedule -> navigateToSchedule()
-            HomeSideEffect.NavigateToNotice -> navigateToNotice()
+            HomeSideEffect.NavigateToAttendanceHistory -> navigateToAttendanceHistory()
             is HomeSideEffect.NavigateToSessionDetail -> navigateToSessionDetail(effect.sessionId)
 
             is HomeSideEffect.ShowToast -> Toast.makeText(context, effect.message, Toast.LENGTH_SHORT).show()
             is HomeSideEffect.HandleException -> handleException(effect.exception)
+            is HomeSideEffect.NavigateToNotice -> navigateToNotice(effect.id)
         }
     }
 
@@ -74,15 +79,10 @@ fun HomeScreen(
     homeState: HomeState,
     onIntent: (HomeIntent) -> Unit = {},
 ) {
-    val colorSteps = arrayOf(
-        0.2f to YappTheme.colorScheme.primaryNormal,
-        1f to YappTheme.colorScheme.secondaryNormal
-    )
-
     val pullToRefreshState = rememberPullToRefreshState()
 
     YappBackground(
-        color = YappTheme.colorScheme.staticWhite,
+        color = YappTheme.colorScheme.backgroundNormalAlternative,
         contentWindowInsets = WindowInsets.navigationBars,
     ) {
         PullToRefreshBox(
@@ -101,36 +101,40 @@ fun HomeScreen(
             }
         ) {
             Column(
-                modifier = Modifier
-                    .fillMaxSize()
-                    .verticalScroll(rememberScrollState())
+                modifier = Modifier.padding(WindowInsets.statusBars.asPaddingValues())
             ) {
-                HomeHeader(
+                YappDefaultHeader(rightIcon = { /** no-op **/})
+                Column(
                     modifier = Modifier
-                        .background(brush = Brush.horizontalGradient(colorStops = colorSteps))
-                        .padding(WindowInsets.statusBars.asPaddingValues())
-                        .padding(top = 18.dp),
-                    sessions = homeState.sessionList.sessions,
-                    upcomingSessionId = homeState.sessionList.upcomingSessionId,
-                    onClickSessionItem = { sessionId ->
-                        onIntent(HomeIntent.ClickSessionItem(sessionId))
-                    },
-                    onClickShowAll = { onIntent(HomeIntent.ClickShowAllSession) },
-                )
-
-                HomeAttendanceNotice(
-                    upcomingSession = homeState.upcomingSession
-                )
-
-                HomeAttendanceContent(
-                    upcomingSession = homeState.upcomingSession,
-                    onClickAttend = { onIntent(HomeIntent.ClickRequestAttendCode) }
-                )
-
-                HomeNotices(
-                    notices = homeState.notices.notices,
-                    onClickMore = { onIntent(HomeIntent.ClickShowAllNotice) }
-                )
+                        .weight(1f)
+                        .verticalScroll(rememberScrollState())
+                ) {
+                    HomeHeader(
+                        body = {
+                            CurrentSessionSection(
+                                upcomingSession = homeState.upcomingSession,
+                                onClickAttend = { onIntent(HomeIntent.ClickRequestAttendCode) },
+                                onClickDetail = { onIntent(HomeIntent.ClickDetail(it)) },
+                                todaySession = homeState.sessionList.lastSessions,
+                                notices = homeState.sessionList.upcomingNotice,
+                                onClickNotice = { onIntent(HomeIntent.ClickNotice(it)) }
+                            )
+                        },
+                    )
+                    Spacer(Modifier.height(16.dp))
+                    OtherSection(
+                        modifier = Modifier.padding(horizontal = 16.dp),
+                        clickAttendance = { onIntent(HomeIntent.ClickShowAllAttendanceHistory) },
+                        clickTotalSession = { onIntent(HomeIntent.ClickShowAllSession) },
+                    )
+                    Spacer(Modifier.height(16.dp))
+                    FAQSection(
+                        modifier = Modifier.padding(horizontal = 16.dp),
+                        clickCurriculum = {},
+                        clickBasicRule = {}
+                    )
+                    Spacer(Modifier.height(30.dp))
+                }
             }
         }
     }