Skip to content

Commit

Permalink
[FEAT/#229] 검색 기본 화면 UI 수정
Browse files Browse the repository at this point in the history
  • Loading branch information
arinming committed Sep 9, 2024
1 parent 31436ea commit 8ed2b95
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
Expand All @@ -22,7 +21,6 @@ import androidx.lifecycle.flowWithLifecycle
import com.terning.core.designsystem.component.image.TerningImage
import com.terning.core.designsystem.component.textfield.SearchTextField
import com.terning.core.designsystem.theme.Black
import com.terning.core.designsystem.theme.Grey100
import com.terning.core.designsystem.theme.TerningTheme
import com.terning.core.extension.noRippleClickable
import com.terning.core.state.UiState
Expand Down Expand Up @@ -128,7 +126,7 @@ fun SearchScreen(
item {
ImageSlider(images = images)

Spacer(modifier = Modifier.padding(8.dp))
Spacer(modifier = Modifier.padding(top = 20.dp))

Text(
text = stringResource(id = R.string.search_today_popular),
Expand All @@ -142,11 +140,6 @@ fun SearchScreen(
searchScrapsList = searchScrapsList,
navigateToIntern = navigateToIntern,
)
HorizontalDivider(
thickness = 4.dp,
modifier = Modifier.padding(vertical = 8.dp),
color = Grey100,
)
SearchInternList(
type = InternListType.SCRAP,
searchViewsList = searchViewsList,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ package com.terning.feature.search.search.component

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.material3.Text
Expand All @@ -21,20 +22,22 @@ fun SearchInternList(
searchViewsList: List<SearchPopularAnnouncement>?,
navigateToIntern: (Long) -> Unit,
) {
Column(modifier = Modifier.padding(horizontal = 24.dp)) {
Column(
modifier = Modifier.padding(horizontal = 24.dp)
) {
Text(
text = stringResource(
id = when (type) {
InternListType.VIEW -> R.string.search_most_view_intern
InternListType.SCRAP -> R.string.search_most_scrap_intern
}
),
style = TerningTheme.typography.title5,
style = TerningTheme.typography.body3,
color = Grey400
)

LazyRow(
modifier = Modifier.padding(vertical = 8.dp),
modifier = Modifier.padding(vertical = 12.dp),
horizontalArrangement = Arrangement.spacedBy(12.dp),
) {
when (type) {
Expand All @@ -61,5 +64,6 @@ fun SearchInternList(
}
}
}
Spacer(modifier = Modifier.padding(top = 20.dp))
}
}
4 changes: 2 additions & 2 deletions feature/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
<!--Search-->
<string name="search_text_field_hint">관심있는 인턴 공고 키워드를 검색해 보세요</string>
<string name="search_today_popular">요즘 대학생들에게 인기 있는 공고</string>
<string name="search_most_view_intern">지금 조회수가 많은 공고들이에요</string>
<string name="search_most_view_intern">이번 주 가장 많이 조회한 공고예요</string>
<string name="search_image">공고 이미지</string>
<string name="search_most_scrap_intern">지금 스크랩수가 많은 공고들이에요</string>
<string name="search_most_scrap_intern">이번 주 가장 많이 스크랩 한 공고예요</string>

<!--SearchProcess-->
<string name="search_process_top_bar_title">검색</string>
Expand Down

0 comments on commit 8ed2b95

Please sign in to comment.