From e01d26b6c0d933940bfc6fbf2f85d7c3f004913c Mon Sep 17 00:00:00 2001 From: ootr47 Date: Tue, 6 Feb 2024 15:57:09 +0900 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20=EC=83=81=ED=92=88=20=EC=B5=9C?= =?UTF-8?q?=EB=8C=80=20=EB=93=B1=EB=A1=9D=20=EA=B0=9C=EC=88=98=20=EC=A0=9C?= =?UTF-8?q?=ED=95=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../data/repository/product/ProductErrorState.kt | 1 + .../data/repository/product/ProductRepositoryImpl.kt | 4 ++++ .../ui/additem/setprice/SetTargetPriceFragment.kt | 8 ++++++++ android/app/src/main/res/values/strings.xml | 1 + 4 files changed, 14 insertions(+) diff --git a/android/app/src/main/java/app/priceguard/data/repository/product/ProductErrorState.kt b/android/app/src/main/java/app/priceguard/data/repository/product/ProductErrorState.kt index 8dd2c74..623172c 100644 --- a/android/app/src/main/java/app/priceguard/data/repository/product/ProductErrorState.kt +++ b/android/app/src/main/java/app/priceguard/data/repository/product/ProductErrorState.kt @@ -5,5 +5,6 @@ enum class ProductErrorState { INVALID_REQUEST, NOT_FOUND, EXIST, + FULL_STORAGE, UNDEFINED_ERROR } diff --git a/android/app/src/main/java/app/priceguard/data/repository/product/ProductRepositoryImpl.kt b/android/app/src/main/java/app/priceguard/data/repository/product/ProductRepositoryImpl.kt index e93a14c..0566ff1 100644 --- a/android/app/src/main/java/app/priceguard/data/repository/product/ProductRepositoryImpl.kt +++ b/android/app/src/main/java/app/priceguard/data/repository/product/ProductRepositoryImpl.kt @@ -50,6 +50,10 @@ class ProductRepositoryImpl @Inject constructor( RepositoryResult.Error(ProductErrorState.PERMISSION_DENIED) } + 403 -> { + RepositoryResult.Error(ProductErrorState.FULL_STORAGE) + } + 404 -> { RepositoryResult.Error(ProductErrorState.NOT_FOUND) } diff --git a/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt b/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt index 509fd64..96af838 100644 --- a/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt +++ b/android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt @@ -178,6 +178,14 @@ class SetTargetPriceFragment : Fragment(), SetTargetPriceDialogFragment.OnDialog showDialogWithLogout() } + ProductErrorState.FULL_STORAGE -> { + showDialogWithAction( + getString(R.string.error_add_product), + getString(R.string.error_maximum_count_exceeded), + DialogConfirmAction.HOME + ) + } + else -> { showDialogWithAction( getString(R.string.error), diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 9dc9ade..39f9865 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -151,4 +151,5 @@ 상품이 없습니다!\n 상품을 추가해주세요. 추천 상품이 준비중입니다. 품절 + 등록 가능한 상품 개수를 초과하였습니다. \ No newline at end of file From 369c42bb24be813c659bea12952a6a68e3afc06d Mon Sep 17 00:00:00 2001 From: ootr47 Date: Tue, 6 Feb 2024 16:21:33 +0900 Subject: [PATCH 2/4] =?UTF-8?q?docs:=20=EB=A6=B4=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84,=20=EB=85=B8=ED=8A=B8=20=EA=B0=B1=EC=8B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/app/build.gradle.kts | 4 ++-- android/release_notes.txt | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index c65ff95..f3374f0 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -19,8 +19,8 @@ android { applicationId = "app.priceguard" minSdk = 29 targetSdk = 34 - versionCode = 8 - versionName = "1.0.1" + versionCode = 9 + versionName = "1.1.0" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" } diff --git a/android/release_notes.txt b/android/release_notes.txt index 3910c5c..fb00f53 100644 --- a/android/release_notes.txt +++ b/android/release_notes.txt @@ -1,12 +1,12 @@ -December 15, 2023 -v1.0.1 +February 6, 2024 +v1.1.0 🚀 Feature Updates -- 차트 라이브러리 버전 업그레이드 - - -🔧 Bug Fixes - -- 회원가입 시 비밀번호에 특수문자가 없어도 회원가입 가능한 오류 수정 -- 링크가 비어있을 시 등록 버튼 비활성화되도록 수정 +- 네이버 스마트 스토어, 브랜드 스토어 상품 등록 가능 +- 회원 탈퇴 기능 추가 +- 상품 개수 제한 기능 추가 +- 품절 여부 확인 ui 추가 +- 빈 상품 목록 ui 추가 +- 가격 설정 슬라이더 변경 +- 로딩 애니메이션 추가 From 8397aed8b0df806f94c778d71808916a39cca34b Mon Sep 17 00:00:00 2001 From: ootr47 Date: Wed, 7 Feb 2024 01:17:35 +0900 Subject: [PATCH 3/4] =?UTF-8?q?docs:=20=EB=A6=B4=EB=A6=AC=EC=A6=88=20?= =?UTF-8?q?=EB=85=B8=ED=8A=B8=20=EB=82=A0=EC=A7=9C=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/release_notes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/android/release_notes.txt b/android/release_notes.txt index fb00f53..7a5f4a6 100644 --- a/android/release_notes.txt +++ b/android/release_notes.txt @@ -1,4 +1,4 @@ -February 6, 2024 +February 7, 2024 v1.1.0 🚀 Feature Updates From 42eadd1673b0fcadc789f603e42f0f85d3a4a70d Mon Sep 17 00:00:00 2001 From: ootr47 Date: Wed, 7 Feb 2024 16:27:26 +0900 Subject: [PATCH 4/4] =?UTF-8?q?docs:=20ui=20=EC=86=8C=EB=AC=B8=EC=9E=90=20?= =?UTF-8?q?=EB=8C=80=EB=AC=B8=EC=9E=90=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- android/release_notes.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/android/release_notes.txt b/android/release_notes.txt index 7a5f4a6..f56e33c 100644 --- a/android/release_notes.txt +++ b/android/release_notes.txt @@ -6,7 +6,7 @@ v1.1.0 - 네이버 스마트 스토어, 브랜드 스토어 상품 등록 가능 - 회원 탈퇴 기능 추가 - 상품 개수 제한 기능 추가 -- 품절 여부 확인 ui 추가 -- 빈 상품 목록 ui 추가 +- 품절 여부 확인 UI 추가 +- 빈 상품 목록 UI 추가 - 가격 설정 슬라이더 변경 - 로딩 애니메이션 추가