[MERGE] #275 -> develop

[FIX/#275] 탐색 뷰 최종 QA
teamterning · Oct 6, 2024 · abb9dde · abb9dde
2 parents 088d7ff + 387bfe6
commit abb9dde
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 18 deletions.
diff --git a/feature/src/main/java/com/terning/feature/intern/component/InternTitle.kt b/feature/src/main/java/com/terning/feature/intern/component/InternTitle.kt
@@ -17,6 +17,8 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import com.terning.core.designsystem.component.image.TerningImage
 import com.terning.core.designsystem.theme.Black
+import com.terning.core.designsystem.theme.Grey100
+import com.terning.core.designsystem.theme.Grey300
 import com.terning.core.designsystem.theme.Grey375
 import com.terning.core.designsystem.theme.TerningMain
 import com.terning.core.designsystem.theme.TerningSub3
@@ -38,7 +40,11 @@ fun InternTitle(
         Row(
             modifier = Modifier
                 .background(
-                    color = TerningSub3,
+                    color = if (dDay != "지원마감") {
+                        TerningSub3
+                    } else {
+                        Grey100
+                    },
                     shape = RoundedCornerShape(size = 5.dp)
                 )
                 .width(70.dp)
@@ -49,7 +55,11 @@ fun InternTitle(
             Text(
                 text = dDay,
                 style = TerningTheme.typography.title3,
-                color = TerningMain,
+                color = if (dDay != "지원마감") {
+                    TerningMain
+                } else {
+                    Grey300
+                }
             )
         }
 

diff --git a/feature/src/main/java/com/terning/feature/search/search/component/ImageSlider.kt b/feature/src/main/java/com/terning/feature/search/search/component/ImageSlider.kt
@@ -27,18 +27,16 @@ fun ImageSlider(
     images: List<Int>,
     onAdvertisementClick: () -> Unit,
 ) {
-    val infiniteImages = remember { images + images + images }
     val pagerState = rememberPagerState(
-        initialPage = images.size,
-        initialPageOffsetFraction = 0f,
-        pageCount = { infiniteImages.size }
+        initialPage = 0,
+        pageCount = { Int.MAX_VALUE }
     )
     val autoScroll = remember { mutableStateOf(true) }
 
     LaunchedEffect(autoScroll.value) {
         if (autoScroll.value) {
             while (true) {
-                delay(2000)
+                delay(3000)
                 if (!pagerState.isScrollInProgress) {
                     val nextPage = pagerState.currentPage + 1
                     pagerState.animateScrollToPage(nextPage)
@@ -47,14 +45,6 @@ fun ImageSlider(
         }
     }
 
-    LaunchedEffect(pagerState.currentPage) {
-        if (pagerState.currentPage < images.size) {
-            pagerState.scrollToPage(pagerState.currentPage + images.size)
-        } else if (pagerState.currentPage >= 2 * images.size) {
-            pagerState.scrollToPage(pagerState.currentPage - images.size)
-        }
-    }
-
     Column(
         modifier
             .fillMaxWidth()
@@ -68,10 +58,11 @@ fun ImageSlider(
             HorizontalPager(
                 state = pagerState,
                 modifier = modifier,
-                beyondViewportPageCount = infiniteImages.size
+                beyondViewportPageCount = 1
             ) { currentPage ->
+                val pageIndex = currentPage % images.size
                 Image(
-                    painter = painterResource(id = infiniteImages[currentPage % images.size]),
+                    painter = painterResource(id = images[pageIndex]),
                     contentDescription = null,
                     modifier = modifier
                         .fillMaxWidth()

diff --git a/feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt b/feature/src/main/java/com/terning/feature/search/searchprocess/SearchProcessRoute.kt
@@ -254,7 +254,7 @@ fun SearchProcessScreen(
                         }
                     }
 
-                    if (state.existSearchResults) {
+                    if (internSearchResultData.isNotEmpty()) {
                         LazyColumn(
                             contentPadding = PaddingValues(
                                 top = 12.dp,
@@ -319,6 +319,7 @@ fun SearchProcessScreen(
                             color = Grey400,
                         )
                     }
+
                 }
             }
         }