Skip to content

Commit

Permalink
[FEAT/#191] 인턴 상세 페이지 소제목 컴포넌트 변경
Browse files Browse the repository at this point in the history
  • Loading branch information
arinming committed Sep 2, 2024
1 parent f8c1be2 commit 266f419
Show file tree
Hide file tree
Showing 3 changed files with 20 additions and 64 deletions.
56 changes: 4 additions & 52 deletions feature/src/main/java/com/terning/feature/intern/InternRoute.kt
Original file line number Diff line number Diff line change
Expand Up @@ -196,64 +196,14 @@ fun InternScreen(
) {
InternPageTitle(
modifier = modifier,
text = stringResource(id = R.string.intern_sub_title_intern_info)
text = stringResource(id = R.string.intern_sub_title_intern_summary)
)

InternPageTitle(
modifier = modifier,
text = stringResource(id = R.string.intern_sub_title_intern_summary)
text = stringResource(id = R.string.intern_info_request)
)
Column(
modifier = modifier
.padding(
start = 24.dp,
bottom = 16.dp,
end = 24.dp
)
.fillMaxWidth(),
verticalArrangement = Arrangement.Top,
horizontalAlignment = Alignment.Start,
) {
Row(
modifier = modifier.fillMaxWidth(),
horizontalArrangement = Arrangement.spacedBy(
3.dp,
Alignment.Start
),
verticalAlignment = Alignment.Top
) {
Row(
modifier = modifier
.weight(2f),
verticalAlignment = Alignment.Top,
) {
Icon(
painter = painterResource(id = R.drawable.ic_first_info_20),
contentDescription = null
)
Text(
text = stringResource(id = R.string.intern_info_request),
style = TerningTheme.typography.button2,
color = Black
)
}

Column(
modifier = modifier
.weight(5f)
.padding(start = 8.dp),
verticalArrangement = Arrangement.spacedBy(4.dp, Alignment.Top),
) {
qualificationList.forEach { qualification ->
Text(
text = qualification,
style = TerningTheme.typography.body4,
color = Grey400,
)
}
}
}
}
Column(
modifier = modifier
.padding(horizontal = 24.dp)
Expand Down Expand Up @@ -302,10 +252,12 @@ fun InternScreen(
}
}
}

InternPageTitle(
modifier = modifier,
text = stringResource(id = R.string.intern_sub_title_intern_detail)
)

Column(
modifier = modifier.padding(
start = 24.dp,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,39 +1,44 @@
package com.terning.feature.intern.component

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.IntrinsicSize
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Text
import androidx.compose.material3.VerticalDivider
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import com.terning.core.designsystem.theme.Black
import com.terning.core.designsystem.theme.TerningMain
import com.terning.core.designsystem.theme.TerningSub4
import com.terning.core.designsystem.theme.TerningTheme

@Composable
fun InternPageTitle(
modifier: Modifier,
text: String
text: String,
) {
Row(
modifier = modifier
.height(IntrinsicSize.Min)
.fillMaxWidth()
.padding(
top = 16.dp,
bottom = 16.dp
top = 7.dp,
bottom = 6.dp,
start = 24.dp
)
.background(TerningSub4)
) {
VerticalDivider(
color = TerningMain,
thickness = 2.dp,
)
Text(
text = text,
style = TerningTheme.typography.title4,
color = TerningMain,
color = Black,
modifier = modifier.padding(
top = 7.dp,
bottom = 6.dp,
start = 20.dp
start = 8.dp
)
)
}
Expand Down
3 changes: 1 addition & 2 deletions feature/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,10 +126,9 @@
<string name="intern_info_d_day">서류 마감</string>
<string name="intern_info_working">근무 기간</string>
<string name="intern_info_start_date">근무 시작</string>
<string name="intern_sub_title_intern_info">공고 정보</string>
<string name="intern_sub_title_intern_summary">공고 요약</string>
<string name="intern_info_request">자격 요건</string>
<string name="intern_sub_title_intern_detail">상세 정보</string>
<string name="intern_info_request">자격요건</string>
<string name="intern_info_work">직무</string>
<string name="intern_scrap_add_toast_message">관심 공고가 캘린더에 스크랩되었어요!</string>
<string name="intern_scrap_delete_toast_message">관심 공고가 캘린더에서 사라졌어요!</string>
Expand Down

0 comments on commit 266f419

Please sign in to comment.