From e518f4829fd1f1fc126f9632a179a07afe37a29c Mon Sep 17 00:00:00 2001 From: arinming Date: Mon, 2 Sep 2024 18:44:56 +0900 Subject: [PATCH] =?UTF-8?q?[FEAT/#191]=20=EC=9D=B8=ED=84=B4=20=EA=B3=B5?= =?UTF-8?q?=EA=B3=A0=20=EC=9A=94=EC=95=BD=20=EC=BB=B4=ED=8F=AC=EB=84=8C?= =?UTF-8?q?=ED=8A=B8=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/terning/feature/intern/InternRoute.kt | 45 +++++++------------ .../feature/intern/component/InternInfoRow.kt | 8 ++-- .../intern/component/InternPageTitle.kt | 1 - feature/src/main/res/values/strings.xml | 3 +- 4 files changed, 23 insertions(+), 34 deletions(-) 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 2cc24cc3f..51d627d7c 100644 --- a/feature/src/main/java/com/terning/feature/intern/InternRoute.kt +++ b/feature/src/main/java/com/terning/feature/intern/InternRoute.kt @@ -2,7 +2,6 @@ package com.terning.feature.intern import android.view.ViewGroup import android.webkit.WebView -import androidx.compose.foundation.border import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -10,7 +9,6 @@ import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material3.Icon import androidx.compose.material3.Scaffold import androidx.compose.material3.Text @@ -33,7 +31,6 @@ import com.terning.core.designsystem.component.topappbar.BackButtonTopAppBar import com.terning.core.designsystem.theme.Black import com.terning.core.designsystem.theme.Grey200 import com.terning.core.designsystem.theme.Grey400 -import com.terning.core.designsystem.theme.TerningMain import com.terning.core.designsystem.theme.TerningTheme import com.terning.core.extension.customShadow import com.terning.core.extension.toast @@ -170,40 +167,36 @@ fun InternScreen( viewCount = decimal.format(internInfoModel.viewCount) ) + Spacer(modifier = modifier.padding(top = 16.dp)) + + InternPageTitle( + modifier = modifier, + text = stringResource(id = R.string.intern_sub_title_intern_summary) + ) + Column( - modifier = modifier - .border( - width = 1.dp, - color = TerningMain, - shape = RoundedCornerShape(size = 5.dp) - ) - .fillMaxWidth() - .padding(start = 16.dp, top = 16.dp, bottom = 16.dp), - verticalArrangement = Arrangement.spacedBy( - 6.dp, - Alignment.CenterVertically - ), - horizontalAlignment = Alignment.Start, + modifier = modifier.padding( + top = 4.dp, + bottom = 4.dp, + start = 10.dp + ) ) { internInfoList.forEach { (title, value) -> InternInfoRow(title, value) } } - } - Column( - verticalArrangement = Arrangement.Top, - ) { - InternPageTitle( - modifier = modifier, - text = stringResource(id = R.string.intern_sub_title_intern_summary) - ) + Spacer(modifier = modifier.padding(top = 16.dp)) InternPageTitle( modifier = modifier, text = stringResource(id = R.string.intern_info_request) ) + } + Column( + verticalArrangement = Arrangement.Top, + ) { Column( modifier = modifier .padding(horizontal = 24.dp) @@ -225,10 +218,6 @@ fun InternScreen( verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.Start ) { - Icon( - painter = painterResource(id = R.drawable.ic_second_info_20), - contentDescription = null, - ) Text( text = stringResource(id = R.string.intern_info_work), style = TerningTheme.typography.button2, diff --git a/feature/src/main/java/com/terning/feature/intern/component/InternInfoRow.kt b/feature/src/main/java/com/terning/feature/intern/component/InternInfoRow.kt index b01654710..756b4c097 100644 --- a/feature/src/main/java/com/terning/feature/intern/component/InternInfoRow.kt +++ b/feature/src/main/java/com/terning/feature/intern/component/InternInfoRow.kt @@ -6,25 +6,25 @@ import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Alignment import androidx.compose.ui.unit.dp -import com.terning.core.designsystem.theme.Black +import com.terning.core.designsystem.theme.Grey400 import com.terning.core.designsystem.theme.Grey500 import com.terning.core.designsystem.theme.TerningTheme @Composable fun InternInfoRow(title: String, value: String) { Row( - horizontalArrangement = Arrangement.spacedBy(12.dp, Alignment.Start), + horizontalArrangement = Arrangement.spacedBy(23.dp, Alignment.Start), verticalAlignment = Alignment.Top, ) { Text( text = title, style = TerningTheme.typography.body2, - color = Black, + color = Grey500, ) Text( text = value, style = TerningTheme.typography.body3, - color = Grey500, + color = Grey400, ) } } \ No newline at end of file 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 8899a50be..79aa47b82 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 @@ -26,7 +26,6 @@ fun InternPageTitle( .padding( top = 7.dp, bottom = 6.dp, - start = 24.dp ) ) { VerticalDivider( diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml index 67de7f5e3..175133972 100644 --- a/feature/src/main/res/values/strings.xml +++ b/feature/src/main/res/values/strings.xml @@ -129,7 +129,8 @@ 공고 요약 자격 요건 상세 정보 - 직무 + 모집대상 + 모집직무 관심 공고가 캘린더에 스크랩되었어요! 관심 공고가 캘린더에서 사라졌어요!