From 44f4a3eed1e54543072200f36da9790feef74a00 Mon Sep 17 00:00:00 2001 From: Hamidreza Date: Sun, 26 Feb 2023 16:03:53 +0330 Subject: [PATCH 1/7] Fix opening keyboard in verify OTP --- .../bazaarpay/screens/login/verify/VerifyOtpFragment.kt | 5 +++++ BazaarPay/src/main/res/layout/fragment_verify_otp.xml | 2 -- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/login/verify/VerifyOtpFragment.kt b/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/login/verify/VerifyOtpFragment.kt index 8e76e0c1..2c7704a0 100644 --- a/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/login/verify/VerifyOtpFragment.kt +++ b/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/login/verify/VerifyOtpFragment.kt @@ -5,11 +5,13 @@ import android.content.Context import android.content.Intent import android.content.IntentFilter import android.os.Bundle +import android.text.InputType import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.view.inputmethod.EditorInfo +import android.view.inputmethod.InputMethodManager import androidx.activity.addCallback import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.Fragment @@ -124,6 +126,9 @@ internal class VerifyOtpFragment : Fragment() { binding.proceedBtn.isEnabled = it?.length == 4 && viewModel.verifyCodeStateLiveData.value?.resourceState != ResourceState.Loading } + + binding.verificationCodeEditText.requestFocus() + } override fun onActivityCreated(savedInstanceState: Bundle?) { diff --git a/BazaarPay/src/main/res/layout/fragment_verify_otp.xml b/BazaarPay/src/main/res/layout/fragment_verify_otp.xml index 6505dd3f..35b1c156 100644 --- a/BazaarPay/src/main/res/layout/fragment_verify_otp.xml +++ b/BazaarPay/src/main/res/layout/fragment_verify_otp.xml @@ -33,8 +33,6 @@ style="@style/Bazaar.HorizontalDivider" android:layout_width="0dp" android:layout_margin="@dimen/bazaarpay_default_margin_double_half" - android:focusable="true" - android:focusableInTouchMode="true" app:layout_constraintBottom_toTopOf="@id/editPhoneContainer" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> From f0c1b1a18a5af2435755c06ba1e1b49ee0b3e51a Mon Sep 17 00:00:00 2001 From: Hamidreza Date: Sun, 26 Feb 2023 16:48:34 +0330 Subject: [PATCH 2/7] Fix change phone icon orientation --- BazaarPay/src/main/res/layout/layout_edit_phone.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BazaarPay/src/main/res/layout/layout_edit_phone.xml b/BazaarPay/src/main/res/layout/layout_edit_phone.xml index 1ee89fe6..1179f733 100644 --- a/BazaarPay/src/main/res/layout/layout_edit_phone.xml +++ b/BazaarPay/src/main/res/layout/layout_edit_phone.xml @@ -40,7 +40,7 @@ android:text="@string/bazaarpay_enter_edit_mobile" tools:text="تغییر حساب کاربری" /> - Date: Sat, 4 Mar 2023 16:45:15 +0330 Subject: [PATCH 3/7] Remove unused import from MainActivity.kt --- app/src/main/java/ir/cafebazaar/bazaarpaysample/MainActivity.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/app/src/main/java/ir/cafebazaar/bazaarpaysample/MainActivity.kt b/app/src/main/java/ir/cafebazaar/bazaarpaysample/MainActivity.kt index 905e37d0..4ef472ba 100644 --- a/app/src/main/java/ir/cafebazaar/bazaarpaysample/MainActivity.kt +++ b/app/src/main/java/ir/cafebazaar/bazaarpaysample/MainActivity.kt @@ -4,7 +4,6 @@ import android.content.Intent import androidx.appcompat.app.AppCompatActivity import android.os.Bundle import android.os.PersistableBundle -import android.widget.Toast import androidx.activity.result.ActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.core.content.ContextCompat From 114b609cf56b8d5c32936b762efc006d00acaff8 Mon Sep 17 00:00:00 2001 From: Hamidreza Date: Mon, 13 Mar 2023 15:24:17 +0330 Subject: [PATCH 4/7] Remove initiate percent from payment progress --- .../screens/payment/thanks/PaymentThankYouPageViewModel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/payment/thanks/PaymentThankYouPageViewModel.kt b/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/payment/thanks/PaymentThankYouPageViewModel.kt index 93ed4ba4..de2caf83 100644 --- a/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/payment/thanks/PaymentThankYouPageViewModel.kt +++ b/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/payment/thanks/PaymentThankYouPageViewModel.kt @@ -38,7 +38,7 @@ internal class PaymentThankYouPageViewModel : ViewModel() { SECOND_IN_MILLIS ) { override fun onTick(millisUntilFinished: Long) { - val progressPercent = 100 - ((millisUntilFinished * 100) / (COUNT_DOWN_TIMER_SEC * SECOND_IN_MILLIS)) + val progressPercent = 99 - ((millisUntilFinished * 100) / (COUNT_DOWN_TIMER_SEC * SECOND_IN_MILLIS)) _viewStateLiveData.value = Resource.loaded( data = PaymentThankYouPageSuccessModel( From 5c3cae8f1943d3142f617390ddb5746b900a5d68 Mon Sep 17 00:00:00 2001 From: Hamidreza Date: Sat, 18 Mar 2023 13:22:46 +0330 Subject: [PATCH 5/7] Fix button moving in national number direct debit --- .../nationalid/DirectDebitNationalIdFragment.kt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/payment/directdebitactivating/nationalid/DirectDebitNationalIdFragment.kt b/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/payment/directdebitactivating/nationalid/DirectDebitNationalIdFragment.kt index 70836e74..3d1499c9 100644 --- a/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/payment/directdebitactivating/nationalid/DirectDebitNationalIdFragment.kt +++ b/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/payment/directdebitactivating/nationalid/DirectDebitNationalIdFragment.kt @@ -5,6 +5,7 @@ import android.text.TextWatcher import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import android.view.WindowManager import androidx.core.widget.doAfterTextChanged import androidx.fragment.app.Fragment import androidx.fragment.app.viewModels @@ -31,6 +32,7 @@ internal class DirectDebitNationalIdFragment : Fragment() { container: ViewGroup?, savedInstanceState: Bundle? ): View { + requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN) _binding = FragmentNationalIdBinding.inflate(inflater, container, false) return binding.root } @@ -83,6 +85,7 @@ internal class DirectDebitNationalIdFragment : Fragment() { override fun onDestroyView() { textWatcher?.let { binding.nationalIdEditText.removeTextChangedListener(it) } textWatcher = null + requireActivity().window.setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE) super.onDestroyView() _binding = null } From 1d7f4b1206938ae06cb12ed038f7884dad8577dd Mon Sep 17 00:00:00 2001 From: Hamidreza Date: Sat, 18 Mar 2023 14:12:30 +0330 Subject: [PATCH 6/7] Change line color in character in otp edittext --- .../bazaarpay/screens/login/verify/OtpEditText.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/login/verify/OtpEditText.kt b/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/login/verify/OtpEditText.kt index 77f90780..6f82b6d7 100644 --- a/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/login/verify/OtpEditText.kt +++ b/BazaarPay/src/main/java/ir/cafebazaar/bazaarpay/screens/login/verify/OtpEditText.kt @@ -2,6 +2,7 @@ package ir.cafebazaar.bazaarpay.screens.login.verify import android.content.Context import android.graphics.Canvas +import android.graphics.Color import android.graphics.Paint import ir.cafebazaar.bazaarpay.R import android.util.AttributeSet @@ -75,6 +76,11 @@ class OtpEditText : AppCompatEditText { paint.color = textColors.defaultColor var i = 0 while (i < mNumChars) { + if (i == textLength) { + mLinesPaint!!.color = resources.getColor(R.color.bazaarpay_app_brand_primary) + } else { + mLinesPaint!!.color = resources.getColor(R.color.bazaarpay_grey_60) + } canvas.drawLine( startX.toFloat(), bottom.toFloat(), From 7a63c31134b59238cf26fad7e83ed039ebc72b75 Mon Sep 17 00:00:00 2001 From: Hamidreza Date: Tue, 4 Apr 2023 18:32:58 +0330 Subject: [PATCH 7/7] Add land scape ui for fragment_national_id.xml --- .../res/layout-land/fragment_national_id.xml | 164 ++++++++++++++++++ 1 file changed, 164 insertions(+) create mode 100644 BazaarPay/src/main/res/layout-land/fragment_national_id.xml diff --git a/BazaarPay/src/main/res/layout-land/fragment_national_id.xml b/BazaarPay/src/main/res/layout-land/fragment_national_id.xml new file mode 100644 index 00000000..4724fb62 --- /dev/null +++ b/BazaarPay/src/main/res/layout-land/fragment_national_id.xml @@ -0,0 +1,164 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +