Merge remote-tracking branch 'origin/develop' into fix/#330-calendar_touch_area

Author: boiledeggg

core/designsystem/src/main/java/com/terning/core/designsystem/util/CalendarDefaults.kt

@@ -1,8 +1,14 @@
 package com.terning.core.designsystem.util
 
+import com.terning.core.designsystem.extension.currentMonth
+import com.terning.core.designsystem.extension.currentYear
+import java.util.Calendar
+
 object CalendarDefaults {
     const val START_YEAR = 2010
-    const val END_YEAR = 2030
+    val END_YEAR =
+        if (Calendar.getInstance().currentMonth >= 10) Calendar.getInstance().currentYear + 1
+        else Calendar.getInstance().currentYear
     const val START_MONTH = 1
     const val END_MONTH = 12
 }

data/search/src/main/java/com/terning/data/search/datasource/SearchDataSource.kt

@@ -3,10 +3,12 @@ package com.terning.data.search.datasource
 import com.terning.core.network.BaseResponse
 import com.terning.data.search.dto.request.SearchRequestDto
 import com.terning.data.search.dto.response.SearchAnnouncementResponseDto
+import com.terning.data.search.dto.response.SearchBannersResponseDto
 import com.terning.data.search.dto.response.SearchResultResponseDto
 
 interface SearchDataSource {
     suspend fun getSearch(request: SearchRequestDto): BaseResponse<SearchResultResponseDto>
     suspend fun getSearchViews(): BaseResponse<SearchAnnouncementResponseDto>
     suspend fun getSearchScraps(): BaseResponse<SearchAnnouncementResponseDto>
+    suspend fun getSearchBanners(): BaseResponse<SearchBannersResponseDto>
 }

data/search/src/main/java/com/terning/data/search/datasourceimpl/SearchDataSourceImpl.kt

@@ -4,6 +4,7 @@ import com.terning.core.network.BaseResponse
 import com.terning.data.search.datasource.SearchDataSource
 import com.terning.data.search.dto.request.SearchRequestDto
 import com.terning.data.search.dto.response.SearchAnnouncementResponseDto
+import com.terning.data.search.dto.response.SearchBannersResponseDto
 import com.terning.data.search.dto.response.SearchResultResponseDto
 import com.terning.data.search.service.SearchService
 import javax.inject.Inject
@@ -26,4 +27,7 @@ class SearchDataSourceImpl @Inject constructor(
 
     override suspend fun getSearchScraps(): BaseResponse<SearchAnnouncementResponseDto> =
         searchService.getSearchScrapsList()
+
+    override suspend fun getSearchBanners(): BaseResponse<SearchBannersResponseDto> =
+        searchService.getSearchBannerList()
 }

data/search/src/main/java/com/terning/data/search/dto/response/SearchBannersResponseDto.kt

@@ -0,0 +1,18 @@
+package com.terning.data.search.dto.response
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SearchBannersResponseDto(
+    @SerialName("banners")
+    val banners: List<BannerDto>,
+) {
+    @Serializable
+    data class BannerDto(
+        @SerialName("imageUrl")
+        val imageUrl: String,
+        @SerialName("link")
+        val link: String,
+    )
+}

data/search/src/main/java/com/terning/data/search/mapper/SearchBannersMapper.kt

@@ -0,0 +1,13 @@
+package com.terning.data.search.mapper
+
+import com.terning.data.search.dto.response.SearchBannersResponseDto
+import com.terning.domain.search.entity.SearchBanner
+
+fun SearchBannersResponseDto.toSearchBannerList(): List<SearchBanner> {
+    return banners.map {
+        SearchBanner(
+            imageUrl = it.imageUrl,
+            url = it.link,
+        )
+    }
+}

data/search/src/main/java/com/terning/data/search/repositoryimpl/SearchRepositoryImpl.kt

@@ -2,8 +2,10 @@ package com.terning.data.search.repositoryimpl
 
 import com.terning.data.search.datasource.SearchDataSource
 import com.terning.data.search.dto.request.SearchRequestDto
+import com.terning.data.search.mapper.toSearchBannerList
 import com.terning.data.search.mapper.toSearchPopularAnnouncementList
 import com.terning.data.search.mapper.toSearchResultList
+import com.terning.domain.search.entity.SearchBanner
 import com.terning.domain.search.entity.SearchPopularAnnouncement
 import com.terning.domain.search.entity.SearchResult
 import com.terning.domain.search.repository.SearchRepository
@@ -39,4 +41,9 @@ class SearchRepositoryImpl @Inject constructor(
         runCatching {
             searchDataSource.getSearchScraps().result.toSearchPopularAnnouncementList()
         }
+
+    override suspend fun getSearchBannersList(): Result<List<SearchBanner>> =
+        kotlin.runCatching {
+            searchDataSource.getSearchBanners().result.toSearchBannerList()
+        }
 }

data/search/src/main/java/com/terning/data/search/service/SearchService.kt

@@ -2,6 +2,7 @@ package com.terning.data.search.service
 
 import com.terning.core.network.BaseResponse
 import com.terning.data.search.dto.response.SearchAnnouncementResponseDto
+import com.terning.data.search.dto.response.SearchBannersResponseDto
 import com.terning.data.search.dto.response.SearchResultResponseDto
 import retrofit2.http.GET
 import retrofit2.http.Query
@@ -20,4 +21,7 @@ interface SearchService {
 
     @GET("api/v1/search/scraps")
     suspend fun getSearchScrapsList(): BaseResponse<SearchAnnouncementResponseDto>
+
+    @GET("api/v1/search/banners")
+    suspend fun getSearchBannerList(): BaseResponse<SearchBannersResponseDto>
 }

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

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

domain/search/src/main/java/com/terning/domain/search/repository/SearchRepository.kt

@@ -1,5 +1,6 @@
 package com.terning.domain.search.repository
 
+import com.terning.domain.search.entity.SearchBanner
 import com.terning.domain.search.entity.SearchPopularAnnouncement
 import com.terning.domain.search.entity.SearchResult
 
@@ -10,6 +11,8 @@ interface SearchRepository {
         page: Int,
         size: Int,
     ): Result<List<SearchResult>>
+
     suspend fun getSearchViewsList(): Result<List<SearchPopularAnnouncement>>
     suspend fun getSearchScrapsList(): Result<List<SearchPopularAnnouncement>>
+    suspend fun getSearchBannersList(): Result<List<SearchBanner>>
 }

feature/filtering/src/main/java/com/terning/feature/filtering/startfiltering/StartFilteringRoute.kt

@@ -106,7 +106,7 @@ fun StartFilteringScreen(
             onStartClick = onStartClick,
             onLaterClick = onLaterClick
         )
-        Spacer(modifier = Modifier.height((24 * screenHeight).dp))
+        Spacer(modifier = Modifier.height((16 * screenHeight).dp))
     }
 }
 
@@ -133,7 +133,7 @@ private fun ButtonAnimation(
                 cornerRadius = 10.dp,
                 modifier = Modifier.padding(horizontal = 24.dp)
             )
-            Spacer(modifier = Modifier.height(12.dp))
+            Spacer(modifier = Modifier.height(20.dp))
             Text(
                 text = stringResource(R.string.start_filtering_later),
                 style = TerningTheme.typography.detail3.copy(