Merge pull request #152 from YAPP-Github/feature/jaino/#151

#151 : 2차 배포 전 버그 수정
wespot-bff · Sep 6, 2024 · 69fa976 · 69fa976
2 parents 0c1f1cf + 8463dda
commit 69fa976
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 16 deletions.
diff --git a/app/src/main/kotlin/com/bff/wespot/CommonNavGraphNavigator.kt b/app/src/main/kotlin/com/bff/wespot/CommonNavGraphNavigator.kt
@@ -5,6 +5,7 @@ import com.bff.wespot.entire.screen.EntireNavigator
 import com.bff.wespot.entire.screen.destinations.AccountSettingScreenDestination
 import com.bff.wespot.entire.screen.destinations.BlockListScreenDestination
 import com.bff.wespot.entire.screen.destinations.CharacterEditScreenDestination
+import com.bff.wespot.entire.screen.destinations.EntireScreenDestination
 import com.bff.wespot.entire.screen.destinations.NotificationSettingScreenDestination
 import com.bff.wespot.entire.screen.destinations.ProfileEditScreenDestination
 import com.bff.wespot.entire.screen.destinations.RevokeConfirmScreenDestination
@@ -162,4 +163,8 @@ class CommonNavGraphNavigator(
     override fun navigateToProfileEditScreen(args: ProfileEditNavArgs) {
         navController.navigate(ProfileEditScreenDestination(args) within navGraph)
     }
+
+    override fun navigateToEntireScreen() {
+        navController.navigate(EntireScreenDestination within navGraph)
+    }
 }
diff --git a/app/src/main/kotlin/com/bff/wespot/MainActivity.kt b/app/src/main/kotlin/com/bff/wespot/MainActivity.kt
@@ -110,13 +110,15 @@ class MainActivity : ComponentActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         requestNotificationPermission()
-        checkEnteredFromPushNotification()
+
+        val navArgs = getMainScreenArgsFromIntent()
+        checkEnteredFromPushNotification(navArgs)
 
         setContent {
             WeSpotTheme {
                 MainScreen(
                     navigator = navigator,
-                    navArgs = getMainScreenArgsFromIntent(),
+                    navArgs = navArgs,
                     analyticsHelper = analyticsHelper,
                     viewModel = viewModel,
                 )
@@ -137,9 +139,7 @@ class MainActivity : ComponentActivity() {
         }
     }
 
-    private fun checkEnteredFromPushNotification() {
-        val data = getMainScreenArgsFromIntent()
-
+    private fun checkEnteredFromPushNotification(data: MainScreenNavArgs) {
         if (data.type != NotificationType.IDLE) {
             viewModel.onAction(MainAction.OnEnteredByPushNotification(data))
         }

diff --git a/core/model/src/main/kotlin/com/bff/wespot/model/notification/Notification.kt b/core/model/src/main/kotlin/com/bff/wespot/model/notification/Notification.kt
@@ -1,11 +1,12 @@
 package com.bff.wespot.model.notification
 
+import java.time.LocalDate
 import java.time.LocalDateTime
 
 data class Notification(
     val id: Int,
     val type: NotificationType,
-    val userId: String,
+    val date: LocalDate,
     val targetId: Int,
     val content: String,
     val isNew: Boolean,

diff --git a/data-remote/src/main/kotlin/com/bff/wespot/data/remote/model/notification/NotificationDto.kt b/data-remote/src/main/kotlin/com/bff/wespot/data/remote/model/notification/NotificationDto.kt
@@ -1,6 +1,7 @@
 package com.bff.wespot.data.remote.model.notification
 
 import com.bff.wespot.data.remote.extensions.toISOLocalDateTime
+import com.bff.wespot.data.remote.extensions.toLocalDateFromDashPattern
 import com.bff.wespot.model.notification.Notification
 import com.bff.wespot.model.notification.NotificationList
 import com.bff.wespot.model.notification.NotificationType
@@ -24,7 +25,7 @@ data class NotificationListDto(
 data class NotificationDto (
     val id: Int,
     val type: String,
-    val userId: String,
+    val date: String,
     val targetId: Int,
     val content: String,
     val isNew: Boolean,
@@ -34,7 +35,7 @@ data class NotificationDto (
     fun toNotification(): Notification = Notification(
         id = id,
         type = type.convertToNotificationType(),
-        userId = userId,
+        date = date.toLocalDateFromDashPattern(),
         targetId = targetId,
         content = content,
         isNew = isNew,

diff --git a/feature/entire/src/main/java/com/bff/wespot/entire/screen/edit/ProfileEditScreen.kt b/feature/entire/src/main/java/com/bff/wespot/entire/screen/edit/ProfileEditScreen.kt
@@ -68,7 +68,7 @@ import org.orbitmvi.orbit.compose.collectAsState
 import org.orbitmvi.orbit.compose.collectSideEffect
 
 interface ProfileEditNavigator {
-    fun navigateUp()
+    fun navigateToEntireScreen()
     fun navigateToCharacterEditScreen()
 }
 
@@ -111,7 +111,7 @@ fun ProfileEditScreen(
             WSTopBar(
                 title = stringResource(id = R.string.profile_edit),
                 canNavigateBack = true,
-                navigateUp = { navigator.navigateUp() },
+                navigateUp = { navigator.navigateToEntireScreen() },
             )
         },
     ) {

diff --git a/feature/vote/src/main/java/com/bff/wespot/vote/screen/VoteResultScreen.kt b/feature/vote/src/main/java/com/bff/wespot/vote/screen/VoteResultScreen.kt
@@ -258,8 +258,8 @@ fun VoteResultScreen(
                                 id = R.string.real_time_vote,
                             ),
                         ),
-                        selectedItemIndex = voteType,
-                        onSelectedChanged = { voteType = it },
+                        selectedItemIndex = voteType xor 1,
+                        onSelectedChanged = { voteType = it xor 1 },
                     )
                 }
 
@@ -665,5 +665,5 @@ private fun EmptyTile(
 }
 
 private const val MIN_REQUIREMENT = 5
-private const val TODAY = 1
-private const val YESTERDAY = 0
+private const val TODAY = 0
+private const val YESTERDAY = 1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -2,8 +2,8 @@
 compileSdk = "34"
 minSdk = "26"
 targetSdk = "34"
-versionName = "1.0.0"
-versionCode = "1"
+versionName = "1.1.0"
+versionCode = "3"
 
 gradle-plugin = "8.5.1"
 kotlin = "2.0.0"