[Feat] 일정화면 Compose 마이그레이션

app/build.gradle.kts

@@ -191,4 +191,13 @@ dependencies {
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
     debugImplementation(libs.logging.interceptor)
+    testImplementation(libs.junit.jupiter.api)
+    testRuntimeOnly(libs.junit.jupiter.engine)
+    testImplementation(libs.junit.jupiter.params)
+    testImplementation(libs.junit.platform.launcher)
+    testRuntimeOnly(libs.junit.vintage.engine)
+}
+
+tasks.withType<Test>().configureEach {
+    useJUnitPlatform()
 }

app/src/main/java/com/daedan/festabook/di/FestaBookAppGraph.kt

@@ -8,7 +8,6 @@ import com.daedan.festabook.di.viewmodel.MetroViewModelFactory
 import com.daedan.festabook.logging.DefaultFirebaseLogger
 import com.daedan.festabook.presentation.main.MainActivity
 import com.daedan.festabook.presentation.placeDetail.PlaceDetailActivity
-import com.daedan.festabook.presentation.schedule.ScheduleViewModel
 import com.daedan.festabook.presentation.splash.SplashActivity
 import com.google.android.play.core.appupdate.AppUpdateManager
 import com.google.android.play.core.appupdate.AppUpdateManagerFactory
@@ -41,8 +40,6 @@ interface FestaBookAppGraph {
     val defaultFirebaseLogger: DefaultFirebaseLogger
 
     val metroViewModelFactory: MetroViewModelFactory
-
-    val scheduleViewModelFactory: ScheduleViewModel.Factory
 }
 
 val Context.appGraph get() = (applicationContext as FestaBookApp).festaBookGraph

app/src/main/java/com/daedan/festabook/presentation/common/component/Header.kt → app/src/main/java/com/daedan/festabook/presentation/common/component/FestabookTopAppBar.kt

@@ -11,7 +11,7 @@ import com.daedan.festabook.presentation.theme.FestabookTypography
 import com.daedan.festabook.presentation.theme.festabookSpacing
 
 @Composable
-fun Header(
+fun FestabookTopAppBar(
     title: String,
     modifier: Modifier = Modifier,
     style: TextStyle = FestabookTypography.displayLarge,
@@ -32,6 +32,6 @@ fun Header(
 
 @Composable
 @Preview(showBackground = true)
-private fun HeaderPreview() {
-    Header(title = "FestaBook")
+private fun FestabookTopAppBarPreview() {
+    FestabookTopAppBar(title = "FestaBook")
 }

app/src/main/java/com/daedan/festabook/presentation/common/component/PullToRefreshContainer.kt

@@ -15,14 +15,15 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.scale
+import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import com.daedan.festabook.R
 import com.daedan.festabook.presentation.theme.FestabookColor
 
-const val PULL_OFFSET_LIMIT = 180F
+private const val PULL_OFFSET_LIMIT = 180F
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -31,7 +32,7 @@ fun PullToRefreshContainer(
     onRefresh: () -> Unit,
     modifier: Modifier = Modifier,
     pullOffsetLimit: Float = PULL_OFFSET_LIMIT,
-    content: @Composable (PullToRefreshState) -> Unit,
+    content: @Composable (Modifier) -> Unit,
 ) {
     val pullToRefreshState = rememberPullToRefreshState()
     val threshold = (pullOffsetLimit / 2).dp
@@ -52,7 +53,11 @@ fun PullToRefreshContainer(
         },
         modifier = modifier.fillMaxSize(),
     ) {
-        content(pullToRefreshState)
+        content(
+            Modifier.graphicsLayer {
+                translationY = pullToRefreshState.distanceFraction * pullOffsetLimit
+            },
+        )
     }
 }
 

app/src/main/java/com/daedan/festabook/presentation/news/component/NewsScreen.kt

@@ -1,9 +1,10 @@
 package com.daedan.festabook.presentation.news.component
 
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.pager.rememberPagerState
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
@@ -12,7 +13,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.daedan.festabook.R
-import com.daedan.festabook.presentation.common.component.Header
+import com.daedan.festabook.presentation.common.component.FestabookTopAppBar
 import com.daedan.festabook.presentation.news.NewsTab
 import com.daedan.festabook.presentation.news.NewsViewModel
 import com.daedan.festabook.presentation.news.lost.LostUiState
@@ -38,29 +39,36 @@ fun NewsScreen(
             pageState.animateScrollToPage(NewsTab.NOTICE.ordinal)
         }
     }
-
-    Column(modifier = modifier.background(color = MaterialTheme.colorScheme.background)) {
-        Header(title = stringResource(R.string.news_title))
-        NewsTabRow(pageState, scope)
-        NewsTabPage(
-            pageState = pageState,
-            noticeUiState = noticeUiState,
-            faqUiState = faqUiState,
-            lostUiState = lostUiState,
-            isNoticeRefreshing = isNoticeRefreshing,
-            isLostItemRefreshing = isLostItemRefreshing,
-            onNoticeRefresh = {
-                val oldNotices =
-                    (noticeUiState as? NoticeUiState.Success)?.notices ?: emptyList()
-                newsViewModel.loadAllNotices(NoticeUiState.Refreshing(oldNotices))
-            },
-            onLostItemRefresh = {
-                val oldLostItems = (lostUiState as? LostUiState.Success)?.lostItems ?: emptyList()
-                newsViewModel.loadAllLostItems(LostUiState.Refreshing(oldLostItems))
-            },
-            onNoticeClick = { newsViewModel.toggleNotice(it) },
-            onFaqClick = { newsViewModel.toggleFAQ(it) },
-            onLostGuideClick = { newsViewModel.toggleLostGuide() },
-        )
+    Scaffold(
+        topBar = { FestabookTopAppBar(title = stringResource(R.string.news_title)) },
+        modifier = modifier,
+    ) { innerPadding ->
+        Column(
+            modifier = Modifier.padding(top = innerPadding.calculateTopPadding()),
+        ) {
+            NewsTabRow(pageState, scope)
+            NewsTabPage(
+                pageState = pageState,
+                noticeUiState = noticeUiState,
+                faqUiState = faqUiState,
+                lostUiState = lostUiState,
+                isNoticeRefreshing = isNoticeRefreshing,
+                isLostItemRefreshing = isLostItemRefreshing,
+                onNoticeRefresh = {
+                    val oldNotices =
+                        (noticeUiState as? NoticeUiState.Success)?.notices ?: emptyList()
+                    newsViewModel.loadAllNotices(NoticeUiState.Refreshing(oldNotices))
+                },
+                onLostItemRefresh = {
+                    val oldLostItems =
+                        (lostUiState as? LostUiState.Success)?.lostItems ?: emptyList()
+                    newsViewModel.loadAllLostItems(LostUiState.Refreshing(oldLostItems))
+                },
+                onNoticeClick = { newsViewModel.toggleNotice(it) },
+                onFaqClick = { newsViewModel.toggleFAQ(it) },
+                onLostGuideClick = { newsViewModel.toggleLostGuide() },
+                modifier = Modifier.fillMaxSize(),
+            )
+        }
     }
 }

app/src/main/java/com/daedan/festabook/presentation/news/component/NewsTabRow.kt

@@ -15,6 +15,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.daedan.festabook.presentation.news.NewsTab
 import com.daedan.festabook.presentation.theme.FestabookColor
+import com.daedan.festabook.presentation.theme.FestabookTheme
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 
@@ -27,7 +28,6 @@ fun NewsTabRow(
     TabRow(
         selectedTabIndex = pageState.currentPage,
         containerColor = MaterialTheme.colorScheme.background,
-        contentColor = FestabookColor.black,
         indicator = { tabPositions ->
             TabRowDefaults.PrimaryIndicator(
                 color = FestabookColor.black,
@@ -41,6 +41,7 @@ fun NewsTabRow(
             Tab(
                 selected = pageState.currentPage == index,
                 unselectedContentColor = FestabookColor.gray500,
+                selectedContentColor = FestabookColor.black,
                 onClick = { scope.launch { pageState.animateScrollToPage(index) } },
                 text = { Text(text = stringResource(title.tabNameRes)) },
             )
@@ -51,8 +52,10 @@ fun NewsTabRow(
 @Composable
 @Preview
 private fun NewsTabRowPreview() {
-    NewsTabRow(
-        pageState = rememberPagerState { 3 },
-        scope = rememberCoroutineScope(),
-    )
+    FestabookTheme {
+        NewsTabRow(
+            pageState = rememberPagerState { 3 },
+            scope = rememberCoroutineScope(),
+        )
+    }
 }

app/src/main/java/com/daedan/festabook/presentation/news/lost/component/LostItemScreen.kt

@@ -16,14 +16,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.daedan.festabook.R
 import com.daedan.festabook.presentation.common.component.EmptyStateScreen
 import com.daedan.festabook.presentation.common.component.LoadingStateScreen
-import com.daedan.festabook.presentation.common.component.PULL_OFFSET_LIMIT
 import com.daedan.festabook.presentation.common.component.PullToRefreshContainer
 import com.daedan.festabook.presentation.news.component.NewsItem
 import com.daedan.festabook.presentation.news.lost.LostUiState
@@ -55,9 +53,11 @@ fun LostItemScreen(
     PullToRefreshContainer(
         isRefreshing = isRefreshing,
         onRefresh = onRefresh,
-    ) { pullToRefreshState ->
+    ) { graphicsLayer ->
         when (lostUiState) {
-            LostUiState.InitialLoading -> LoadingStateScreen()
+            LostUiState.InitialLoading -> {
+                LoadingStateScreen()
+            }
 
             is LostUiState.Error -> {
                 LaunchedEffect(lostUiState) {
@@ -73,10 +73,7 @@ fun LostItemScreen(
                     modifier =
                         modifier
                             .fillMaxSize()
-                            .graphicsLayer {
-                                translationY =
-                                    pullToRefreshState.distanceFraction * PULL_OFFSET_LIMIT
-                            },
+                            .then(graphicsLayer),
                 )
             }
 
@@ -88,10 +85,7 @@ fun LostItemScreen(
                     modifier =
                         modifier
                             .fillMaxSize()
-                            .graphicsLayer {
-                                translationY =
-                                    pullToRefreshState.distanceFraction * PULL_OFFSET_LIMIT
-                            },
+                            .then(graphicsLayer),
                 )
             }
         }

app/src/main/java/com/daedan/festabook/presentation/news/notice/component/NoticeScreen.kt

@@ -9,16 +9,13 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.graphicsLayer
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.daedan.festabook.R
 import com.daedan.festabook.presentation.common.component.EmptyStateScreen
 import com.daedan.festabook.presentation.common.component.LoadingStateScreen
-import com.daedan.festabook.presentation.common.component.PULL_OFFSET_LIMIT
 import com.daedan.festabook.presentation.common.component.PullToRefreshContainer
 import com.daedan.festabook.presentation.news.component.NewsItem
 import com.daedan.festabook.presentation.news.notice.NoticeUiState
@@ -39,9 +36,11 @@ fun NoticeScreen(
     PullToRefreshContainer(
         isRefreshing = isRefreshing,
         onRefresh = onRefresh,
-    ) { pullToRefreshState ->
+    ) { graphicsLayer ->
         when (uiState) {
-            NoticeUiState.InitialLoading -> LoadingStateScreen()
+            NoticeUiState.InitialLoading -> {
+                LoadingStateScreen()
+            }
 
             is NoticeUiState.Error -> {
                 LaunchedEffect(uiState) {
@@ -53,10 +52,7 @@ fun NoticeScreen(
                 NoticeContent(
                     notices = uiState.oldNotices,
                     onNoticeClick = onNoticeClick,
-                    modifier =
-                        modifier.graphicsLayer {
-                            translationY = pullToRefreshState.distanceFraction * PULL_OFFSET_LIMIT
-                        },
+                    modifier = modifier.then(graphicsLayer),
                 )
             }
 
@@ -65,10 +61,7 @@ fun NoticeScreen(
                     notices = uiState.notices,
                     expandPosition = uiState.expandPosition,
                     onNoticeClick = onNoticeClick,
-                    modifier =
-                        modifier.graphicsLayer {
-                            translationY = pullToRefreshState.distanceFraction * PULL_OFFSET_LIMIT
-                        },
+                    modifier = modifier.then(graphicsLayer),
                 )
             }
         }

app/src/main/java/com/daedan/festabook/presentation/schedule/ScheduleEventsUiState.kt

@@ -3,7 +3,11 @@ package com.daedan.festabook.presentation.schedule
 import com.daedan.festabook.presentation.schedule.model.ScheduleEventUiModel
 
 sealed interface ScheduleEventsUiState {
-    data object Loading : ScheduleEventsUiState
+    data object InitialLoading : ScheduleEventsUiState
+
+    data class Refreshing(
+        val oldEvents: List<ScheduleEventUiModel>,
+    ) : ScheduleEventsUiState
 
     data class Success(
         val events: List<ScheduleEventUiModel>,