diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt index 0fd07d4..778fdf9 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawInfoConfirmDialog.kt @@ -38,6 +38,7 @@ class WithdrawInfoConfirmDialog(context: Context) : BindingDialog(c } tvActionApply -> { + WithdrawWatchAdDialog(context).show() dismiss() } } diff --git a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt index 4b9f7b6..1c65d14 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdraw/WithdrawWatchAdDialog.kt @@ -2,11 +2,9 @@ package com.gamedog.vididin.features.withdraw import android.content.Context -import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.setOnClickBatch 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.DialogWithdrawWatchAdBinding as ViewBinding import com.gamedog.vididin.router.Router @@ -27,18 +25,16 @@ class WithdrawWatchAdDialog(context: Context) : BindingDialog(conte setCanCancel(false) mBinding.run { - setOnClickBatch(tvActionAlter, tvActionApply, ivClose) { + progressBar.setBarColor(R.color.blue_ba, R.color.blue_ff) + + setOnClickBatch(flAction, ivClose) { when (this) { ivClose -> { dismiss() } - tvActionAlter -> { - dismiss() - } - - tvActionApply -> { - dismiss() + flAction -> { + gotoWatchVideo() } } } @@ -51,18 +47,7 @@ class WithdrawWatchAdDialog(context: Context) : BindingDialog(conte } - fun setWithDrawCashNum(withdrawNum: Float): WithdrawWatchAdDialog { - mWithdrawCashNum = withdrawNum - mBinding.tvCashNum.text = buildString { - append(ResUtil.getString(R.string.cash)) - append(" ") - append(mWithdrawCashNum) - } - mBinding.tvCpfAccount.text = AccountManager.getBankInfo()?.bankAccount - - return this - } } diff --git a/app/src/main/res/layout/dialog_withdraw_watch_ad.xml b/app/src/main/res/layout/dialog_withdraw_watch_ad.xml index cf38a32..938ff68 100644 --- a/app/src/main/res/layout/dialog_withdraw_watch_ad.xml +++ b/app/src/main/res/layout/dialog_withdraw_watch_ad.xml @@ -1,6 +1,6 @@ @@ -28,230 +28,122 @@ - + + + + + - - + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - + android:layout_marginTop="5dp" + android:background="@mipmap/bg_but_green" > + + - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 455f322..9d470e3 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -89,5 +89,8 @@ #ff938a84 #FF32BCAD #FF456CF9 + #FF02832C + #FF003DBA + #FF0054FF \ 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 5cbeaca..10691fa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -82,6 +82,9 @@ Valor do saque: Alterar Solicitar + Progresso atingiu 100%! Pague agora + Clique em \"Saque Já\" para acelerar + Saque Já \ No newline at end of file