diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt index 8a05716..891fc10 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithDrawActivity.kt @@ -8,7 +8,6 @@ import com.ama.core.architecture.appBase.AppViewsActivity import com.ama.core.architecture.util.setOnClickBatch import com.gamedog.vididin.R import com.gamedog.vididin.VididinEvents -import com.gamedog.vididin.beans.Account import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.features.withdraw.widget.WithDrawItemView import com.gamedog.vididin.main.interfaces.OnTabStyleListener @@ -73,7 +72,7 @@ class WithDrawActivity : AppViewsActivity(), On updateUIItemSelectStates(itemIndex) }) - withdrawPix2.setIconAndText(R.mipmap.pix2, R.string.pix2, { + withdrawPix2.setIconAndText(R.mipmap.pix2_big, R.string.pix2, { }) diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt index 34c07cc..dfc1283 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankDialog.kt @@ -11,7 +11,6 @@ import com.ama.core.architecture.widget.BindingDialog import com.gamedog.vididin.R import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.databinding.DialogWithdrawBindingBankBinding as ViewBinding -import com.gamedog.vididin.router.Router class WithdrawBindBankDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { @@ -36,6 +35,8 @@ class WithdrawBindBankDialog(context: Context) : BindingDialog(cont tvConfirm -> { saveBankAccount(mBinding.tvCpfEdit.text.toString().trim()) + WithdrawInfoConfirmDialog(context).show() + dismiss() } } } @@ -90,9 +91,7 @@ class WithdrawBindBankDialog(context: Context) : BindingDialog(cont } } - private fun gotoWatchVideo() { - ownerActivity?.let { Router.Withdraw.startActivity(it) } - } + override fun onDetachedFromWindow() { super.onDetachedFromWindow() diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankFinishDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt similarity index 56% rename from app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankFinishDialog.kt rename to app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt index cf1944f..f472678 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawBindBankFinishDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt @@ -4,11 +4,11 @@ package com.gamedog.vididin.features.withdraw import android.content.Context import com.ama.core.architecture.util.setOnClickBatch import com.ama.core.architecture.widget.BindingDialog -import com.gamedog.vididin.databinding.DialogWithdrawBindingBankFinishBinding as ViewBinding +import com.gamedog.vididin.databinding.DialogWithdrawInfoConfirmBinding as ViewBinding import com.gamedog.vididin.router.Router -class WithdrawBindBankFinishDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { +class WithdrawInfoConfirmDialog(context: Context) : BindingDialog(context, ViewBinding::inflate) { init { build() @@ -22,9 +22,17 @@ class WithdrawBindBankFinishDialog(context: Context) : BindingDialog { + ivClose -> { + dismiss() + } + + tvActionAlter -> { + dismiss() + } + + tvActionApply -> { dismiss() } } diff --git a/app/src/main/res/drawable/bg_withdraw_confirm_but_left.xml b/app/src/main/res/drawable/bg_withdraw_confirm_but_left.xml new file mode 100644 index 0000000..ca354c5 --- /dev/null +++ b/app/src/main/res/drawable/bg_withdraw_confirm_but_left.xml @@ -0,0 +1,6 @@ + + + + + diff --git a/app/src/main/res/layout/dialog_withdraw_binding_bank_finish.xml b/app/src/main/res/layout/dialog_withdraw_binding_bank_finish.xml deleted file mode 100644 index e61f5cf..0000000 --- a/app/src/main/res/layout/dialog_withdraw_binding_bank_finish.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_withdraw_info_confirm.xml b/app/src/main/res/layout/dialog_withdraw_info_confirm.xml new file mode 100644 index 0000000..cf38a32 --- /dev/null +++ b/app/src/main/res/layout/dialog_withdraw_info_confirm.xml @@ -0,0 +1,257 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-xxhdpi/bg_withdraw_info_confirm_dialog.webp b/app/src/main/res/mipmap-xxhdpi/bg_withdraw_info_confirm_dialog.webp new file mode 100644 index 0000000..f1a6369 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/bg_withdraw_info_confirm_dialog.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/icon_but_bg_green.webp b/app/src/main/res/mipmap-xxhdpi/icon_but_bg_green.webp new file mode 100644 index 0000000..60caeb2 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/icon_but_bg_green.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/pix2.webp b/app/src/main/res/mipmap-xxhdpi/pix2_big.webp similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/pix2.webp rename to app/src/main/res/mipmap-xxhdpi/pix2_big.webp diff --git a/app/src/main/res/mipmap-xxhdpi/pix_small.webp b/app/src/main/res/mipmap-xxhdpi/pix_small.webp new file mode 100644 index 0000000..493b16d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/pix_small.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/withdraw_info_confirm_title.webp b/app/src/main/res/mipmap-xxhdpi/withdraw_info_confirm_title.webp new file mode 100644 index 0000000..7dcb40f Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/withdraw_info_confirm_title.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0df0daa..455f322 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -87,5 +87,7 @@ #FF2F2828 #FF00591A #ff938a84 + #FF32BCAD + #FF456CF9 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aeb42f7..5cbeaca 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,7 +74,14 @@ *Atenção: Para garantir que seu saque seja processado sem problemas, preencha os dados corretamente. #CPF Continuar - + Forma de saque: + pix + Tipo de conta PIX: + CPF + Conta CPF: + Valor do saque: + Alterar + Solicitar \ No newline at end of file