[MERGE] #298 -> develop

[MOD/#298] 배너 이미지 변경

domain/src/main/java/com/terning/domain/entity/search/SearchBanner.kt

@@ -0,0 +1,6 @@
+package com.terning.domain.entity.search
+
+data class SearchBanner(
+    val imageRes: Int,
+    val url: String
+)

feature/src/main/java/com/terning/feature/search/search/SearchRoute.kt

@@ -31,16 +31,14 @@ import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.designsystem.theme.White
 import com.terning.core.extension.noRippleClickable
 import com.terning.core.state.UiState
+import com.terning.domain.entity.search.SearchBanner
 import com.terning.domain.entity.search.SearchPopularAnnouncement
 import com.terning.feature.R
 import com.terning.feature.search.search.component.ImageSlider
 import com.terning.feature.search.search.component.InternListType
 import com.terning.feature.search.search.component.SearchInternList
 import okhttp3.internal.toImmutableList
 
-const val ADVERTISEMENT_URL =
-    "https://www.instagram.com/terning_official?igsh=NnNma245bnUzbWNm&utm_source=qr"
-
 @Composable
 fun SearchRoute(
     modifier: Modifier,
@@ -84,6 +82,7 @@ fun SearchRoute(
 
     SearchScreen(
         modifier = modifier,
+        bannerList = SearchViewModel.bannerList,
         searchViewsList = searchViewsList,
         searchScrapsList = searchScrapsList,
         navigateToSearchProcess = {
@@ -94,28 +93,22 @@ fun SearchRoute(
             navigateToSearchProcess()
         },
         navigateToIntern = navigateToIntern,
-        onAdvertisementClick = {
-            CustomTabsIntent.Builder().build().launchUrl(context, ADVERTISEMENT_URL.toUri())
+        onAdvertisementClick = { pageIndex ->
+            CustomTabsIntent.Builder().build().launchUrl(context, SearchViewModel.bannerList[pageIndex].url.toUri())
         }
     )
 }
 
 @Composable
 fun SearchScreen(
     modifier: Modifier = Modifier,
+    bannerList: List<SearchBanner>,
     searchViewsList: List<SearchPopularAnnouncement>,
     searchScrapsList: List<SearchPopularAnnouncement>,
     navigateToSearchProcess: () -> Unit,
     navigateToIntern: (Long) -> Unit,
-    onAdvertisementClick: () -> Unit,
+    onAdvertisementClick: (Int) -> Unit,
 ) {
-
-    val images = listOf(
-        R.drawable.img_ad_1,
-        R.drawable.img_ad_2,
-        R.drawable.img_ad_3,
-    )
-
     Column(
         modifier = modifier
             .fillMaxSize()
@@ -150,7 +143,7 @@ fun SearchScreen(
         LazyColumn {
             item {
                 ImageSlider(
-                    images = images,
+                    images = bannerList,
                     onAdvertisementClick = onAdvertisementClick,
                 )
 

feature/src/main/java/com/terning/feature/search/search/SearchViewModel.kt

@@ -3,6 +3,7 @@ package com.terning.feature.search.search
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.terning.core.state.UiState
+import com.terning.domain.entity.search.SearchBanner
 import com.terning.domain.repository.SearchRepository
 import com.terning.feature.R
 import com.terning.feature.search.search.model.SearchScrapsListState
@@ -61,4 +62,21 @@ class SearchViewModel @Inject constructor(
                 }
         }
     }
+
+    companion object {
+        val bannerList: List<SearchBanner> = listOf(
+            SearchBanner(
+                imageRes = R.drawable.img_ad_1,
+                url = "https://www.instagram.com/p/DBWCO97TRds/?igsh=bDhjMGxlMGliNDc2"
+            ),
+            SearchBanner(
+                imageRes = R.drawable.img_ad_2,
+                url = "https://www.instagram.com/terning_official/"
+            ),
+            SearchBanner(
+                imageRes = R.drawable.img_ad_3,
+                url = "https://forms.gle/4btEwEbUQ3JSjTKP7"
+            )
+        )
+    }
 }

feature/src/main/java/com/terning/feature/search/search/component/ImageSlider.kt

@@ -19,13 +19,14 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.terning.core.designsystem.theme.Grey200
 import com.terning.core.extension.noRippleClickable
+import com.terning.domain.entity.search.SearchBanner
 import kotlinx.coroutines.delay
 
 @Composable
 fun ImageSlider(
     modifier: Modifier = Modifier,
-    images: List<Int>,
-    onAdvertisementClick: () -> Unit,
+    images: List<SearchBanner>,
+    onAdvertisementClick: (Int) -> Unit,
 ) {
     val pagerState = rememberPagerState(
         initialPage = 0,
@@ -36,7 +37,7 @@ fun ImageSlider(
     LaunchedEffect(autoScroll.value) {
         if (autoScroll.value) {
             while (true) {
-                delay(3000)
+                delay(2500)
                 if (!pagerState.isScrollInProgress) {
                     val nextPage = pagerState.currentPage + 1
                     pagerState.animateScrollToPage(nextPage)
@@ -62,12 +63,12 @@ fun ImageSlider(
             ) { currentPage ->
                 val pageIndex = currentPage % images.size
                 Image(
-                    painter = painterResource(id = images[pageIndex]),
+                    painter = painterResource(id = images[pageIndex].imageRes),
                     contentDescription = null,
                     modifier = modifier
                         .fillMaxWidth()
                         .height(112.dp)
-                        .noRippleClickable(onAdvertisementClick),
+                        .noRippleClickable { onAdvertisementClick(pageIndex) },
                     contentScale = ContentScale.Crop,
                 )
             }

gradle/libs.versions.toml

@@ -2,8 +2,8 @@
 compileSdk = "34"
 minSdk = "28"
 targetSdk = "34"
-versionName = "1.1.6"
-versionCode = "10106"
+versionName = "1.1.7"
+versionCode = "10107"
 kotlinCompilerExtensionVersion = "1.5.0"
 jvmTarget = "1.8"