From b32ca716eb9ede1c1d239c784550d9b64b401a1e Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Wed, 11 Sep 2024 17:13:24 +0900 Subject: [PATCH 01/18] =?UTF-8?q?[CHORE/#131]=20version=20code=20v1.1.0=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- buildSrc/src/main/kotlin/Constants.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildSrc/src/main/kotlin/Constants.kt b/buildSrc/src/main/kotlin/Constants.kt index 74826f23..41208082 100644 --- a/buildSrc/src/main/kotlin/Constants.kt +++ b/buildSrc/src/main/kotlin/Constants.kt @@ -3,6 +3,6 @@ object Constants { const val compileSdk = 34 const val minSdk = 28 const val targetSdk = 34 - const val versionCode = 5 - const val versionName = "1.0.2" + const val versionCode = 6 + const val versionName = "1.1.0" } From 0d8ee9a3aa2c800a6fec66bf88df09daa1bf1643 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Wed, 11 Sep 2024 17:22:26 +0900 Subject: [PATCH 02/18] =?UTF-8?q?[CHORE/#131]=20=EC=9A=B4=EC=98=81,=20?= =?UTF-8?q?=EA=B0=9C=EB=B0=9C=EC=84=9C=EB=B2=84=20PG=20ID=20=EB=B6=84?= =?UTF-8?q?=EA=B8=B0=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/auth/build.gradle.kts | 21 ++++++++++++++++----- feature/buy/build.gradle.kts | 22 ++++++++++++++++------ 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/feature/auth/build.gradle.kts b/feature/auth/build.gradle.kts index 1f883a0f..24305cc2 100644 --- a/feature/auth/build.gradle.kts +++ b/feature/auth/build.gradle.kts @@ -22,12 +22,23 @@ android { "IAMPORT_CODE", gradleLocalProperties(rootDir).getProperty("iamport.code"), ) + } - buildConfigField( - "String", - "MERCHANT_UID", - gradleLocalProperties(rootDir).getProperty("merchant.uid"), - ) + buildTypes { + debug { + buildConfigField( + "String", + "MERCHANT_UID", + gradleLocalProperties(rootDir).getProperty("merchant.test.uid"), + ) + } + release { + buildConfigField( + "String", + "MERCHANT_UID", + gradleLocalProperties(rootDir).getProperty("merchant.uid"), + ) + } } compileOptions { diff --git a/feature/buy/build.gradle.kts b/feature/buy/build.gradle.kts index cacafdd5..3f1c88a3 100644 --- a/feature/buy/build.gradle.kts +++ b/feature/buy/build.gradle.kts @@ -22,12 +22,22 @@ android { "IAMPORT_CODE", gradleLocalProperties(rootDir).getProperty("iamport.code"), ) - - buildConfigField( - "String", - "PAYMENT_UID", - gradleLocalProperties(rootDir).getProperty("payment.uid"), - ) + } + buildTypes { + debug { + buildConfigField( + "String", + "PAYMENT_UID", + gradleLocalProperties(rootDir).getProperty("payment.test.uid"), + ) + } + release { + buildConfigField( + "String", + "PAYMENT_UID", + gradleLocalProperties(rootDir).getProperty("payment.uid"), + ) + } } compileOptions { From feb0586f66f719b3c49cd46353ec73a7c8723667 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 00:36:50 +0900 Subject: [PATCH 03/18] =?UTF-8?q?[FIX/#131]=20=EA=B3=84=EC=A2=8C=20?= =?UTF-8?q?=EC=9D=B4=EB=A6=84=20intent=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../co/orange/setting/bank/BankActivity.kt | 2 +- .../co/orange/setting/bank/BankViewModel.kt | 8 +++--- .../setting/bank/add/BankAddActivity.kt | 27 ++++++++++++++----- .../setting/bank/add/BankAddViewModel.kt | 14 ++-------- 4 files changed, 29 insertions(+), 22 deletions(-) diff --git a/feature/setting/src/main/java/co/orange/setting/bank/BankActivity.kt b/feature/setting/src/main/java/co/orange/setting/bank/BankActivity.kt index 4dbdc7b0..8034f2f7 100644 --- a/feature/setting/src/main/java/co/orange/setting/bank/BankActivity.kt +++ b/feature/setting/src/main/java/co/orange/setting/bank/BankActivity.kt @@ -54,7 +54,7 @@ class BankActivity : BaseActivity(featureR.layout.activity_ } private fun navigateToAddBankView(accountId: Long) { - startActivity(BankAddActivity.createIntent(this, accountId)) + startActivity(BankAddActivity.createIntent(this, accountId, viewModel.ownerName)) } private fun observeUserBankState() { diff --git a/feature/setting/src/main/java/co/orange/setting/bank/BankViewModel.kt b/feature/setting/src/main/java/co/orange/setting/bank/BankViewModel.kt index 0419460f..ddd02c2b 100644 --- a/feature/setting/src/main/java/co/orange/setting/bank/BankViewModel.kt +++ b/feature/setting/src/main/java/co/orange/setting/bank/BankViewModel.kt @@ -18,6 +18,7 @@ class BankViewModel private val settingRepository: SettingRepository, ) : ViewModel() { var accountId: Long = -1 + var ownerName: String = "" private val _getUserBankState = MutableStateFlow>(UiState.Empty) val getUserBankState: StateFlow> = _getUserBankState @@ -25,9 +26,10 @@ class BankViewModel fun getUserBankFromServer() { viewModelScope.launch { settingRepository.getUserBank() - .onSuccess { - it.accountId?.let { accountId = it } - _getUserBankState.value = UiState.Success(it) + .onSuccess { response -> + response.accountId?.let { accountId = it } + response.name?.let { ownerName = it } + _getUserBankState.value = UiState.Success(response) } .onFailure { _getUserBankState.value = UiState.Failure(it.message.orEmpty()) diff --git a/feature/setting/src/main/java/co/orange/setting/bank/add/BankAddActivity.kt b/feature/setting/src/main/java/co/orange/setting/bank/add/BankAddActivity.kt index 1144ccb6..8304896a 100644 --- a/feature/setting/src/main/java/co/orange/setting/bank/add/BankAddActivity.kt +++ b/feature/setting/src/main/java/co/orange/setting/bank/add/BankAddActivity.kt @@ -9,6 +9,7 @@ import androidx.lifecycle.lifecycleScope import co.orange.core.R import co.orange.core.amplitude.AmplitudeManager import co.orange.core.base.BaseActivity +import co.orange.core.extension.maskName import co.orange.core.extension.setOnSingleClickListener import co.orange.core.extension.stringOf import co.orange.core.extension.toast @@ -33,6 +34,7 @@ class BankAddActivity : BaseActivity(featureR.layout.act initBackBtnListener() initBankTypeListener() initConfirmBtnListener() + getIntentFromPreviousView() observeAddressResult() } @@ -48,17 +50,26 @@ class BankAddActivity : BaseActivity(featureR.layout.act } private fun initConfirmBtnListener() { - AmplitudeManager.trackEvent("click_account_next") - val accountId = intent.getLongExtra(EXTRA_ACCOUNT_ID, -1) binding.btnConfirm.setOnSingleClickListener { - if (accountId == DEFAULT_ID) { - viewModel.postToAddBankToServer() - } else { - viewModel.putToModBankToServer(accountId) + AmplitudeManager.trackEvent("click_account_next") + with(viewModel) { + if (accountId == DEFAULT_ID) { + postToAddBankToServer() + } else { + putToModBankToServer(accountId) + } } } } + private fun getIntentFromPreviousView() { + with(viewModel) { + accountId = intent.getLongExtra(EXTRA_ACCOUNT_ID, -1) + ownerName = intent.getStringExtra(EXTRA_OWNER_NAME).orEmpty() + maskedName.value = ownerName.takeIf { it.isNotEmpty() }?.maskName() + } + } + private fun observeAddressResult() { viewModel.setBankResult.flowWithLifecycle(lifecycle).distinctUntilChanged() .onEach { isSuccess -> @@ -73,6 +84,7 @@ class BankAddActivity : BaseActivity(featureR.layout.act override fun onDestroy() { super.onDestroy() + bankTypeBottomSheet = null } @@ -81,14 +93,17 @@ class BankAddActivity : BaseActivity(featureR.layout.act private const val BOTTOM_SHEET_BANK_TYPE = "BOTTOM_SHEET_BANK_TYPE" private const val EXTRA_ACCOUNT_ID = "EXTRA_ACCOUNT_ID" + private const val EXTRA_OWNER_NAME = "EXTRA_OWNER_NAME" @JvmStatic fun createIntent( context: Context, accountId: Long, + ownerName: String, ): Intent = Intent(context, BankAddActivity::class.java).apply { putExtra(EXTRA_ACCOUNT_ID, accountId) + putExtra(EXTRA_OWNER_NAME, ownerName) } } } diff --git a/feature/setting/src/main/java/co/orange/setting/bank/add/BankAddViewModel.kt b/feature/setting/src/main/java/co/orange/setting/bank/add/BankAddViewModel.kt index bfee17ac..da7fc08a 100644 --- a/feature/setting/src/main/java/co/orange/setting/bank/add/BankAddViewModel.kt +++ b/feature/setting/src/main/java/co/orange/setting/bank/add/BankAddViewModel.kt @@ -3,10 +3,8 @@ package co.orange.setting.bank.add import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import co.orange.core.extension.maskName import co.orange.domain.entity.request.BankRequestModel import co.orange.domain.repository.SettingRepository -import co.orange.domain.repository.UserRepository import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.SharedFlow @@ -18,8 +16,9 @@ class BankAddViewModel @Inject constructor( private val settingRepository: SettingRepository, - private val userRepository: UserRepository, ) : ViewModel() { + var accountId: Long = -1 + var ownerName = "" var maskedName = MutableLiveData() @@ -33,15 +32,6 @@ class BankAddViewModel private val _setBankResult = MutableSharedFlow() val setBankResult: SharedFlow = _setBankResult - init { - getUserName() - } - - private fun getUserName() { - ownerName = userRepository.getUserName() - maskedName.value = ownerName.takeIf { it.isNotEmpty() }?.maskName() ?: return - } - fun checkIsCompleted() { isCompleted.value = (!maskedName.value.isNullOrEmpty() && bankCode.isNotEmpty() && !accountNumber.value.isNullOrEmpty()) From ddeb42b6381c3479e1a2e8e9737f22b1f920ee26 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 01:06:05 +0900 Subject: [PATCH 04/18] =?UTF-8?q?[FIX/#131]=20=EA=B5=AC=EB=A7=A4=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EA=B5=AC=EB=A7=A4=EB=82=A0=EC=A7=9C=20?= =?UTF-8?q?=ED=91=9C=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sell/src/main/res/layout/dialog_sell_product.xml | 1 + .../setting/history/order/HistoryBuyViewHolder.kt | 11 +++++++++++ 2 files changed, 12 insertions(+) diff --git a/feature/sell/src/main/res/layout/dialog_sell_product.xml b/feature/sell/src/main/res/layout/dialog_sell_product.xml index f777eba5..3ac3b263 100644 --- a/feature/sell/src/main/res/layout/dialog_sell_product.xml +++ b/feature/sell/src/main/res/layout/dialog_sell_product.xml @@ -60,6 +60,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="0dp" android:layout_height="wrap_content" + android:gravity="center" android:layout_marginHorizontal="20dp" android:layout_marginTop="45dp" android:ellipsize="end" diff --git a/feature/setting/src/main/java/co/orange/setting/history/order/HistoryBuyViewHolder.kt b/feature/setting/src/main/java/co/orange/setting/history/order/HistoryBuyViewHolder.kt index 3e766bfc..16919690 100644 --- a/feature/setting/src/main/java/co/orange/setting/history/order/HistoryBuyViewHolder.kt +++ b/feature/setting/src/main/java/co/orange/setting/history/order/HistoryBuyViewHolder.kt @@ -3,6 +3,7 @@ package co.orange.setting.history.order import android.graphics.Paint import androidx.recyclerview.widget.RecyclerView import co.orange.core.extension.breakLines +import co.orange.core.extension.convertDateTime import co.orange.core.extension.setOnSingleClickListener import co.orange.core.extension.setPriceForm import co.orange.domain.entity.response.HistoryBuyModel.OrderProductModel @@ -23,10 +24,20 @@ class HistoryBuyViewHolder( paintFlags = Paint.STRIKE_THRU_TEXT_FLAG } tvBuyItemNowPrice.text = item.salePrice.setPriceForm() + tvBuyItemDate.text = + item.paidAt.convertDateTime( + OLD_DATE_PATTERN, + NEW_DATE_PATTERN, + ) root.setOnSingleClickListener { itemClick(item.orderId) } } } + + companion object { + const val OLD_DATE_PATTERN = "yyyy-MM-dd'T'HH:mm:ss" + const val NEW_DATE_PATTERN = "yyyy년 MM월 dd일 구매" + } } From 5e681aa03ea2c322a7ad01b0f6288f9eb0cfac45 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 01:29:13 +0900 Subject: [PATCH 05/18] =?UTF-8?q?[FIX/#131]=20=EB=94=94=ED=85=8C=EC=9D=BC?= =?UTF-8?q?=EB=B7=B0=20UI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/res/values/appearances.xml | 2 +- core/src/main/res/values/strings.xml | 6 +++--- .../co/orange/main/detail/DetailActivity.kt | 1 + .../src/main/res/layout/activity_detail.xml | 17 +++++++++++++++-- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/core/src/main/res/values/appearances.xml b/core/src/main/res/values/appearances.xml index 0bd5399a..1888d3c0 100644 --- a/core/src/main/res/values/appearances.xml +++ b/core/src/main/res/values/appearances.xml @@ -41,7 +41,7 @@ diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index ca230875..2a71f03a 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -34,8 +34,8 @@ 판매하기 퓨어 오일 퍼퓸 10 ml 긴제목테스트트트트트 - 54,000 - 48,900 + 54,000원 + 48,900원 999+ 알림 @@ -48,7 +48,7 @@ % 남은 재고 개 - 이 상품에 대한 자세한 정보를 보고 싶다면? + 이 상품에 대한 자세한 정보를 보고 싶다면? 구매하기 원하는 옵션을 선택해주세요 diff --git a/feature/main/src/main/java/co/orange/main/detail/DetailActivity.kt b/feature/main/src/main/java/co/orange/main/detail/DetailActivity.kt index ce818687..de288b0d 100644 --- a/feature/main/src/main/java/co/orange/main/detail/DetailActivity.kt +++ b/feature/main/src/main/java/co/orange/main/detail/DetailActivity.kt @@ -122,6 +122,7 @@ class DetailActivity : BaseActivity(featureR.layout.activ private fun setProduct(item: ProductDetailModel) { with(binding) { + layoutDetailBefore.isVisible = false tvDetailTitle.text = item.name.breakLines() chipsDetailCategory.text = item.category chipsDetailOption.isVisible = item.isOptionExist diff --git a/feature/main/src/main/res/layout/activity_detail.xml b/feature/main/src/main/res/layout/activity_detail.xml index 0afe3336..3b311199 100644 --- a/feature/main/src/main/res/layout/activity_detail.xml +++ b/feature/main/src/main/res/layout/activity_detail.xml @@ -105,13 +105,14 @@ + + Date: Thu, 12 Sep 2024 01:36:13 +0900 Subject: [PATCH 06/18] =?UTF-8?q?[ADD/#131]=20=EC=95=8C=EB=A6=BC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=B7=B0=20manifest=20=EB=93=B1=EB=A1=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/AndroidManifest.xml | 4 ++++ .../main/src/main/res/layout/activity_detail.xml | 13 ++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b67c44bc..6b02523a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -44,6 +44,10 @@ android:exported="false" android:screenOrientation="portrait" /> + + @@ -112,7 +112,6 @@ android:layout_marginTop="10dp" android:ellipsize="end" android:lineSpacingMultiplier="1.0" - android:paddingVertical="5dp" android:maxLines="2" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" From 0b8b7687415bce9a69d08813d00fa1cbd3f0ac6a Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 01:51:22 +0900 Subject: [PATCH 07/18] =?UTF-8?q?[ADD/#131]=20=EC=95=8C=EB=A6=BC=EB=B7=B0?= =?UTF-8?q?=20=ED=99=88=EB=B7=B0=20intent=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/src/main/res/drawable/ic_alarm.png | Bin 0 -> 1949 bytes .../co/orange/main/alarm/AlarmActivity.kt | 6 ++++- .../co/orange/main/main/home/HomeFragment.kt | 8 ++++++ .../src/main/res/layout/activity_alarm.xml | 5 ++-- .../src/main/res/layout/fragment_home.xml | 23 ++++++++++++++---- .../src/main/res/layout/item_history_buy.xml | 1 + 6 files changed, 34 insertions(+), 9 deletions(-) create mode 100644 core/src/main/res/drawable/ic_alarm.png diff --git a/core/src/main/res/drawable/ic_alarm.png b/core/src/main/res/drawable/ic_alarm.png new file mode 100644 index 0000000000000000000000000000000000000000..5cb1c1eb95df9efebab967aeca75ef941c698c27 GIT binary patch literal 1949 zcmV;O2V(e%P)OhCE{QO5a&l7Qjd`z+xy;Y?#=W3NOI zks$0UEG%3Fkqr=7$Md{UzC)f4x7&T3_&`HLL#x;f+X$~&vnFwPcz8QRU*<7Q>_I2Q z4-$4YH8l;04X}kU8r??p7Gb7D2A5)DV&1E*t^GhIiAfPgtMf-jM)s(m7PIsdZV-m( z3FE{GXfK8MPK)`Q30vvvof0O(CX7}yh-wMx0bUs+{6ILym^=-!Q~d5uN=oXjtgKXN zQeIvj)7{-YBOxJS0gv-|Z`s(`*h(5>HP7w<<*IJJ9^-aO!a!Jri;9ZU`RGwG8LP-| zP~m-4{!m?A-AM@pl)r@NMMaEwww_M;7h_{%v#YDCFGz?8nJ`*O>hJGYM0Cx12p=>3 zypDnSU2H&hcJ?f^|1LjYFiF0`a9Z5l++6rxxNqokWFbvemI-?eNtUlnEedGegEB?H!oN?{ zs);kG+Y@3Dp=kJdUBF`CZJ9!->5N9+ZIZN6EW$Ej@4DC*N11khktqiCXjOJYlRYIC z?U5zI#l^*HE==>w=yunO1Mse?t2A*+X=&*kEBP%E#tJ{6%V_1F#35iPJ9QaaUMLn| zi7@15>9Wz$(Qa`F^sZ~V45iGrlvk|bE?qz){2|U^)I=697GRZdqArMwiyIb)K=&Ot zkxjFZ)pD1fVaVuq-x7yFeQuk`k}PDkMi?WZkB_m;%*;M<2#_=Qz0mMI7P49+j5Zf) zg8S1Qc*lm(d7wEo7aTFk7@(2xe)8|0)iG?_V{MEwzw!V#2ss7Zd4YxJ?`c z8;L#$cKOOs%0v12`FBs0cS6Dxyx2s1TpR`jzt&}}?UzrK&kEse6WKX&7}UYAC1q?+ zjxdHvr7zV!)JvB-BMyU=)d^kZb^ZlKP{M6(ZI9D+7HQ&$Z}zPqEiFy01_lP6BzjaU>^r+$uy%m;ygG^S+eo00)!st_Qv@VT*L_BpLHHwyA{;q#L>=3F ztBKW7?1n&jObL6tbAcuvWS(=x%MlDHW|xV$EYSO=gmJcSB1-j@q1^_KHhLub@C|jl z;Va-dGcPYM-|S^m!en?!m(fl3NEAZ(xTx=Ex*Ti0-Ryk>VdgRA-N@3!=QyHlmM8_* zdZ+jJ^&g<1TsA%lhIe%VmQUTq&|RK~B#Kc}Q*)WItZ!)UNK8yLEJ6%~$#{q1CAa&$ zL^;s#SzU&s(csuK5Qd!L_>o4KF3}G&HUAoLb zSZ%K5@2d*FC@3i@xlf`LtgK!|QF{G;!-8MZ-wm|VI-or#u#sqn^h${$K+?s@;d-?D znn`kvS)M=#Q0j8o_r%K#2`<-HMCa));v^WKaYPS8dX-6X7qiXEs;a6hdP1Np4{8i= zf?Oj7-s_j(@#GQZktR-pdIU_PZadA$Dg@j-u+UIbQ8A%Y{#|$zJ5&)UF(z2fj*gD* zjEoF*^)HE5drYR_GU_DIOE=#N*$;!gWSKx&Sy{^9;NUXImk?%|ypl?z_!%{ITb6fk zOXyH@sykRY$W))ciTpIb4`Nj7t=z}7O=BFIZ^n@A7yn9ap~d%ySd_X?a@yCI7H&Ca z2=x|EFbwGe8X!@^gT89A~+SC@3NFyL?9e zPbw=b!!dlOuyvZD!ZXpTy5Z`#yYjkV)ZBPDH8r)}>r?&00000NkvXXu0mjfK)(R.layout.activity_alarm binding.layoutEmpty.isVisible = state.data.alarmList.isEmpty() } - is UiState.Failure -> toast(stringOf(co.orange.core.R.string.error_msg)) + is UiState.Failure -> { + toast(stringOf(co.orange.core.R.string.error_msg)) + binding.layoutEmpty.isVisible = true + } + else -> return@onEach } }.launchIn(lifecycleScope) diff --git a/feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt b/feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt index 668a9fae..3f7d2017 100644 --- a/feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt +++ b/feature/main/src/main/java/co/orange/main/main/home/HomeFragment.kt @@ -18,6 +18,7 @@ import co.orange.core.extension.stringOf import co.orange.core.extension.toast import co.orange.core.navigation.NavigationManager import co.orange.core.state.UiState +import co.orange.main.alarm.AlarmActivity import co.orange.main.databinding.FragmentHomeBinding import co.orange.main.detail.DetailActivity import co.orange.main.main.home.HomeAdapter.Companion.VIEW_TYPE_BANNER @@ -48,6 +49,7 @@ class HomeFragment() : BaseFragment(featureR.layout.fragmen initAdapter() initSearchBtnListener() + initAlarmBtnListener() initSellBtnListener() setDeviceToken() setGridRecyclerView() @@ -102,6 +104,12 @@ class HomeFragment() : BaseFragment(featureR.layout.fragmen } } + private fun initAlarmBtnListener() { + binding.btnAlarm.setOnSingleClickListener { + startActivity(Intent(requireContext(), AlarmActivity::class.java)) + } + } + private fun initSellBtnListener() { binding.btnSell.setOnSingleClickListener { AmplitudeManager.trackEvent("click_home_sell") diff --git a/feature/main/src/main/res/layout/activity_alarm.xml b/feature/main/src/main/res/layout/activity_alarm.xml index 89328ee4..a9023cbc 100644 --- a/feature/main/src/main/res/layout/activity_alarm.xml +++ b/feature/main/src/main/res/layout/activity_alarm.xml @@ -26,8 +26,8 @@ android:id="@+id/tv_alarm_title" style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" + android:padding="20dp" android:layout_height="wrap_content" - android:layout_marginTop="12dp" android:text="@string/alarm_tv_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" @@ -37,11 +37,10 @@ android:id="@+id/border_alarm" android:layout_width="0dp" android:layout_height="7dp" - android:layout_marginTop="2dp" android:background="@color/background_gray" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/btn_back" /> + app:layout_constraintTop_toBottomOf="@id/tv_alarm_title" /> + + @@ -34,8 +46,9 @@ android:id="@+id/iv_home_logo" android:layout_width="76dp" android:layout_height="wrap_content" - android:layout_marginStart="26dp" + android:layout_marginStart="20dp" android:adjustViewBounds="true" + android:paddingVertical="20dp" android:src="@drawable/img_logo_text" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/feature/setting/src/main/res/layout/item_history_buy.xml b/feature/setting/src/main/res/layout/item_history_buy.xml index 81a76ef8..c45392b0 100644 --- a/feature/setting/src/main/res/layout/item_history_buy.xml +++ b/feature/setting/src/main/res/layout/item_history_buy.xml @@ -18,6 +18,7 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="14dp" + app:cardCornerRadius="10dp" app:cardElevation="0dp" app:layout_constraintDimensionRatio="1" app:layout_constraintEnd_toEndOf="parent" From 911dde62ba660329547d8bf435b7c24a132e7d55 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 02:14:58 +0900 Subject: [PATCH 08/18] =?UTF-8?q?[FIX/#131]=20=EB=82=98=EB=A8=B8=EC=A7=80?= =?UTF-8?q?=20=EC=95=8C=EB=9E=8C=20=ED=81=B4=EB=A6=AD=20=EC=8B=9C=20?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=EB=B7=B0=20=EC=9D=B4=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/src/main/java/co/orange/main/alarm/AlarmActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt b/feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt index aa367ee8..eba85f84 100644 --- a/feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt +++ b/feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt @@ -103,7 +103,7 @@ class AlarmActivity : BaseActivity(R.layout.activity_alarm item.orderId?.let { navigationManager.toSellInfoView(this, it) } } - else -> return + else -> finish() } } From 6b7c4e06ae81b6e0660e590aa4edbab11ca169d4 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 02:24:21 +0900 Subject: [PATCH 09/18] =?UTF-8?q?[FIX/#131]=20=ED=8C=90=EB=A7=A4=20?= =?UTF-8?q?=ED=99=95=EC=A0=95=20API=20url=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/src/main/java/co/orange/data/service/SellService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/src/main/java/co/orange/data/service/SellService.kt b/data/src/main/java/co/orange/data/service/SellService.kt index 88c3a4a9..926853b5 100644 --- a/data/src/main/java/co/orange/data/service/SellService.kt +++ b/data/src/main/java/co/orange/data/service/SellService.kt @@ -48,7 +48,7 @@ interface SellService { @Path("id") orderId: String, ): BaseResponse - @PATCH("/api/v1/order/{id}/sell") + @PATCH("/api/v1/order/{id}/sale") suspend fun patchOrderConfirm( @Path("id") orderId: String, ): BaseResponse From af4271002d21ebbd199ae7409ac3fa4cc3223d10 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 02:35:48 +0900 Subject: [PATCH 10/18] =?UTF-8?q?[FIX/#131]=20=ED=8C=90=EB=A7=A4=20?= =?UTF-8?q?=ED=99=95=EC=A0=95=20=EB=9D=BC=EC=9D=B4=ED=8C=85=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 --- core/src/main/res/values/strings.xml | 8 ++++---- .../src/main/java/co/orange/sell/info/SellInfoActivity.kt | 2 +- feature/sell/src/main/res/layout/activity_sell_info.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/res/values/strings.xml b/core/src/main/res/values/strings.xml index 2a71f03a..c0b537fb 100644 --- a/core/src/main/res/values/strings.xml +++ b/core/src/main/res/values/strings.xml @@ -240,15 +240,15 @@ 개인정보 처리방침 (필수) 서비스 이용 약관 (필수) 마케팅 수신 동의 (선택) - 동의하고 본인 인증하러 가기 + 동의하고 본인인증하러 가기 %1$s님 완료 환영해요! - 본인 인증을 진행해주세요 - 안전한 딴지 사용을 위해\n본인 인증이 필요해요 - 본인 인증하러 가기 + 본인인증을 진행해주세요 + 안전한 딴지 사용을 위해\n본인인증이 필요해요 + 본인인증하러 가기 구매 목록 판매 목록 diff --git a/feature/sell/src/main/java/co/orange/sell/info/SellInfoActivity.kt b/feature/sell/src/main/java/co/orange/sell/info/SellInfoActivity.kt index a0fe936b..ae5fd2d0 100644 --- a/feature/sell/src/main/java/co/orange/sell/info/SellInfoActivity.kt +++ b/feature/sell/src/main/java/co/orange/sell/info/SellInfoActivity.kt @@ -100,7 +100,7 @@ class SellInfoActivity : val (infoMsgResId, btnTextResId, isButtonEnabled) = when (status) { ItemStatus.ON_SALE.name -> { - Triple(R.string.sell_info_msg_on_sale, R.string.sell_info_btn_fix, false) + Triple(R.string.sell_info_msg_on_sale, R.string.sell_info_msg_on_sale, false) } ItemStatus.ORDERED.name -> { diff --git a/feature/sell/src/main/res/layout/activity_sell_info.xml b/feature/sell/src/main/res/layout/activity_sell_info.xml index df6608d9..726400e5 100644 --- a/feature/sell/src/main/res/layout/activity_sell_info.xml +++ b/feature/sell/src/main/res/layout/activity_sell_info.xml @@ -87,7 +87,7 @@ style="@style/TextAppearance.DDanzi.Body4" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginHorizontal="20dp" + android:layout_marginHorizontal="10dp" android:gravity="center" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" From d1e903d6e316eaa5648679b6676da938fec3a9de Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 02:56:10 +0900 Subject: [PATCH 11/18] =?UTF-8?q?[FIX/#131]=20=ED=8C=90=EB=A7=A4=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD=20dto=20=EB=82=A0=EC=A7=9C=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 --- .../co/orange/data/dto/request/SellRegisterRequestDto.kt | 6 +++--- .../domain/entity/request/SellRegisterRequestModel.kt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/src/main/java/co/orange/data/dto/request/SellRegisterRequestDto.kt b/data/src/main/java/co/orange/data/dto/request/SellRegisterRequestDto.kt index ad028f61..88bb6e59 100644 --- a/data/src/main/java/co/orange/data/dto/request/SellRegisterRequestDto.kt +++ b/data/src/main/java/co/orange/data/dto/request/SellRegisterRequestDto.kt @@ -10,12 +10,12 @@ data class SellRegisterRequestDto( val productId: String, @SerialName("productName") val productName: String, - @SerialName("dueDate") - val dueDate: String, + @SerialName("receivedDate") + val receivedDate: String, @SerialName("registeredImage") val registeredImage: String, ) { companion object { - fun SellRegisterRequestModel.toDto() = SellRegisterRequestDto(productId, productName, dueDate, registeredImage) + fun SellRegisterRequestModel.toDto() = SellRegisterRequestDto(productId, productName, receivedDate, registeredImage) } } diff --git a/domain/src/main/kotlin/co/orange/domain/entity/request/SellRegisterRequestModel.kt b/domain/src/main/kotlin/co/orange/domain/entity/request/SellRegisterRequestModel.kt index 233e863a..8d995585 100644 --- a/domain/src/main/kotlin/co/orange/domain/entity/request/SellRegisterRequestModel.kt +++ b/domain/src/main/kotlin/co/orange/domain/entity/request/SellRegisterRequestModel.kt @@ -3,6 +3,6 @@ package co.orange.domain.entity.request data class SellRegisterRequestModel( val productId: String, val productName: String, - val dueDate: String, + val receivedDate: String, val registeredImage: String, ) From ab9090bdac384e4a3d19b3b49ae765d6d2ec96e9 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 03:13:39 +0900 Subject: [PATCH 12/18] =?UTF-8?q?[FIX/#131]=20=ED=8C=90=EB=A7=A4=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=ED=9B=84=20navigation=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 --- .../java/co/orange/buy/finished/BuyFinishedActivity.kt | 8 ++------ .../main/java/co/orange/main/detail/OptionBottomSheet.kt | 1 + feature/main/src/main/res/layout/activity_splash.xml | 1 + 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/feature/buy/src/main/java/co/orange/buy/finished/BuyFinishedActivity.kt b/feature/buy/src/main/java/co/orange/buy/finished/BuyFinishedActivity.kt index 55cd0de4..ef6c7156 100644 --- a/feature/buy/src/main/java/co/orange/buy/finished/BuyFinishedActivity.kt +++ b/feature/buy/src/main/java/co/orange/buy/finished/BuyFinishedActivity.kt @@ -54,17 +54,13 @@ class BuyFinishedActivity : } private fun initReturnBtnListener() { - binding.btnHome.setOnSingleClickListener { navigateToHome() } + binding.btnHome.setOnSingleClickListener { navigationManager.toMainViewWIthClearing(this) } binding.btnKeepShopping.setOnSingleClickListener { AmplitudeManager.trackEvent("click_purchase_adjustment_add") - navigateToHome() + navigationManager.toMainViewWIthClearing(this) } } - private fun navigateToHome() { - navigationManager.toMainViewWIthClearing(this) - } - private fun initDetailBtnListener() { binding.btnShowDetail.setOnSingleClickListener { AmplitudeManager.trackEvent("click_purchase_adjustment_check") diff --git a/feature/main/src/main/java/co/orange/main/detail/OptionBottomSheet.kt b/feature/main/src/main/java/co/orange/main/detail/OptionBottomSheet.kt index daccb33b..258815c0 100644 --- a/feature/main/src/main/java/co/orange/main/detail/OptionBottomSheet.kt +++ b/feature/main/src/main/java/co/orange/main/detail/OptionBottomSheet.kt @@ -70,6 +70,7 @@ class OptionBottomSheet : viewModel.productId, viewModel.selectedOptionList, ) + dismiss() } } diff --git a/feature/main/src/main/res/layout/activity_splash.xml b/feature/main/src/main/res/layout/activity_splash.xml index 88da880d..35c492ff 100644 --- a/feature/main/src/main/res/layout/activity_splash.xml +++ b/feature/main/src/main/res/layout/activity_splash.xml @@ -14,6 +14,7 @@ Date: Thu, 12 Sep 2024 03:23:58 +0900 Subject: [PATCH 13/18] =?UTF-8?q?[FIX/#131]=20=EB=B7=B0=20=EC=83=81?= =?UTF-8?q?=EB=8B=A8=20=ED=83=80=EC=9D=B4=ED=8B=80=20=ED=8C=A8=EB=94=A9=20?= =?UTF-8?q?=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/buy/src/main/res/layout/activity_buy_finished.xml | 3 +-- feature/buy/src/main/res/layout/activity_buy_info.xml | 3 +-- feature/buy/src/main/res/layout/activity_buy_progress.xml | 4 +--- feature/main/src/main/res/layout/activity_detail.xml | 3 ++- feature/main/src/main/res/layout/activity_report.xml | 2 +- feature/main/src/main/res/layout/activity_search.xml | 6 +++--- feature/sell/src/main/res/layout/activity_sell_confirm.xml | 3 +-- feature/sell/src/main/res/layout/activity_sell_finished.xml | 3 +-- feature/sell/src/main/res/layout/activity_sell_info.xml | 3 +-- .../sell/src/main/res/layout/activity_sell_onboarding.xml | 3 +-- feature/sell/src/main/res/layout/activity_sell_progress.xml | 3 +-- feature/setting/src/main/res/layout/activity_account.xml | 2 +- feature/setting/src/main/res/layout/activity_history.xml | 3 +-- feature/setting/src/main/res/layout/activity_setting.xml | 3 +-- 14 files changed, 17 insertions(+), 27 deletions(-) diff --git a/feature/buy/src/main/res/layout/activity_buy_finished.xml b/feature/buy/src/main/res/layout/activity_buy_finished.xml index 8308c802..3b95d1d5 100644 --- a/feature/buy/src/main/res/layout/activity_buy_finished.xml +++ b/feature/buy/src/main/res/layout/activity_buy_finished.xml @@ -24,8 +24,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="19dp" + android:padding="20dp" android:text="@string/buy_finished_tv_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/feature/buy/src/main/res/layout/activity_buy_info.xml b/feature/buy/src/main/res/layout/activity_buy_info.xml index 5e6eff45..b4302772 100644 --- a/feature/buy/src/main/res/layout/activity_buy_info.xml +++ b/feature/buy/src/main/res/layout/activity_buy_info.xml @@ -24,8 +24,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="19dp" + android:padding="20dp" android:text="@string/buy_info_tv_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/feature/buy/src/main/res/layout/activity_buy_progress.xml b/feature/buy/src/main/res/layout/activity_buy_progress.xml index 91c590af..9ac8c757 100644 --- a/feature/buy/src/main/res/layout/activity_buy_progress.xml +++ b/feature/buy/src/main/res/layout/activity_buy_progress.xml @@ -29,8 +29,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="24dp" + android:padding="20dp" android:text="@string/buy_confirm_tv_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -69,7 +68,6 @@ style="@style/TextAppearance.DDanzi.Title4" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginTop="12dp" android:text="@string/confirm_tv_product_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/feature/main/src/main/res/layout/activity_detail.xml b/feature/main/src/main/res/layout/activity_detail.xml index 60ce2e62..1ea07b81 100644 --- a/feature/main/src/main/res/layout/activity_detail.xml +++ b/feature/main/src/main/res/layout/activity_detail.xml @@ -15,6 +15,7 @@ android:id="@+id/btn_back" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="4dp" android:layout_marginStart="8dp" android:padding="12dp" android:src="@drawable/ic_back" @@ -36,7 +37,7 @@ android:id="@+id/sv_detail" android:layout_width="0dp" android:layout_height="0dp" - android:layout_marginTop="9dp" + android:layout_marginTop="5dp" app:layout_constraintBottom_toTopOf="@id/border_detail" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/feature/main/src/main/res/layout/activity_report.xml b/feature/main/src/main/res/layout/activity_report.xml index a7982a81..95860793 100644 --- a/feature/main/src/main/res/layout/activity_report.xml +++ b/feature/main/src/main/res/layout/activity_report.xml @@ -26,7 +26,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" + android:padding="20dp" android:text="@string/report_tv_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/feature/main/src/main/res/layout/activity_search.xml b/feature/main/src/main/res/layout/activity_search.xml index af35bfe0..126b2b90 100644 --- a/feature/main/src/main/res/layout/activity_search.xml +++ b/feature/main/src/main/res/layout/activity_search.xml @@ -23,9 +23,9 @@ android:id="@+id/btn_back" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginVertical="11dp" - android:layout_marginStart="9dp" - android:padding="11dp" + android:layout_marginTop="4dp" + android:layout_marginStart="8dp" + android:padding="12dp" android:src="@drawable/ic_back" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/feature/sell/src/main/res/layout/activity_sell_confirm.xml b/feature/sell/src/main/res/layout/activity_sell_confirm.xml index 18fbbad2..8f222cbd 100644 --- a/feature/sell/src/main/res/layout/activity_sell_confirm.xml +++ b/feature/sell/src/main/res/layout/activity_sell_confirm.xml @@ -35,8 +35,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="19dp" + android:padding="20dp" android:text="@string/sell_confirm_tv_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/feature/sell/src/main/res/layout/activity_sell_finished.xml b/feature/sell/src/main/res/layout/activity_sell_finished.xml index c40957ac..4077dea2 100644 --- a/feature/sell/src/main/res/layout/activity_sell_finished.xml +++ b/feature/sell/src/main/res/layout/activity_sell_finished.xml @@ -24,8 +24,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="24dp" + android:padding="20dp" android:text="@string/sell_finished_tv_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/feature/sell/src/main/res/layout/activity_sell_info.xml b/feature/sell/src/main/res/layout/activity_sell_info.xml index 726400e5..f9ae852a 100644 --- a/feature/sell/src/main/res/layout/activity_sell_info.xml +++ b/feature/sell/src/main/res/layout/activity_sell_info.xml @@ -24,8 +24,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="19dp" + android:padding="20dp" android:text="@string/sell_info_tv_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/feature/sell/src/main/res/layout/activity_sell_onboarding.xml b/feature/sell/src/main/res/layout/activity_sell_onboarding.xml index edc582e5..9674bc32 100644 --- a/feature/sell/src/main/res/layout/activity_sell_onboarding.xml +++ b/feature/sell/src/main/res/layout/activity_sell_onboarding.xml @@ -24,8 +24,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="24dp" + android:padding="20dp" android:text="@string/confirm_tv_sell_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/feature/sell/src/main/res/layout/activity_sell_progress.xml b/feature/sell/src/main/res/layout/activity_sell_progress.xml index 7fbe0241..24e528a0 100644 --- a/feature/sell/src/main/res/layout/activity_sell_progress.xml +++ b/feature/sell/src/main/res/layout/activity_sell_progress.xml @@ -31,8 +31,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="24dp" + android:padding="20dp" android:text="@string/confirm_tv_sell_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/feature/setting/src/main/res/layout/activity_account.xml b/feature/setting/src/main/res/layout/activity_account.xml index b59d42f2..139540af 100644 --- a/feature/setting/src/main/res/layout/activity_account.xml +++ b/feature/setting/src/main/res/layout/activity_account.xml @@ -15,8 +15,8 @@ android:id="@+id/btn_back" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="4dp" android:layout_marginStart="8dp" - android:layout_marginTop="1dp" android:padding="12dp" android:src="@drawable/ic_back" app:layout_constraintStart_toStartOf="parent" diff --git a/feature/setting/src/main/res/layout/activity_history.xml b/feature/setting/src/main/res/layout/activity_history.xml index 6a43049c..82339dcb 100644 --- a/feature/setting/src/main/res/layout/activity_history.xml +++ b/feature/setting/src/main/res/layout/activity_history.xml @@ -35,8 +35,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="19dp" + android:padding="20dp" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/feature/setting/src/main/res/layout/activity_setting.xml b/feature/setting/src/main/res/layout/activity_setting.xml index 4b6e8942..1315df68 100644 --- a/feature/setting/src/main/res/layout/activity_setting.xml +++ b/feature/setting/src/main/res/layout/activity_setting.xml @@ -35,8 +35,7 @@ style="@style/TextAppearance.DDanzi.Body2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="12dp" - android:layout_marginBottom="19dp" + android:padding="20dp" android:text="@string/setting_tv_title" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" From 235d99937c514e8e5901d15b01024b7d17f63119 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 03:43:36 +0900 Subject: [PATCH 14/18] =?UTF-8?q?[FIX/#131]=20=ED=91=B8=EC=8B=9C=20?= =?UTF-8?q?=EC=95=8C=EB=A6=BC=20=EC=88=98=EC=8B=A0=20=EC=8B=9C=20orederId?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/co/orange/main/alarm/AlarmActivity.kt | 2 +- .../java/co/orange/sell/confirm/SellConfirmViewModel.kt | 2 +- .../java/co/orange/sell/finished/SellFinishedActivity.kt | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt b/feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt index eba85f84..31731df1 100644 --- a/feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt +++ b/feature/main/src/main/java/co/orange/main/alarm/AlarmActivity.kt @@ -100,7 +100,7 @@ class AlarmActivity : BaseActivity(R.layout.activity_alarm } in listOf(AlarmType.B2.name, AlarmType.B3.name, AlarmType.B4.name) -> { - item.orderId?.let { navigationManager.toSellInfoView(this, it) } + item.orderId?.let { navigationManager.toBuyInfoView(this, it) } } else -> finish() diff --git a/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmViewModel.kt b/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmViewModel.kt index ec702c79..acc80cbe 100644 --- a/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmViewModel.kt +++ b/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmViewModel.kt @@ -44,7 +44,7 @@ class SellConfirmViewModel viewModelScope.launch { sellRepository.patchOrderConfirm(orderId) .onSuccess { - if (it.orderStatus == OrderStatus.COMPLETED.name) { + if (it.orderStatus == OrderStatus.SHIPPING.name) { _patchOrderConfirmResult.emit(true) } else { _patchOrderConfirmResult.emit(false) diff --git a/feature/sell/src/main/java/co/orange/sell/finished/SellFinishedActivity.kt b/feature/sell/src/main/java/co/orange/sell/finished/SellFinishedActivity.kt index dc35cbf3..733b1d3f 100644 --- a/feature/sell/src/main/java/co/orange/sell/finished/SellFinishedActivity.kt +++ b/feature/sell/src/main/java/co/orange/sell/finished/SellFinishedActivity.kt @@ -34,10 +34,12 @@ class SellFinishedActivity : private fun initReturnBtnListener() { with(binding) { - btnExit.setOnSingleClickListener { navigationManager.toMainViewWIthClearing(this@SellFinishedActivity) } + btnExit.setOnSingleClickListener { + navigationManager.toMainViewWIthClearing(this@SellFinishedActivity) + } btnSellMore.setOnSingleClickListener { AmplitudeManager.trackEvent("click_sell_adjustment_add") - navigationManager.toMainViewWIthClearing(this@SellFinishedActivity) + finish() } } } From a0c2f84adaa7b8acb5f4e8388247941327db65aa Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 03:52:15 +0900 Subject: [PATCH 15/18] =?UTF-8?q?[FIX/#131]=20=EB=B0=B0=EC=86=A1=EC=A7=80?= =?UTF-8?q?=20=EC=9E=85=EB=A0=A5=20state=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sell/confirm/SellConfirmActivity.kt | 21 +++++++++++-------- .../sell/confirm/SellConfirmViewModel.kt | 12 +++++------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmActivity.kt b/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmActivity.kt index b748a2f3..ff7a7469 100644 --- a/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmActivity.kt +++ b/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmActivity.kt @@ -42,7 +42,7 @@ class SellConfirmActivity : initConfirmBtnListener() getIntentInfo() observeGetBuyerInfoState() - observePatchOrderConfirmResult() + observePatchOrderConfirmState() } private fun initBackBtnListener() { @@ -115,14 +115,17 @@ class SellConfirmActivity : clipboardManager.setPrimaryClip(ClipData.newPlainText(CLIP_LABEL, text)) } - private fun observePatchOrderConfirmResult() { - viewModel.patchOrderConfirmResult.flowWithLifecycle(lifecycle).distinctUntilChanged() - .onEach { isSuccess -> - if (isSuccess) { - toast(stringOf(R.string.sell_order_fix_msg)) - navigationManager.toMainViewWIthClearing(this) - } else { - toast(stringOf(R.string.error_msg)) + private fun observePatchOrderConfirmState() { + viewModel.patchOrderConfirmState.flowWithLifecycle(lifecycle).distinctUntilChanged() + .onEach { state -> + when (state) { + is UiState.Success -> { + toast(stringOf(R.string.sell_order_fix_msg)) + navigationManager.toMainViewWIthClearing(this) + } + + is UiState.Failure -> toast(stringOf(R.string.error_msg)) + else -> return@onEach } }.launchIn(lifecycleScope) } diff --git a/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmViewModel.kt b/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmViewModel.kt index acc80cbe..d20afb38 100644 --- a/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmViewModel.kt +++ b/feature/sell/src/main/java/co/orange/sell/confirm/SellConfirmViewModel.kt @@ -7,9 +7,7 @@ import co.orange.domain.entity.response.SellBuyerInfoModel import co.orange.domain.enums.OrderStatus import co.orange.domain.repository.SellRepository import dagger.hilt.android.lifecycle.HiltViewModel -import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.SharedFlow import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.launch import javax.inject.Inject @@ -25,8 +23,8 @@ class SellConfirmViewModel private val _getBuyerInfoState = MutableStateFlow>(UiState.Empty) val getBuyerInfoState: StateFlow> = _getBuyerInfoState - private val _patchOrderConfirmResult = MutableSharedFlow() - val patchOrderConfirmResult: SharedFlow = _patchOrderConfirmResult + private val _patchOrderConfirmState = MutableStateFlow>(UiState.Empty) + val patchOrderConfirmState: StateFlow> = _patchOrderConfirmState fun getBuyerInfoFromServer() { _getBuyerInfoState.value = UiState.Loading @@ -45,13 +43,13 @@ class SellConfirmViewModel sellRepository.patchOrderConfirm(orderId) .onSuccess { if (it.orderStatus == OrderStatus.SHIPPING.name) { - _patchOrderConfirmResult.emit(true) + _patchOrderConfirmState.value = UiState.Success(true) } else { - _patchOrderConfirmResult.emit(false) + _patchOrderConfirmState.value = UiState.Failure(it.orderStatus) } } .onFailure { - _patchOrderConfirmResult.emit(false) + _patchOrderConfirmState.value = UiState.Failure(it.message.orEmpty()) } } } From cf613413fd16d425b0334302778253155f83a47b Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 04:09:16 +0900 Subject: [PATCH 16/18] =?UTF-8?q?[FIX/#131]=20ItemStatus=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EC=83=81=ED=99=A9=20=EB=8C=80=EC=9D=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/kotlin/co/orange/domain/enums/ItemStatus.kt | 2 ++ .../src/main/java/co/orange/sell/info/SellInfoActivity.kt | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/domain/src/main/kotlin/co/orange/domain/enums/ItemStatus.kt b/domain/src/main/kotlin/co/orange/domain/enums/ItemStatus.kt index aac2fc22..a1d3eac0 100644 --- a/domain/src/main/kotlin/co/orange/domain/enums/ItemStatus.kt +++ b/domain/src/main/kotlin/co/orange/domain/enums/ItemStatus.kt @@ -4,6 +4,8 @@ enum class ItemStatus { ON_SALE, ORDERED, SHIPPING, + DELAYED_SHIPPING, + WARNING, COMPLETED, CANCELLED, } diff --git a/feature/sell/src/main/java/co/orange/sell/info/SellInfoActivity.kt b/feature/sell/src/main/java/co/orange/sell/info/SellInfoActivity.kt index ae5fd2d0..42f62606 100644 --- a/feature/sell/src/main/java/co/orange/sell/info/SellInfoActivity.kt +++ b/feature/sell/src/main/java/co/orange/sell/info/SellInfoActivity.kt @@ -107,7 +107,13 @@ class SellInfoActivity : Triple(R.string.sell_info_msg_ordered, R.string.sell_info_btn_fix, true) } - ItemStatus.SHIPPING.name -> { + in + listOf( + ItemStatus.SHIPPING.name, + ItemStatus.DELAYED_SHIPPING.name, + ItemStatus.WARNING.name, + ), + -> { Triple(R.string.buy_info_msg_shipping, R.string.sell_info_btn_shipping, false) } From b3e2fa9f43b7c974308b76aa3933837bdc166403 Mon Sep 17 00:00:00 2001 From: Sangho Kim Date: Thu, 12 Sep 2024 04:16:25 +0900 Subject: [PATCH 17/18] =?UTF-8?q?[FIX/#131]=20=EA=B5=AC=EB=A7=A4=20?= =?UTF-8?q?=EC=83=81=EC=84=B8=EB=B7=B0=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- feature/buy/src/main/res/layout/activity_buy_info.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/feature/buy/src/main/res/layout/activity_buy_info.xml b/feature/buy/src/main/res/layout/activity_buy_info.xml index b4302772..71ec4cc0 100644 --- a/feature/buy/src/main/res/layout/activity_buy_info.xml +++ b/feature/buy/src/main/res/layout/activity_buy_info.xml @@ -111,10 +111,10 @@ android:layout_height="0dp" android:layout_marginTop="18dp" android:scaleType="centerCrop" - android:src="@drawable/mock_img_product" app:layout_constraintDimensionRatio="1" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/tv_info_product_title" /> + app:layout_constraintTop_toBottomOf="@id/tv_info_product_title" + tools:src="@drawable/mock_img_product" /> Date: Thu, 12 Sep 2024 04:25:46 +0900 Subject: [PATCH 18/18] =?UTF-8?q?[FIX/#131]=20=EA=B5=AC=EB=A7=A4=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=95=84=EC=9D=B4=ED=85=9C=20=ED=81=B4?= =?UTF-8?q?=EB=A6=AD=20=EC=8B=9C=20=EC=83=81=EC=84=B8=EB=B7=B0=EB=A1=9C=20?= =?UTF-8?q?navigate?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/co/orange/setting/history/HistoryActivity.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/feature/setting/src/main/java/co/orange/setting/history/HistoryActivity.kt b/feature/setting/src/main/java/co/orange/setting/history/HistoryActivity.kt index 0d4a58c0..a7a7a6e0 100644 --- a/feature/setting/src/main/java/co/orange/setting/history/HistoryActivity.kt +++ b/feature/setting/src/main/java/co/orange/setting/history/HistoryActivity.kt @@ -67,7 +67,7 @@ class HistoryActivity : BaseActivity(featureR.layout.act private fun initAdapter() { _buyAdapter = HistoryBuyAdapter { orderId -> - navigationManager.toBuyFinishedView(this, orderId) + navigationManager.toBuyInfoView(this, orderId) } _sellAdapter = HistorySellAdapter { itemId ->