[FEAT/#191] D-Day 컴포넌트 생성

teamterning · Aug 30, 2024 · 8913d5e · 8913d5e
1 parent 8e04191
commit 8913d5e
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 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
@@ -2,10 +2,12 @@ package com.terning.feature.intern
 
 import android.view.ViewGroup
 import android.webkit.WebView
+import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
@@ -33,6 +35,7 @@ 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.TerningSub3
 import com.terning.core.designsystem.theme.TerningTheme
 import com.terning.core.extension.customShadow
 import com.terning.core.extension.toast
@@ -150,12 +153,40 @@ fun InternScreen(
                         end = 24.dp
                     )
                 ) {
+                    Spacer(modifier = modifier.padding(top = 16.dp))
+
                     InternCompanyInfo(
                         modifier = modifier,
                         companyImage = internInfoModel.companyImage,
                         company = internInfoModel.company,
                         companyCategory = internInfoModel.companyCategory
                     )
+
+                    Spacer(modifier = modifier.padding(top = 20.dp))
+
+                    Row(
+                        modifier = modifier
+                            .background(
+                                color = TerningSub3,
+                                shape = RoundedCornerShape(size = 5.dp)
+                            ),
+                        horizontalArrangement = Arrangement.spacedBy(
+                            0.dp,
+                            Alignment.CenterHorizontally
+                        ),
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Text(
+                            text = internInfoModel.dDay,
+                            style = TerningTheme.typography.title3,
+                            color = TerningMain,
+                            modifier = Modifier.padding(
+                                horizontal = 19.5.dp,
+                                vertical = 1.5.dp
+                            )
+                        )
+                    }
+
                     Text(
                         text = internInfoModel.title,
                         style = TerningTheme.typography.heading2,
@@ -194,11 +225,6 @@ fun InternScreen(
                                 top = 9.dp,
                             )
                     ) {
-                        Text(
-                            text = stringResource(id = R.string.intern_view_count),
-                            style = TerningTheme.typography.detail3,
-                            color = Grey400
-                        )
                         Text(
                             text = "${decimal.format(internInfoModel.viewCount)}회",
                             style = TerningTheme.typography.button4,

diff --git a/feature/src/main/java/com/terning/feature/intern/component/InternCompanyInfo.kt b/feature/src/main/java/com/terning/feature/intern/component/InternCompanyInfo.kt
@@ -51,15 +51,14 @@ fun InternCompanyInfo(
                     color = Grey150,
                     shape = RoundedCornerShape(size = 20.dp)
                 )
-                .padding(top = 12.dp)
         ) {
             AsyncImage(
                 model = ImageRequest.Builder(LocalContext.current)
                     .crossfade(true)
                     .data(companyImage)
                     .build(),
                 contentDescription = stringResource(id = R.string.search_image),
-                contentScale = ContentScale.Fit,
+                contentScale = ContentScale.Crop,
                 modifier = Modifier
                     .fillMaxWidth()
                     .clip(CircleShape),

diff --git a/feature/src/main/res/values/strings.xml b/feature/src/main/res/values/strings.xml
@@ -122,7 +122,6 @@
     <string name="intern_share_icon">공유 아이콘</string>
     <string name="intern_move_to_site">지원 사이트로 이동하기</string>
     <string name="intern_top_app_bar_title">공고 정보</string>
-    <string name="intern_view_count">조회수</string>
     <string name="intern_view_count_detail">%s회</string>
     <string name="intern_info_d_day">서류 마감</string>
     <string name="intern_info_working">근무 기간</string>