Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

상품 최대 등록 개수 제한 추가 #250

Merged
merged 5 commits into from
Feb 7, 2024
Merged

상품 최대 등록 개수 제한 추가 #250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e01d26b
feat: 상품 최대 등록 개수 제한 추가
ootr47 Feb 6, 2024
369c42b
docs: 릴리즈 버전, 노트 갱신
ootr47 Feb 6, 2024
8397aed
docs: 릴리즈 노트 날짜 업데이트
ootr47 Feb 6, 2024
90f4b12
Merge branch 'dev/and' into feat/and/add-product-limit
Taewan-P Feb 7, 2024
42eadd1
docs: ui 소문자 대문자로 변경
ootr47 Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions android/app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/java/app/priceguard/data/repository/product/ProductErrorState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ enum class ProductErrorState {
INVALID_REQUEST,
NOT_FOUND,
EXIST,
FULL_STORAGE,
UNDEFINED_ERROR
}
4 changes: 4 additions & 0 deletions android/app/src/main/java/app/priceguard/data/repository/product/ProductRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
8 changes: 8 additions & 0 deletions android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
@Inject
lateinit var tokenRepository: TokenRepository

private var _binding: FragmentSetTargetPriceBinding? = null

Check failure on line 31 in android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt

View workflow job for this annotation

GitHub Actions / Check Kotlin Format 

[ktlint] reported by reviewdog 🐶
Backing property name is only allowed when a matching public property or function exists

Raw Output:
android/app/src/main/java/app/priceguard/ui/additem/setprice/SetTargetPriceFragment.kt:31:17: error: Backing property name is only allowed when a matching public property or function exists (standard:property-naming)
private val binding get() = _binding!!
private val setTargetPriceViewModel: SetTargetPriceViewModel by viewModels()

Expand Down Expand Up @@ -178,6 +178,14 @@
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),
Expand Down
1 change: 1 addition & 0 deletions android/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,5 @@
<string name="product_list_no_product">상품이 없습니다!\n 상품을 추가해주세요.</string>
<string name="recommended_product_no_product">추천 상품이 준비중입니다.</string>
<string name="sold_out">품절</string>
<string name="error_maximum_count_exceeded">등록 가능한 상품 개수를 초과하였습니다.</string>
</resources>
18 changes: 9 additions & 9 deletions android/release_notes.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
December 15, 2023
v1.0.1
February 7, 2024
v1.1.0

🚀 Feature Updates

- 차트 라이브러리 버전 업그레이드


🔧 Bug Fixes

- 회원가입 시 비밀번호에 특수문자가 없어도 회원가입 가능한 오류 수정
- 링크가 비어있을 시 등록 버튼 비활성화되도록 수정
- 네이버 스마트 스토어, 브랜드 스토어 상품 등록 가능
- 회원 탈퇴 기능 추가
- 상품 개수 제한 기능 추가
- 품절 여부 확인 UI 추가
- 빈 상품 목록 UI 추가
- 가격 설정 슬라이더 변경
- 로딩 애니메이션 추가
Loading