From f788d48553e2dc57ae6241d2001ad1a37de35563 Mon Sep 17 00:00:00 2001 From: arinming Date: Sun, 6 Oct 2024 22:53:00 +0900 Subject: [PATCH 1/3] =?UTF-8?q?[FIX/#275]=20=EC=A7=80=EC=9B=90=20=EB=A7=88?= =?UTF-8?q?=EA=B0=90=EC=8B=9C=20=EC=BB=AC=EB=9F=AC=20=ED=9A=8C=EC=83=89?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../feature/intern/component/InternTitle.kt | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 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 index 9fa882d6..0108baf2 100644 --- 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 + } ) } From 116b1c0c0f97b1bf0313248354077895cb31838e Mon Sep 17 00:00:00 2001 From: arinming Date: Sun, 6 Oct 2024 23:14:23 +0900 Subject: [PATCH 2/3] =?UTF-8?q?[FIX/#275]=20=EA=B2=80=EC=83=89=20=EA=B2=B0?= =?UTF-8?q?=EA=B3=BC=20=EC=97=86=EC=9D=84=20=EB=95=8C=20=EA=B7=B8=EB=9E=98?= =?UTF-8?q?=ED=94=BD=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../terning/feature/search/search/component/ImageSlider.kt | 5 +++-- .../feature/search/searchprocess/SearchProcessRoute.kt | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) 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 index dac7391d..15cefabe 100644 --- 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 @@ -38,16 +38,17 @@ fun ImageSlider( LaunchedEffect(autoScroll.value) { if (autoScroll.value) { while (true) { - delay(2000) + delay(3000) if (!pagerState.isScrollInProgress) { val nextPage = pagerState.currentPage + 1 - pagerState.animateScrollToPage(nextPage) + pagerState.animateScrollToPage(nextPage % infiniteImages.size) } } } } LaunchedEffect(pagerState.currentPage) { + val currentPageMod = pagerState.currentPage % images.size if (pagerState.currentPage < images.size) { pagerState.scrollToPage(pagerState.currentPage + images.size) } else if (pagerState.currentPage >= 2 * images.size) { 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 index 8ccadf8d..c78994e3 100644 --- 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, ) } + } } } From 387bfe6b2890fc75bf535656f3e635ed1568309a Mon Sep 17 00:00:00 2001 From: arinming Date: Sun, 6 Oct 2024 23:17:04 +0900 Subject: [PATCH 3/3] =?UTF-8?q?[FIX/#275]=20=EB=B0=B0=EB=84=88=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../search/search/component/ImageSlider.kt | 22 +++++-------------- 1 file changed, 6 insertions(+), 16 deletions(-) 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 index 15cefabe..cd08de88 100644 --- 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,11 +27,9 @@ fun ImageSlider( images: List, 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) } @@ -41,21 +39,12 @@ fun ImageSlider( delay(3000) if (!pagerState.isScrollInProgress) { val nextPage = pagerState.currentPage + 1 - pagerState.animateScrollToPage(nextPage % infiniteImages.size) + pagerState.animateScrollToPage(nextPage) } } } } - LaunchedEffect(pagerState.currentPage) { - val currentPageMod = pagerState.currentPage % images.size - 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() @@ -69,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()