diff --git a/feature/src/main/java/com/terning/feature/intern/InternRoute.kt b/feature/src/main/java/com/terning/feature/intern/InternRoute.kt index 339f658c6..2cc24cc3f 100644 --- a/feature/src/main/java/com/terning/feature/intern/InternRoute.kt +++ b/feature/src/main/java/com/terning/feature/intern/InternRoute.kt @@ -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) @@ -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, diff --git a/feature/src/main/java/com/terning/feature/intern/component/InternPageTitle.kt b/feature/src/main/java/com/terning/feature/intern/component/InternPageTitle.kt index 011191a5a..8899a50be 100644 --- a/feature/src/main/java/com/terning/feature/intern/component/InternPageTitle.kt +++ b/feature/src/main/java/com/terning/feature/intern/component/InternPageTitle.kt @@ -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 ) ) } diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml index 8c649e3cb..67de7f5e3 100644 --- a/feature/src/main/res/values/strings.xml +++ b/feature/src/main/res/values/strings.xml @@ -126,10 +126,9 @@ 서류 마감 근무 기간 근무 시작 - 공고 정보 공고 요약 + 자격 요건 상세 정보 - 자격요건 직무 관심 공고가 캘린더에 스크랩되었어요! 관심 공고가 캘린더에서 사라졌어요!