Merge pull request #151 from pknu-wap/refactor/tgyuu/#150

Refactor/tgyuu/#150
pknu-wap · Mar 5, 2024 · 90a052b · 90a052b
2 parents e986390 + ae9a920
commit 90a052b
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/core/model/src/main/java/com/wap/wapp/core/model/survey/Survey.kt b/core/model/src/main/java/com/wap/wapp/core/model/survey/Survey.kt
@@ -27,20 +27,20 @@ data class Survey(
             return "방금"
         } else if (duration.toMinutes() < 60) {
             val leftMinutes = duration.toMinutes().toString()
-            return leftMinutes + "분 전 작성"
+            return leftMinutes + "분 전"
         }
 
         if (duration.toHours() < 24) {
             val leftHours = duration.toHours().toString()
-            return leftHours + "시간 전 작성"
+            return leftHours + "시간 전"
         }
 
         if (duration.toDays() < 31) {
             val leftDays = duration.toDays().toString()
-            return leftDays + "일 전 작성"
+            return leftDays + "일 전"
         }
 
-        return surveyedAt.format(yyyyMMddFormatter) + " 작성"
+        return surveyedAt.format(yyyyMMddFormatter)
     }
 
     companion object {

diff --git a/...agement-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt b/...agement-event/src/main/java/com/wap/wapp/feature/management/event/edit/EventEditScreen.kt
@@ -192,7 +192,7 @@ internal fun EventEditScreen(
                 .verticalScroll(scrollState)
                 .height(IntrinsicSize.Max)
                 .padding(paddingValues)
-                .padding(vertical = 16.dp),
+                .padding(top = 16.dp),
         ) {
             WappSubTopBar(
                 titleRes = R.string.event_edit,

diff --git a/.../main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt b/.../main/java/com/wap/wapp/feature/management/event/registration/EventRegistrationContent.kt
@@ -80,7 +80,7 @@ internal fun EventRegistrationContent(
         modifier = modifier
             .fillMaxSize()
             .addFocusCleaner(focusManager)
-            .padding(top = 40.dp),
+            .padding(top = 40.dp, bottom = 16.dp),
     ) {
         AnimatedContent(
             targetState = eventRegistrationState,

diff --git a/feature/notice/src/main/java/com/wap/wapp/feature/notice/NoticeScreen.kt b/feature/notice/src/main/java/com/wap/wapp/feature/notice/NoticeScreen.kt
@@ -68,7 +68,7 @@ internal fun NoticeScreen(
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(WappTheme.colors.black25),
+            .background(WappTheme.colors.black20),
     ) {
         BottomSheetScaffold(
             scaffoldState = scaffoldState,

diff --git a/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyCheckScreen.kt b/feature/survey-check/src/main/java/com/wap/wapp/feature/survey/check/SurveyCheckScreen.kt
@@ -58,7 +58,7 @@ internal fun SurveyCheckScreen(
 
             is SurveyCheckViewModel.SurveyListUiState.Success -> {
                 LazyColumn(
-                    verticalArrangement = Arrangement.spacedBy(20.dp),
+                    verticalArrangement = Arrangement.spacedBy(16.dp),
                     modifier = Modifier
                         .fillMaxSize()
                         .padding(start = 16.dp, end = 16.dp, bottom = 16.dp, top = 20.dp)