From 2a372f6b05fd9d7351fbb4e56f18ee9eeef550dd Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 31 Aug 2024 01:02:04 +0900 Subject: [PATCH 1/7] =?UTF-8?q?[FEATURE]#151=20:=20=ED=91=B8=EC=8B=9C=20?= =?UTF-8?q?=EB=A6=AC=EB=8B=A4=EC=9D=B4=EB=A0=89=EC=85=98=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/kotlin/com/bff/wespot/MainActivity.kt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/kotlin/com/bff/wespot/MainActivity.kt b/app/src/main/kotlin/com/bff/wespot/MainActivity.kt index a667ad8b..25dcaaf6 100644 --- 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)) } From e276676cdbb65f44e63048aab784cdee39f16eb4 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Sat, 31 Aug 2024 01:02:43 +0900 Subject: [PATCH 2/7] =?UTF-8?q?[FEATURE]#151=20:=20Notification=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/com/bff/wespot/model/notification/Notification.kt | 3 ++- .../wespot/data/remote/model/notification/NotificationDto.kt | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 index 18853d7a..a5e0afeb 100644 --- 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 index c77dceac..eca5b902 100644 --- 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, From d1d963256351ea93a24545d64bcdd1a45685de60 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Fri, 6 Sep 2024 20:29:15 +0900 Subject: [PATCH 3/7] =?UTF-8?q?[FIX]#151=20:=20Vote=20Result=20=EC=96=B4?= =?UTF-8?q?=EC=A0=9C=20/=20=EC=98=A4=EB=8A=98=20=ED=88=AC=ED=91=9C=20misMa?= =?UTF-8?q?tch=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bff/wespot/vote/screen/VoteResultScreen.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 index 18b3ff95..4e54ae2b 100644 --- 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 From 7d8fc1f5f9b8c99476394eab7e94761fceccd3be Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Fri, 6 Sep 2024 20:33:47 +0900 Subject: [PATCH 4/7] =?UTF-8?q?[FIX]#151=20:=20=ED=94=84=EB=A1=9C=ED=95=84?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=EC=97=90=EC=84=9C=20=EB=92=A4=EB=A1=9C?= =?UTF-8?q?=EA=B0=80=EA=B8=B0=20=EB=B2=84=ED=8A=BC=20=ED=81=B4=EB=A6=AD?= =?UTF-8?q?=EC=8B=9C=20=EC=A0=84=EC=B2=B4=ED=83=AD=20=ED=99=94=EB=A9=B4?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A0=84=ED=99=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/kotlin/com/bff/wespot/CommonNavGraphNavigator.kt | 5 +++++ .../com/bff/wespot/entire/screen/edit/ProfileEditScreen.kt | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/src/main/kotlin/com/bff/wespot/CommonNavGraphNavigator.kt b/app/src/main/kotlin/com/bff/wespot/CommonNavGraphNavigator.kt index 1b9953dd..e2477ad1 100644 --- 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/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 index c4cedb0a..854fd96a 100644 --- 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() }, ) }, ) { From b78563b738d8ab4a6afc354f856e4f519b638b45 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Fri, 6 Sep 2024 20:36:56 +0900 Subject: [PATCH 5/7] =?UTF-8?q?[FIX]#151=20:=20Version=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index c41d9c9c..22abc1f6 100644 --- 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.0.1" +versionCode = "2" gradle-plugin = "8.5.1" kotlin = "2.0.0" From 0c541ee7a4cac97f276cad430dd74e8d490c23b3 Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Fri, 6 Sep 2024 20:44:23 +0900 Subject: [PATCH 6/7] =?UTF-8?q?[FIX]#151=20:=20Version=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 22abc1f6..8118ce07 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,8 +2,8 @@ compileSdk = "34" minSdk = "26" targetSdk = "34" -versionName = "1.0.1" -versionCode = "2" +versionName = "1.1" +versionCode = "3" gradle-plugin = "8.5.1" kotlin = "2.0.0" From 8463dda1725930d9ad6a447663d0e5ad9f1b2c8e Mon Sep 17 00:00:00 2001 From: jeongjaino Date: Fri, 6 Sep 2024 20:46:01 +0900 Subject: [PATCH 7/7] =?UTF-8?q?[FIX]#151=20:=20Version=20=EC=97=85?= =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- gradle/libs.versions.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 8118ce07..44f88f92 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,7 +2,7 @@ compileSdk = "34" minSdk = "26" targetSdk = "34" -versionName = "1.1" +versionName = "1.1.0" versionCode = "3" gradle-plugin = "8.5.1"