diff --git a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/WithdrawRecordActivity.kt b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/WithdrawRecordActivity.kt index 7fa4311..c224f38 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/WithdrawRecordActivity.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/WithdrawRecordActivity.kt @@ -4,9 +4,6 @@ import android.app.Activity import android.content.Intent import android.view.LayoutInflater import androidx.activity.viewModels -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat -import androidx.core.view.updatePadding import com.ama.core.architecture.appBase.AppViewsActivity import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.setOnClickBatch diff --git a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/fragments/CashRecordFragment.kt b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/fragments/CashRecordFragment.kt index 254a071..4e70dca 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/fragments/CashRecordFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/fragments/CashRecordFragment.kt @@ -9,11 +9,12 @@ import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.LinearLayoutManager import com.ama.core.architecture.appBase.AppViewsFragment import com.ama.core.architecture.appBase.OnFragmentBackgroundListener +import com.ama.core.architecture.util.ResUtil import com.ama.core.architecture.util.setStatusBarDarkFont -import com.vididin.real.money.game.R -import com.gamedog.vididin.beans.RecordCash import com.gamedog.vididin.features.withdrawrecord.RecordCashRvAdapter import com.gamedog.vididin.manager.RecordsManager +import com.gamedog.vididin.manager.WithdrawManager +import com.vididin.real.money.game.R import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch import kotlin.getValue @@ -47,6 +48,12 @@ class CashRecordFragment : AppViewsFragment(), override fun ViewBinding.initViews() { setupRecyclerView() + + tvCashNum.text = buildString { + append(ResUtil.getString(R.string.cash)) + append(" ") + append(WithdrawManager.instance().getHasWithdrawSuccessCashCount()) + } } override fun ViewBinding.initListeners() { diff --git a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/fragments/GoldRecordFragment.kt b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/fragments/GoldRecordFragment.kt index c364ddd..66f7a24 100644 --- a/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/fragments/GoldRecordFragment.kt +++ b/app/src/main/java/com/gamedog/vididin/features/withdrawrecord/fragments/GoldRecordFragment.kt @@ -10,8 +10,7 @@ import androidx.recyclerview.widget.LinearLayoutManager import com.ama.core.architecture.appBase.AppViewsFragment import com.ama.core.architecture.appBase.OnFragmentBackgroundListener import com.ama.core.architecture.util.setStatusBarDarkFont -import com.vididin.real.money.game.R -import com.gamedog.vididin.beans.RecordGold +import com.gamedog.vididin.core.login.login.AccountManager import com.gamedog.vididin.features.withdrawrecord.RecordGoldRvAdapter import com.gamedog.vididin.manager.RecordsManager import dagger.hilt.android.AndroidEntryPoint @@ -47,6 +46,7 @@ class GoldRecordFragment : AppViewsFragment(), override fun ViewBinding.initViews() { setupRecyclerView() + tvGoldNum.text = AccountManager.getGold().toString() } override fun ViewBinding.initListeners() { diff --git a/app/src/main/res/layout/fragment_withdraw_record_cash.xml b/app/src/main/res/layout/fragment_withdraw_record_cash.xml index 38222d2..2cd52bd 100644 --- a/app/src/main/res/layout/fragment_withdraw_record_cash.xml +++ b/app/src/main/res/layout/fragment_withdraw_record_cash.xml @@ -4,39 +4,46 @@ android:layout_height="match_parent" android:orientation="vertical" > - - + android:gravity="center_vertical" + android:layout_marginTop="10dp" + android:orientation="horizontal"> + - + + + + + - - diff --git a/app/src/main/res/layout/fragment_withdraw_record_gold.xml b/app/src/main/res/layout/fragment_withdraw_record_gold.xml index 830757d..33fdf74 100644 --- a/app/src/main/res/layout/fragment_withdraw_record_gold.xml +++ b/app/src/main/res/layout/fragment_withdraw_record_gold.xml @@ -4,39 +4,46 @@ android:layout_height="match_parent" android:orientation="vertical" > - - + android:gravity="center_vertical" + android:layout_marginTop="10dp" + android:orientation="horizontal"> + - + - - + + + diff --git a/app/src/main/res/mipmap-xxhdpi/record_title_bg_cash.webp b/app/src/main/res/mipmap-xxhdpi/record_title_bg_cash.webp new file mode 100644 index 0000000..1048f32 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/record_title_bg_cash.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/record_title_bg_gold.webp b/app/src/main/res/mipmap-xxhdpi/record_title_bg_gold.webp new file mode 100644 index 0000000..5572394 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/record_title_bg_gold.webp differ