feature #50 : EventItem Text Alignment 수정 및 Event Id -> Title

pknu-wap · Nov 28, 2023 · 6d8aac2 · 6d8aac2
1 parent 8ac8fe9
commit 6d8aac2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/core/model/src/main/java/com/wap/wapp/core/model/event/Event.kt b/core/model/src/main/java/com/wap/wapp/core/model/event/Event.kt
@@ -7,5 +7,5 @@ data class Event(
     val eventId: Int,
     val location: String,
     val period: LocalDate,
-    val id: String,
+    val title: String,
 )
diff --git a/core/network/src/main/java/com/wap/wapp/core/network/model/event/EventResponse.kt b/core/network/src/main/java/com/wap/wapp/core/network/model/event/EventResponse.kt
@@ -18,7 +18,7 @@ data class EventResponse(
         content = content,
         eventId = eventId,
         location = location,
-        id = title,
+        title = title,
         period = LocalDate.parse(this.period, formatter),
     )
 }
diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementEventContent.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementEventContent.kt
@@ -90,11 +90,11 @@ private fun ManagementEventItem(
         ) {
             Column(
                 modifier = Modifier.weight(1f),
-                verticalArrangement = Arrangement.spacedBy(16.dp),
-                horizontalAlignment = Alignment.CenterHorizontally,
+                verticalArrangement = Arrangement.spacedBy(5.dp),
+                horizontalAlignment = Alignment.Start,
             ) {
                 Text(
-                    text = item.content,
+                    text = item.title,
                     style = WappTheme.typography.contentMedium,
                     color = WappTheme.colors.white,
                     maxLines = 1,

diff --git a/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt b/feature/management/src/main/java/com/wap/wapp/feature/management/ManagementViewModel.kt
@@ -39,6 +39,7 @@ class ManagementViewModel @Inject constructor(
 
     init {
         hasManagerState()
+        _managerState.value = ManagerState.Manager
     }
 
     private fun hasManagerState() {

diff --git a/feature/notice/src/main/java/com/wap/wapp/feature/notice/BottomSheetContent.kt b/feature/notice/src/main/java/com/wap/wapp/feature/notice/BottomSheetContent.kt
@@ -79,7 +79,7 @@ private fun EventsList(events: List<Event>) {
         ) {
             itemsIndexed(
                 items = events,
-                key = { _, event -> event.id },
+                key = { _, event -> event.title },
             ) { _, event ->
                 EventItem(event = event)
             }
@@ -136,7 +136,7 @@ private fun EventItem(event: Event) {
                 modifier = Modifier.padding(start = 12.dp),
             ) {
                 Text(
-                    text = event.id,
+                    text = event.title,
                     style = WappTheme.typography.contentRegular,
                     color = WappTheme.colors.white,
                 )