[CHORE/#72] solving conflict

app/src/main/java/com/terning/point/di/DataSourceModule.kt

@@ -1,7 +1,9 @@
 package com.terning.point.di
 
 import com.terning.data.datasource.AuthDataSource
+import com.terning.data.datasource.SearchDataSource
 import com.terning.data.datasourceimpl.AuthDataSourceImpl
+import com.terning.data.datasourceimpl.SearchDataSourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -15,4 +17,9 @@ abstract class DataSourceModule {
     @Binds
     @Singleton
     abstract fun bindAuthDataSource(authDataSourceImpl: AuthDataSourceImpl): AuthDataSource
+
+    @Binds
+    @Singleton
+    abstract fun bindSearchViewsDataSource(searchViewsDataSourceImpl: SearchDataSourceImpl):
+            SearchDataSource
 }

app/src/main/java/com/terning/point/di/RepositoryModule.kt

@@ -1,8 +1,10 @@
 package com.terning.point.di
 
 import com.terning.data.repositoryimpl.AuthRepositoryImpl
+import com.terning.data.repositoryimpl.SearchViewsRepositoryImpl
 import com.terning.data.repositoryimpl.TokenRepositoryImpl
 import com.terning.domain.repository.AuthRepository
+import com.terning.domain.repository.SearchRepository
 import com.terning.domain.repository.TokenRepository
 import dagger.Binds
 import dagger.Module
@@ -21,4 +23,8 @@ abstract class RepositoryModule {
     @Binds
     @Singleton
     abstract fun bindTokenRepository(tokenRepositoryImpl: TokenRepositoryImpl): TokenRepository
+
+    @Binds
+    @Singleton
+    abstract fun bindSearchViewsRepository(searchViewsRepositoryImpl: SearchViewsRepositoryImpl): SearchRepository
 }

app/src/main/java/com/terning/point/di/ServiceModule.kt

@@ -1,6 +1,7 @@
 package com.terning.point.di
 
 import com.terning.data.service.AuthService
+import com.terning.data.service.SearchService
 import com.terning.point.di.qualifier.JWT
 import dagger.Module
 import dagger.Provides
@@ -17,4 +18,9 @@ object ServiceModule {
     @Singleton
     fun provideAuthService(@JWT retrofit: Retrofit): AuthService =
         retrofit.create(AuthService::class.java)
+
+    @Provides
+    @Singleton
+    fun provideSearchService(@JWT retrofit: Retrofit): SearchService =
+        retrofit.create(SearchService::class.java)
 }

core/src/main/java/com/terning/core/designsystem/component/button/ChangeFilterButton.kt

@@ -0,0 +1,84 @@
+package com.terning.core.designsystem.component.button
+
+import androidx.annotation.StringRes
+import androidx.compose.foundation.BorderStroke
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.interaction.collectIsPressedAsState
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.ripple.LocalRippleTheme
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.CompositionLocalProvider
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import com.terning.core.designsystem.theme.Grey400
+import com.terning.core.designsystem.theme.TerningMain
+import com.terning.core.designsystem.theme.TerningSub1
+import com.terning.core.designsystem.theme.TerningSub5
+import com.terning.core.designsystem.theme.TerningTheme
+import com.terning.core.designsystem.theme.White
+import com.terning.core.util.NoRippleTheme
+
+@Composable
+fun ChangeFilterButton(
+    isSelected: Boolean,
+    @StringRes text: Int,
+    cornerRadius: Dp,
+    paddingVertical: Dp,
+    onButtonClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val interactionSource = remember { MutableInteractionSource() }
+    val isPressed by interactionSource.collectIsPressedAsState()
+    val backgroundColor = when {
+        !isSelected && !isPressed -> White
+        !isSelected && isPressed -> TerningSub5
+        else -> TerningMain
+    }
+    val textColor = when {
+        !isSelected -> Grey400
+        else -> White
+    }
+    val borderColor = when {
+        !isSelected && !isPressed -> TerningMain
+        !isSelected && isPressed -> TerningSub1
+        else -> TerningMain
+    }
+
+    CompositionLocalProvider(LocalRippleTheme provides NoRippleTheme) {
+        Button(
+            contentPadding = PaddingValues(vertical = paddingVertical),
+            modifier = modifier
+                .fillMaxWidth()
+                .wrapContentHeight(),
+            interactionSource = interactionSource,
+            colors = ButtonDefaults.buttonColors(
+                containerColor = backgroundColor,
+                contentColor = textColor,
+            ),
+            border = BorderStroke(
+                width = 1.dp,
+                color = borderColor
+            ),
+            shape = RoundedCornerShape(cornerRadius),
+            onClick = { onButtonClick() }
+        ) {
+            Text(
+                text = stringResource(id = text),
+                style = TerningTheme.typography.button3,
+                textAlign = TextAlign.Center,
+            )
+        }
+    }
+}

core/src/main/java/com/terning/core/designsystem/component/item/InternItemWithShadow.kt

@@ -0,0 +1,41 @@
+package com.terning.core.designsystem.component.item
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.terning.core.designsystem.theme.Grey200
+import com.terning.core.designsystem.theme.White
+import com.terning.core.extension.customShadow
+
+@Composable
+fun InternItemWithShadow(
+    imageUrl: String,
+    title: String,
+    dateDeadline: String,
+    workingPeriod: String,
+    isScraped: Boolean,
+) {
+    Box(
+        modifier = Modifier
+            .customShadow(
+                color = Grey200,
+                shadowRadius = 10.dp,
+                shadowWidth = 2.dp,
+            )
+            .background(
+                color = White,
+                shape = RoundedCornerShape(10.dp)
+            )
+    ) {
+        InternItem(
+            imageUrl = imageUrl,
+            title = title,
+            dateDeadline = dateDeadline,
+            workingPeriod = workingPeriod,
+            isScraped = isScraped
+        )
+    }
+}

core/src/main/java/com/terning/core/designsystem/component/textfield/TerningBasicTextField.kt

@@ -68,9 +68,13 @@ fun TerningBasicTextField(
         keyboardOptions = KeyboardOptions(imeAction = ImeAction.Done),
         keyboardActions = KeyboardActions(
             onDone = {
-                keyboardController?.hide()
-                focusManager.clearFocus()
-                onDoneAction?.invoke()
+                if (value.isNotBlank()) {
+                    keyboardController?.hide()
+                    focusManager.clearFocus()
+                    if (onDoneAction != null) {
+                        onDoneAction()
+                    }
+                }
             }
         ),
 
@@ -136,7 +140,6 @@ fun TerningBasicTextField(
     Row(
         verticalAlignment = Alignment.CenterVertically,
         horizontalArrangement = Arrangement.spacedBy(4.dp),
-        modifier = Modifier.padding(vertical = 8.dp)
     ) {
         helperIcon?.let {
             Icon(

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

@@ -0,0 +1,8 @@
+package com.terning.data.datasource
+
+import com.terning.data.dto.BaseResponse
+import com.terning.data.dto.response.SearchViewsResponseDto
+
+interface SearchDataSource {
+    suspend fun getSearchViews(): BaseResponse<SearchViewsResponseDto>
+}

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

@@ -0,0 +1,14 @@
+package com.terning.data.datasourceimpl
+
+import com.terning.data.datasource.SearchDataSource
+import com.terning.data.dto.BaseResponse
+import com.terning.data.dto.response.SearchViewsResponseDto
+import com.terning.data.service.SearchService
+import javax.inject.Inject
+
+class SearchDataSourceImpl @Inject constructor(
+    private val searchService: SearchService,
+) : SearchDataSource {
+    override suspend fun getSearchViews(): BaseResponse<SearchViewsResponseDto> =
+        searchService.getSearchViewsList()
+}

data/src/main/java/com/terning/data/dto/response/SearchViewsResponseDto.kt

@@ -0,0 +1,27 @@
+package com.terning.data.dto.response
+
+import com.terning.domain.entity.response.InternshipAnnouncement
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class SearchViewsResponseDto(
+    @SerialName("internshipAnnouncementId")
+    val internshipAnnouncementId: Long,
+    @SerialName("companyImage")
+    val companyImage: String,
+    @SerialName("title")
+    val title: String,
+) {
+
+
+    fun toSearchViewsEntity(): List<InternshipAnnouncement> {
+        return listOf(
+            InternshipAnnouncement(
+                announcementId = internshipAnnouncementId,
+                companyImage = companyImage,
+                title = title,
+            )
+        )
+    }
+}

data/src/main/java/com/terning/data/repositoryimpl/SearchViewsRepositoryImpl.kt

@@ -0,0 +1,15 @@
+package com.terning.data.repositoryimpl
+
+import com.terning.data.datasource.SearchDataSource
+import com.terning.domain.entity.response.InternshipAnnouncement
+import com.terning.domain.repository.SearchRepository
+import javax.inject.Inject
+
+class SearchViewsRepositoryImpl @Inject constructor(
+    private val searchDataSource: SearchDataSource,
+) : SearchRepository {
+    override suspend fun getSearchViewsList(): Result<List<InternshipAnnouncement>> =
+        runCatching {
+            searchDataSource.getSearchViews().result.toSearchViewsEntity()
+        }
+}

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

@@ -0,0 +1,10 @@
+package com.terning.data.service
+
+import com.terning.data.dto.BaseResponse
+import com.terning.data.dto.response.SearchViewsResponseDto
+import retrofit2.http.GET
+
+interface SearchService {
+    @GET("api/v1/search/views")
+    suspend fun getSearchViewsList(): BaseResponse<SearchViewsResponseDto>
+}

domain/src/main/java/com/terning/domain/entity/response/InternshipAnnouncement.kt

@@ -0,0 +1,7 @@
+package com.terning.domain.entity.response
+
+data class InternshipAnnouncement(
+    val title: String,
+    val companyImage: String,
+    val announcementId: Long,
+)

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

@@ -0,0 +1,7 @@
+package com.terning.domain.repository
+
+import com.terning.domain.entity.response.InternshipAnnouncement
+
+interface SearchRepository {
+    suspend fun getSearchViewsList(): Result<List<InternshipAnnouncement>>
+}