From a13084d8bfa844c5e22e8966a4256dbe3cc4e3af Mon Sep 17 00:00:00 2001 From: hyeseon Date: Tue, 14 May 2024 17:25:28 +0900 Subject: [PATCH 1/4] =?UTF-8?q?[mod]=20#293=20getUser=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EB=90=9C=20=EB=AA=85=EC=84=B8=20DTO=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../winey/data/model/remote/response/ResponseGetUserDto.kt | 6 +++--- app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt index 185e1c3d..3a80f3cf 100644 --- a/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt @@ -15,6 +15,8 @@ data class ResponseGetUserDto( val userId: Int, @SerialName("nickname") val nickname: String, + @SerialName("createdDday") + val createdDday: Int, @SerialName("userLevel") val userLevel: String, @SerialName("fcmIsAllowed") @@ -23,8 +25,6 @@ data class ResponseGetUserDto( val accumulatedAmount: Int, @SerialName("accumulatedCount") val accumulatedCount: Int, - @SerialName("amountSavedHundredDays") - val amountSavedHundredDays: Int, @SerialName("amountSavedTwoWeeks") val amountSavedTwoWeeks: Int, @SerialName("amountSpentTwoWeeks") @@ -42,7 +42,7 @@ data class ResponseGetUserDto( fcmIsAllowed = userData.fcmIsAllowed, accumulatedAmount = userData.accumulatedAmount, accumulatedCount = userData.accumulatedCount, - amountSavedHundredDays = userData.amountSavedHundredDays, + createdDay = userData.createdDday, amountSavedTwoWeeks = userData.amountSavedTwoWeeks, amountSpentTwoWeeks = userData.amountSpentTwoWeeks, remainingAmount = userData.remainingAmount, diff --git a/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt index 25b2e7c1..7a579420 100644 --- a/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt @@ -6,7 +6,7 @@ data class UserV2( val fcmIsAllowed: Boolean, val accumulatedAmount: Int, val accumulatedCount: Int, - val amountSavedHundredDays: Int, + val createdDay: Int, val amountSavedTwoWeeks: Int, val amountSpentTwoWeeks: Int, val remainingAmount: Int, From 57b164f6d72b5acc95c86a32f3b768d9bbfc7208 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Tue, 14 May 2024 17:38:55 +0900 Subject: [PATCH 2/4] =?UTF-8?q?[mod]=20#293=20UserV2=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sopt/winey/data/model/remote/response/ResponseGetUserDto.kt | 2 +- .../go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt | 2 +- app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt index 3a80f3cf..96a370fd 100644 --- a/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt +++ b/app/src/main/java/org/go/sopt/winey/data/model/remote/response/ResponseGetUserDto.kt @@ -42,7 +42,7 @@ data class ResponseGetUserDto( fcmIsAllowed = userData.fcmIsAllowed, accumulatedAmount = userData.accumulatedAmount, accumulatedCount = userData.accumulatedCount, - createdDay = userData.createdDday, + createdDday = userData.createdDday, amountSavedTwoWeeks = userData.amountSavedTwoWeeks, amountSpentTwoWeeks = userData.amountSpentTwoWeeks, remainingAmount = userData.remainingAmount, diff --git a/app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt b/app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt index 7fdc50a6..5f5a8eb4 100644 --- a/app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt +++ b/app/src/main/java/org/go/sopt/winey/data/repository/DataStoreRepositoryImpl.kt @@ -119,7 +119,7 @@ class DataStoreRepositoryImpl @Inject constructor( fcmIsAllowed = true, accumulatedAmount = 0, accumulatedCount = 0, - amountSavedHundredDays = 0, + createdDday = 0, amountSavedTwoWeeks = 0, amountSpentTwoWeeks = 0, remainingCount = 0, diff --git a/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt b/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt index 7a579420..494ea3c0 100644 --- a/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt +++ b/app/src/main/java/org/go/sopt/winey/domain/entity/UserV2.kt @@ -6,7 +6,7 @@ data class UserV2( val fcmIsAllowed: Boolean, val accumulatedAmount: Int, val accumulatedCount: Int, - val createdDay: Int, + val createdDday: Int, val amountSavedTwoWeeks: Int, val amountSpentTwoWeeks: Int, val remainingAmount: Int, From 27f32e348cefcc1162852d44edf32febbc78b3e3 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Tue, 14 May 2024 17:39:29 +0900 Subject: [PATCH 3/4] =?UTF-8?q?[mod]=20#293=20100=EC=9D=BC=EA=B0=84=20?= =?UTF-8?q?=EC=A0=88=EC=95=BD=EC=9D=B4=20=EC=95=84=EB=8B=8C=20=EA=B0=80?= =?UTF-8?q?=EC=9E=85=ED=95=9C=20=EC=9D=B4=ED=9B=84=EB=B6=80=ED=84=B0?= =?UTF-8?q?=EC=9D=98=20=EC=A0=88=EC=95=BD=EC=9C=BC=EB=A1=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/fragment_my_page.xml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/app/src/main/res/layout/fragment_my_page.xml b/app/src/main/res/layout/fragment_my_page.xml index bc81b220..fe31c725 100644 --- a/app/src/main/res/layout/fragment_my_page.xml +++ b/app/src/main/res/layout/fragment_my_page.xml @@ -339,9 +339,9 @@ + app:savedAmount="@{data.accumulatedAmount}" /> + app:savedAmount="@{data.accumulatedAmount}" /> @@ -408,7 +408,7 @@ app:layout_constraintEnd_toStartOf="@+id/l_mypage_item_airpod" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:savedAmount="@{data.amountSavedHundredDays}" /> + app:savedAmount="@{data.accumulatedAmount}" /> + app:savedAmount="@{data.accumulatedAmount}" /> From f366afebb2602fd74410d5c101224da2eec3bae4 Mon Sep 17 00:00:00 2001 From: hyeseon Date: Tue, 14 May 2024 17:39:47 +0900 Subject: [PATCH 4/4] =?UTF-8?q?[mod]=20#293=20=ED=95=B4=EB=8B=B9=20suffix,?= =?UTF-8?q?=20prefix=20=EB=AC=B8=EC=9E=90=EC=97=B4=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/values/strings.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4dc9aa33..d152dce0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -125,8 +125,8 @@ 최근 2주간 %s 이만큼\n먹을 수 있어요 %s 이만큼\n살 수 있어요 - 100일간 총  - 원을 아꼈네요. + 일간 총  + 원을 아꼈네요. %s원만 더! 절약을 통해 황제를 계속 유지해 보세요! %s원 절약중