moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:初步完成钱包UI改版（缺少入口icon替换等和兑换跳转联调）

Browse Source
This commit is contained in:
max
2024-06-05 20:06:01 +08:00
parent 5ba98cdb9e
commit e72423708e
43 changed files with 897 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/src/main/AndroidManifest.xml
View File

@@ -320,6 +320,9 @@
android:name=".ui.pay.ChargeActivity"
android:label="@string/main_androidmanifest_018"
android:screenOrientation="portrait" />
<activity
android:name=".ui.wallet.WalletActivity"
android:screenOrientation="portrait" />
<activity
android:name=".home.activity.CollectionRoomActivity"
android:label="@string/main_androidmanifest_019"

14
app/src/main/java/com/chwl/app/home/MeViewModel.kt
View File

@@ -81,13 +81,13 @@ class MeViewModel : BaseViewModel() {
skipType = RouterType.DECORATION_STORE
)
)
add(
MeCenterInfo(
icon = R.drawable.me_ic_menu_revenue,
centerName = ResUtil.getString(R.string.me_gain_recording),
skipType = RouterType.MY_REVENUE
)
)
// add(
// MeCenterInfo(
// icon = R.drawable.me_ic_menu_revenue,
// centerName = ResUtil.getString(R.string.me_gain_recording),
// skipType = RouterType.MY_REVENUE
// )
// )
if (donationMenuVisible) {
add(donationMenu)
}

8
app/src/main/java/com/chwl/app/home/fragment/MeFragment.kt
View File

@@ -33,6 +33,7 @@ import com.chwl.app.ui.pay.ChargeActivity
import com.chwl.app.ui.relation.AttentionListActivity
import com.chwl.app.ui.relation.FansListActivity
import com.chwl.app.ui.utils.ImageLoadUtils
import com.chwl.app.ui.wallet.WalletActivity
import com.chwl.app.ui.webview.CommonWebViewActivity
import com.chwl.app.view.GenderAgeTextView
import com.chwl.app.vip.VipMainActivity
@@ -372,7 +373,7 @@ class MeFragment : BaseFragment(), View.OnClickListener {
map[IReportConstants.MODULE] = IReportConstants.MOLISTAR_PAY
ReportManager.get().reportEvent(IReportConstants.PAYPAGE_SHOW, map)
jumpChargePage()
WalletActivity.start(requireContext())
}
R.id.iv_vip -> {
@@ -392,11 +393,6 @@ class MeFragment : BaseFragment(), View.OnClickListener {
}
}
@SuppressLint("CheckResult")
private fun jumpChargePage() {
ChargeActivity.start(mContext)
}
private fun loadVipInfo(data: VipInfo?) {
}

5
app/src/main/java/com/chwl/app/ui/pay/ChargeActivity.java
View File

@@ -52,6 +52,7 @@ import com.chwl.core.utils.net.IgnoreException;
import com.chwl.library.base.factory.CreatePresenter;
import com.chwl.library.utils.FormatUtils;
import com.chwl.library.utils.SingleToastUtil;
import com.netease.nim.uikit.common.util.C;
import org.greenrobot.eventbus.EventBus;
@@ -377,9 +378,9 @@ public class ChargeActivity extends BaseMvpActivity<IChargeView, ChargePresenter
public void initTitleBar() {
mTitleBar = findViewById(R.id.title_bar);
if (mTitleBar != null) {
mTitleBar.setTitle(getString(R.string.charge_my));
mTitleBar.setTitle(getString(R.string.label_my_radish));
mTitleBar.setImmersive(false);
mTitleBar.setTitleColor(getResources().getColor(R.color.color_1E1E1F));
mTitleBar.setTitleColor(getResources().getColor(R.color.color_000000));
mTitleBar.setLeftImageResource(R.drawable.arrow_left);
mTitleBar.setBackgroundResource(R.color.transparent);
mTitleBar.setLeftClickListener(v -> finish());

6
app/src/main/java/com/chwl/app/ui/pay/ChargeAdapter.java
View File

@@ -1,5 +1,7 @@
package com.chwl.app.ui.pay;
import android.view.View;
import com.chad.library.adapter.base.BaseQuickAdapter;
import com.chad.library.adapter.base.BaseViewHolder;
import com.chwl.app.R;
@@ -19,8 +21,8 @@ public class ChargeAdapter extends BaseQuickAdapter<ChargeBean, BaseViewHolder>
@Override
protected void convert(@NotNull BaseViewHolder baseViewHolder, ChargeBean chargeBean) {
if (chargeBean == null) return;
baseViewHolder.getView(R.id.ll_bg).setSelected(chargeBean.isSelected);
baseViewHolder.setText(R.id.tv_title, chargeBean.getProdName());
baseViewHolder.getView(R.id.iv_selected).setVisibility(chargeBean.isSelected ? View.VISIBLE : View.GONE);
baseViewHolder.setText(R.id.tv_currency_value, chargeBean.getProdName());
if (chargeBean.getProductDetails() != null && chargeBean.getProductDetails().getOneTimePurchaseOfferDetails() != null) {
baseViewHolder.setText(R.id.item_charge_money, chargeBean.getProductDetails().getOneTimePurchaseOfferDetails().getFormattedPrice());
} else {

111
app/src/main/java/com/chwl/app/ui/wallet/WalletActivity.kt Normal file
View File

@@ -0,0 +1,111 @@
package com.chwl.app.ui.wallet
import android.content.Context
import android.content.Intent
import android.widget.LinearLayout
import android.widget.TextView
import androidx.activity.viewModels
import androidx.fragment.app.Fragment
import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
import com.chwl.app.R
import com.chwl.app.avroom.adapter.CommonVPAdapter
import com.chwl.app.base.BaseViewBindingActivity
import com.chwl.app.databinding.WalletActivityBinding
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.CommonNavigator
import com.chwl.library.utils.ResUtil
import com.netease.nim.uikit.StatusBarUtil
import org.greenrobot.eventbus.EventBus
class WalletActivity : BaseViewBindingActivity<WalletActivityBinding>() {
private val viewModel: WalletViewModel by viewModels()
companion object {
fun start(context: Context) {
context.startActivity(Intent(context, WalletActivity::class.java))
}
}
override fun init() {
EventBus.getDefault().register(this)
initWhiteTitleBar(ResUtil.getString(R.string.wallet))
initViewPager()
initObserve()
dialogManager.showProgressDialog(this)
viewModel.getWalletInfo()
}
private fun initObserve() {
viewModel.walletInfoLiveData.observe(this) {
dialogManager.dismissDialog()
if (!it.isSuccess && it.message != null) {
toast(it.message)
}
}
}
private fun initViewPager() {
val fragmentList: MutableList<Fragment> = ArrayList(2)
fragmentList.add(WalletCoinsFragment())
fragmentList.add(WalletDiamondFragment())
val tagList: MutableList<String> = ArrayList(2)
tagList.add(getString(R.string.diamond))
tagList.add(getString(R.string.gold))
val commonNavigator = CommonNavigator(context)
commonNavigator.setTitleWrapContent(true)
val magicIndicatorAdapter = WalletIndicatorAdapter(context, tagList)
magicIndicatorAdapter.setOnItemSelectListener { position: Int, view: TextView? ->
binding.viewPager.currentItem = position
}
commonNavigator.adapter = magicIndicatorAdapter
binding.magicIndicator.navigator = commonNavigator
commonNavigator.titleContainer.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE
binding.viewPager.offscreenPageLimit = 2
binding.viewPager.adapter = CommonVPAdapter(
supportFragmentManager,
lifecycle,
fragmentList
)
binding.viewPager.registerOnPageChangeCallback(object : OnPageChangeCallback() {
override fun onPageScrolled(
position: Int,
positionOffset: Float,
positionOffsetPixels: Int
) {
binding.magicIndicator.onPageScrolled(
position,
positionOffset,
positionOffsetPixels
)
}
override fun onPageSelected(position: Int) {
binding.magicIndicator.onPageSelected(position)
if (position == 0) {
binding.ivTop.setImageResource(R.drawable.wallet_bg_coins_top)
} else {
binding.ivTop.setImageResource(R.drawable.wallet_bg_diamond_top)
}
}
override fun onPageScrollStateChanged(state: Int) {
binding.magicIndicator.onPageScrollStateChanged(state)
}
})
}
override fun needSteepStateBar(): Boolean {
return true
}
override fun setStatusBar() {
super.setStatusBar()
StatusBarUtil.transparencyBar(this)
StatusBarUtil.StatusBarLightMode(this)
}
override fun onDestroy() {
super.onDestroy()
EventBus.getDefault().unregister(this)
}
}

35
app/src/main/java/com/chwl/app/ui/wallet/WalletCoinsFragment.kt Normal file
View File

@@ -0,0 +1,35 @@
package com.chwl.app.ui.wallet
import androidx.fragment.app.activityViewModels
import com.chwl.app.R
import com.chwl.app.base.BaseBindingFragment
import com.chwl.app.databinding.WalletCoinsFragmentBinding
import com.chwl.app.ui.pay.ChargeActivity
import com.chwl.app.ui.webview.CommonWebViewActivity
import com.chwl.core.UriProvider
import com.chwl.library.annatation.ActLayoutRes
import com.chwl.library.utils.FormatUtils
import com.example.lib_utils.ktx.singleClick
@ActLayoutRes(R.layout.wallet_coins_fragment)
class WalletCoinsFragment : BaseBindingFragment<WalletCoinsFragmentBinding>() {
val viewModel: WalletViewModel by activityViewModels()
override fun initiate() {
mBinding.layoutDetails.singleClick {
CommonWebViewActivity.start(context, UriProvider.getDiamondDetail())
}
mBinding.tvNext.singleClick {
ChargeActivity.start(requireContext())
}
viewModel.walletInfoLiveData.observe(this) {
if (it.isSuccess) {
updateValue(it.data?.diamondNum ?: 0.0)
}
}
}
private fun updateValue(number: Double) {
mBinding.tvCurrencyValue.text = FormatUtils.formatBigInteger(number)
}
}

62
app/src/main/java/com/chwl/app/ui/wallet/WalletDiamondFragment.kt Normal file
View File

@@ -0,0 +1,62 @@
package com.chwl.app.ui.wallet
import androidx.fragment.app.activityViewModels
import com.chwl.app.R
import com.chwl.app.base.BaseBindingFragment
import com.chwl.app.databinding.WalletDiamondFragmentBinding
import com.chwl.app.earn.activity.ConvertDiamondActivity
import com.chwl.app.ui.webview.CommonWebViewActivity
import com.chwl.core.UriProvider
import com.chwl.library.annatation.ActLayoutRes
import com.chwl.library.utils.FormatUtils
import com.example.lib_utils.ktx.singleClick
@ActLayoutRes(R.layout.wallet_diamond_fragment)
class WalletDiamondFragment : BaseBindingFragment<WalletDiamondFragmentBinding>() {
val viewModel: WalletViewModel by activityViewModels()
private var wantToConvert = false
override fun initiate() {
mBinding.layoutDetails.singleClick {
CommonWebViewActivity.start(context, UriProvider.getGoldDetail())
}
mBinding.tvNext.singleClick {
jumpConvert()
}
viewModel.walletInfoLiveData.observe(this) {
if (it.isSuccess) {
updateValue(it.data?.goldNum ?: 0.0)
}
}
viewModel.convertInfoLiveData.observe(this) {
if (it.isSuccess) {
if (wantToConvert) {
it?.data?.let {
ConvertDiamondActivity.start(requireContext(), it)
}
}
} else if (it.message != null) {
toast(it.message)
}
wantToConvert = false
}
}
private fun jumpConvert() {
val result = viewModel.convertInfoLiveData.value
val data = result?.data
if (result != null && result.isSuccess && data != null) {
ConvertDiamondActivity.start(requireContext(), data)
} else {
wantToConvert = true
viewModel.getConvertInfo()
}
}
private fun updateValue(number: Double) {
mBinding.tvCurrencyValue.text = FormatUtils.formatBigInteger(number)
}
}

105
app/src/main/java/com/chwl/app/ui/wallet/WalletIndicatorAdapter.java Normal file
View File

@@ -0,0 +1,105 @@
package com.chwl.app.ui.wallet;
import android.content.Context;
import android.view.Gravity;
import android.view.ViewGroup;
import android.widget.FrameLayout;
import android.widget.TextView;
import androidx.core.content.ContextCompat;
import com.chwl.app.R;
import com.chwl.app.ui.widget.XRecyclerView.ScaleTransitionPagerTitleView;
import com.chwl.app.ui.widget.magicindicator.buildins.UIUtil;
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.CommonNavigatorAdapter;
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerIndicator;
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.abs.IPagerTitleView;
import com.chwl.app.ui.widget.magicindicator.buildins.commonnavigator.indicators.LinePagerIndicator;
import java.util.List;
public class WalletIndicatorAdapter extends CommonNavigatorAdapter {
private final Context mContext;
private final List<? extends CharSequence> mTitleList;
private int textSize = 16;
private float minScale = 1f;
private boolean showIndicator = true;
private OnItemSelectListener mOnItemSelectListener;
public WalletIndicatorAdapter(Context context, List<? extends CharSequence> charSequences) {
this.mContext = context;
this.mTitleList = charSequences;
}
@Override
public int getCount() {
return mTitleList == null ? 0 : mTitleList.size();
}
@Override
public IPagerTitleView getTitleView(Context context, final int i) {
ScaleTransitionPagerTitleView scaleTransitionPagerTitleView = new ScaleTransitionPagerTitleView(context, true);
scaleTransitionPagerTitleView.setNormalColor(ContextCompat.getColor(context, R.color.color_7E8373));
scaleTransitionPagerTitleView.setSelectedColor(ContextCompat.getColor(context, R.color.color_4E390A));
scaleTransitionPagerTitleView.setMinScale(minScale);
scaleTransitionPagerTitleView.setTextSize(textSize);
int padding = UIUtil.dip2px(context, 37);
scaleTransitionPagerTitleView.setPadding(padding, 0, padding, 0);
scaleTransitionPagerTitleView.setText(mTitleList.get(i));
scaleTransitionPagerTitleView.setOnClickListener(view -> {
if (mOnItemSelectListener != null) {
mOnItemSelectListener.onItemSelect(i, scaleTransitionPagerTitleView);
}
});
return scaleTransitionPagerTitleView;
}
@Override
public IPagerIndicator getIndicator(Context context) {
LinePagerIndicator indicator = new LinePagerIndicator(context);
indicator.setMode(LinePagerIndicator.MODE_EXACTLY);
indicator.setLineHeight(UIUtil.dip2px(mContext, 1.5));
indicator.setRoundRadius(UIUtil.dip2px(mContext, 1));
indicator.setLineWidth(UIUtil.dip2px(mContext, 11));
indicator.setColors(context.getResources().getColor(R.color.color_AA7400));
FrameLayout.LayoutParams lp = new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT);
// lp.bottomMargin = mBottomMargin;
lp.gravity = Gravity.BOTTOM;
indicator.setLayoutParams(lp);
return indicator;
}
public int getTextSize() {
return textSize;
}
public void setTextSize(int textSize) {
this.textSize = textSize;
}
public float getMinScale() {
return minScale;
}
public void setMinScale(float minScale) {
this.minScale = minScale;
}
public boolean isShowIndicator() {
return showIndicator;
}
public void setShowIndicator(boolean showIndicator) {
this.showIndicator = showIndicator;
}
public void setOnItemSelectListener(OnItemSelectListener onItemSelectListener) {
mOnItemSelectListener = onItemSelectListener;
}
public interface OnItemSelectListener {
void onItemSelect(int position, TextView view);
}
}

45
app/src/main/java/com/chwl/app/ui/wallet/WalletViewModel.kt Normal file
View File

@@ -0,0 +1,45 @@
package com.chwl.app.ui.wallet
import androidx.lifecycle.MutableLiveData
import com.chwl.app.base.BaseViewModel
import com.chwl.core.bean.response.BeanResult
import com.chwl.core.earn.bean.GoldToDiamondInfo
import com.chwl.core.earn.model.EarnModel
import com.chwl.core.pay.PayModel
import com.chwl.core.pay.bean.WalletInfo
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.functions.Consumer
import io.reactivex.schedulers.Schedulers
class WalletViewModel : BaseViewModel() {
val walletInfoLiveData = MutableLiveData<BeanResult<WalletInfo>>()
val convertInfoLiveData = MutableLiveData<BeanResult<GoldToDiamondInfo>>()
fun getWalletInfo() {
addDisposable(
PayModel.get().walletInfo
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(Consumer<WalletInfo> { walletInfo: WalletInfo? ->
walletInfoLiveData.postValue(BeanResult.success(walletInfo))
}) {
walletInfoLiveData.postValue(BeanResult.failed(it))
}
)
}
fun getConvertInfo() {
safeLaunch(
true,
onError = {
convertInfoLiveData.value = BeanResult.failed(it)
},
block = {
val data = EarnModel.getGoldToDiamond()
convertInfoLiveData.value = BeanResult.success(data)
}
)
}
}

BIN
app/src/main/res/drawable-xxhdpi/charge_bg_balance.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 75 KiB

After

Width:  |  Height:  |  Size: 29 KiB

BIN
app/src/main/res/drawable-xxhdpi/charge_ic_currency_icon.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 23 KiB

BIN
app/src/main/res/drawable-xxhdpi/convert_bg_coins.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 8.9 KiB

BIN
app/src/main/res/drawable-xxhdpi/convert_bg_diamond.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.5 KiB

BIN
app/src/main/res/drawable-xxhdpi/convert_ic_coins.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.3 KiB

BIN
app/src/main/res/drawable-xxhdpi/convert_ic_diamond.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
app/src/main/res/drawable-xxhdpi/wallet_bg_coins_card.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
app/src/main/res/drawable-xxhdpi/wallet_bg_coins_top.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 127 KiB

BIN
app/src/main/res/drawable-xxhdpi/wallet_bg_diamond_card.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/drawable-xxhdpi/wallet_bg_diamond_top.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 137 KiB

BIN
app/src/main/res/drawable-xxhdpi/wallet_ic_coins.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 11 KiB

BIN
app/src/main/res/drawable-xxhdpi/wallet_ic_coins_details_arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 769 B

BIN
app/src/main/res/drawable-xxhdpi/wallet_ic_diamond.webp Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 9.1 KiB

BIN
app/src/main/res/drawable-xxhdpi/wallet_ic_diamond_details_arrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 772 B

5
app/src/main/res/drawable/bg_google_charge_bg_selector.xml
View File

@@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/base_shape_f7f7f7_b_1e1e1f_w1dp_8dp" android:state_selected="true" />
<item android:drawable="@drawable/base_shape_f7f7f7_8dp" android:state_selected="false" />
</selector>

13
app/src/main/res/drawable/bg_gradient_dce6fd_d8e3fe_r8.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="180"
android:endColor="#DCE6FD"
android:startColor="#D8E3FE"
android:type="linear"
android:useLevel="true" />
<corners android:radius="@dimen/dp_8" />
</shape>

13
app/src/main/res/drawable/bg_gradient_feecd2_ffde90_r8.xml
View File

@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:angle="180"
android:endColor="#FEECD2"
android:startColor="#FFDE90"
android:type="linear"
android:useLevel="true" />
<corners android:radius="@dimen/dp_8" />
</shape>

6
app/src/main/res/drawable/charge_bg_item.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#F3F0E6" />
<corners android:radius="@dimen/dp_9" />
</shape>

8
app/src/main/res/drawable/charge_bg_item_selected.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/dp_1"
android:color="#FFB05E" />
<corners android:radius="@dimen/dp_9" />
</shape>

10
app/src/main/res/drawable/charge_bg_money.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#FFF09C" />
<corners
android:bottomLeftRadius="@dimen/dp_9"
android:bottomRightRadius="@dimen/dp_9"
android:topLeftRadius="0px"
android:topRightRadius="0px" />
</shape>

93
app/src/main/res/layout/activity_charge.xml
View File

@@ -9,119 +9,92 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:src="@drawable/bg_theme_top"
android:adjustViewBounds="true"
android:src="@drawable/wallet_bg_coins_top"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.app.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_44"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintTop_toTopOf="parent"
tools:layout_height="50dp" />
<View
android:id="@+id/iv_translate_bg"
android:id="@+id/iv_balance_bg"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/dp_16"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginHorizontal="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_25"
android:background="@drawable/charge_bg_balance"
app:layout_constraintDimensionRatio="343:92"
app:layout_constraintDimensionRatio="339:115"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar" />
<ImageView
android:id="@+id/iv_diamond"
android:layout_width="@dimen/dp_24"
android:layout_height="@dimen/dp_24"
android:layout_marginEnd="@dimen/dp_4"
android:src="@drawable/ic_charge_diamond"
app:layout_constraintBottom_toBottomOf="@+id/tv_title_diamond"
app:layout_constraintEnd_toStartOf="@+id/tv_title_diamond"
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/tv_title_diamond" />
<TextView
android:id="@+id/tv_title_diamond"
android:id="@+id/tv_balance_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_33"
android:gravity="center"
android:text="@string/charge_my_diamond"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/text_size_14"
android:textColor="#9F4805"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toTopOf="@id/tv_gold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/iv_diamond"
app:layout_constraintTop_toTopOf="@+id/iv_translate_bg"
app:layout_constraintStart_toStartOf="@id/iv_balance_bg"
app:layout_constraintTop_toTopOf="@+id/iv_balance_bg"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/tv_gold"
android:layout_width="wrap_content"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_5"
android:layout_marginTop="@dimen/dp_6"
android:fontFamily="sans-serif-medium"
android:includeFontPadding="false"
android:maxLines="1"
android:text="0.0"
android:textColor="@color/color_FFFFFF"
android:textSize="@dimen/dp_28"
app:layout_constraintBottom_toBottomOf="@id/iv_translate_bg"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_title_diamond"
android:textColor="#FFFBD5"
android:textSize="@dimen/dp_24"
app:autoSizeMaxTextSize="@dimen/dp_24"
app:autoSizeMinTextSize="@dimen/dp_10"
app:autoSizeStepGranularity="1px"
app:autoSizeTextType="uniform"
app:layout_constraintBottom_toBottomOf="@id/iv_balance_bg"
app:layout_constraintEnd_toEndOf="@id/iv_balance_bg"
app:layout_constraintStart_toStartOf="@id/tv_balance_title"
app:layout_constraintTop_toBottomOf="@+id/tv_balance_title"
tools:text="1960.00" />
<View
android:id="@+id/v_bg"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/base_shape_ffffff_top_16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/iv_translate_bg" />
<TextView
android:id="@+id/tv_buy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_24"
android:layout_marginTop="@dimen/dp_24"
android:text="@string/buy"
android:textColor="@color/color_333333"
android:textSize="@dimen/dp_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/v_bg" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/dp_19"
android:layout_marginTop="@dimen/dp_4"
android:layout_marginHorizontal="@dimen/dp_13"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_4"
android:orientation="vertical"
android:visibility="visible"
tools:listitem="@layout/list_item_charge"
app:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
app:layout_constraintBottom_toTopOf="@id/tv_charge"
app:layout_constraintTop_toBottomOf="@id/tv_buy"
app:spanCount="2" />
app:layout_constraintTop_toBottomOf="@id/iv_balance_bg"
app:spanCount="3" />
<TextView
android:id="@+id/tv_charge"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_48"
android:layout_marginHorizontal="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_28"
android:layout_marginBottom="@dimen/dp_40"
android:background="@drawable/base_shape_theme_26dp"
android:background="@drawable/base_shape_theme_24dp"
android:gravity="center"
android:text="@string/charge_confirm_charge"
android:textColor="@color/color_1E1E1F"
android:textSize="@dimen/sp_16"
android:textColor="@color/white"
android:textSize="@dimen/dp_16"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@id/tv_protocol" />

262
app/src/main/res/layout/activity_convert_diamond.xml
View File

@@ -4,180 +4,148 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/color_F3F5FA"
android:background="#F4F5FA"
tools:context=".earn.activity.ConvertDiamondActivity">
<ImageView
android:id="@+id/iv_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/wallet_bg_diamond_top"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.app.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
android:background="@color/color_white"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/csConvertDetail"
android:layout_width="0dp"
<TextView
android:id="@+id/tvMyGold"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:background="@drawable/bg_ffffff_14"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/title_bar">
android:layout_marginHorizontal="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_30"
android:includeFontPadding="false"
android:text="@string/my_gold"
android:textColor="#00223D"
android:textSize="@dimen/dp_15"
android:textStyle="bold"
app:layout_constraintTop_toBottomOf="@id/title_bar" />
<TextView
android:id="@+id/tvMyGold"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:includeFontPadding="false"
android:text="@string/my_gold"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/csMyGold"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/convert_bg_diamond"
app:layout_constraintDimensionRatio="345:48"
app:layout_constraintTop_toBottomOf="@+id/tvMyGold">
<ImageView
android:id="@+id/iv_diamond"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_9"
android:src="@drawable/convert_ic_diamond"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintHeight_percent="0.58"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/csMyGold"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_14"
android:background="@drawable/bg_gradient_dce6fd_d8e3fe_r8"
app:layout_constraintTop_toBottomOf="@+id/tvMyGold">
<EditText
android:id="@+id/edGold"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@null"
android:digits="1234567890"
android:focusable="true"
android:gravity="center_vertical|end"
android:hint="@string/please_enter"
android:inputType="number"
android:textColor="@color/white"
android:textColorHint="#99FFFFFF"
android:textSize="@dimen/dp_15"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/iv_diamond" />
<View
android:id="@+id/viewGold"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="@dimen/dp_10"
android:background="@drawable/bg_ffffff_r360"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_gold"
app:layout_constraintBottom_toBottomOf="@+id/viewGold"
app:layout_constraintEnd_toEndOf="@+id/viewGold"
app:layout_constraintStart_toStartOf="@+id/viewGold"
app:layout_constraintTop_toTopOf="@+id/viewGold" />
<TextView
android:id="@+id/tvMyDiamond"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_28"
android:includeFontPadding="false"
android:text="@string/my_diamond"
android:textColor="#00223D"
android:textSize="@dimen/dp_15"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/csMyGold" />
<EditText
android:id="@+id/edGold"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_12"
android:background="@null"
android:digits="1234567890"
android:focusable="true"
android:gravity="center_vertical|end"
android:hint="1000"
android:inputType="number"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_ACB8D9"
android:textSize="@dimen/sp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/viewGold" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tvMyDiamond"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_25"
android:includeFontPadding="false"
android:text="@string/my_diamond"
android:textColor="@color/color_1F1A4E"
android:textSize="@dimen/sp_16"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/csMyGold" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/csMyDiamond"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_10"
android:background="@drawable/convert_bg_coins"
app:layout_constraintDimensionRatio="345:48"
app:layout_constraintTop_toBottomOf="@id/tvMyDiamond">
<ImageView
android:src="@drawable/ic_diamond_arrow_down"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_38"
android:id="@+id/iv_coins"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_9"
android:src="@drawable/convert_ic_coins"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintHeight_percent="0.58"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/edDiamond"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="@dimen/dp_8"
android:layout_marginEnd="@dimen/dp_8"
android:background="@null"
android:digits="1234567890"
android:focusable="true"
android:gravity="center_vertical|end"
android:hint="@string/please_enter"
android:inputType="number"
android:maxLength="18"
android:textColor="@color/white"
android:textColorHint="#99FFFFFF"
android:textSize="@dimen/dp_15"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/csMyGold"
app:layout_constraintBottom_toTopOf="@+id/csMyDiamond"/>
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/csMyDiamond"
android:layout_width="match_parent"
android:layout_height="52dp"
android:layout_marginStart="@dimen/dp_14"
android:layout_marginTop="@dimen/dp_12"
android:layout_marginEnd="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_22"
android:background="@drawable/bg_gradient_feecd2_ffde90_r8"
app:layout_constraintTop_toBottomOf="@+id/tvMyDiamond"
app:layout_constraintBottom_toBottomOf="parent">
<View
android:id="@+id/viewDiamond"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="@dimen/dp_10"
android:background="@drawable/bg_ffffff_r360"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_diamond"
app:layout_constraintBottom_toBottomOf="@+id/viewDiamond"
app:layout_constraintEnd_toEndOf="@+id/viewDiamond"
app:layout_constraintStart_toStartOf="@+id/viewDiamond"
app:layout_constraintTop_toTopOf="@+id/viewDiamond" />
<EditText
android:id="@+id/edDiamond"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginEnd="@dimen/dp_12"
android:background="@null"
android:digits="1234567890"
android:focusable="true"
android:gravity="center_vertical|end"
android:hint="1000"
android:inputType="number"
android:textColor="@color/color_1F1A4E"
android:textColorHint="@color/color_CBB788"
android:textSize="@dimen/sp_16"
android:maxLength="18"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/viewDiamond" />
</androidx.constraintlayout.widget.ConstraintLayout>
app:layout_constraintStart_toEndOf="@+id/iv_coins" />
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/tvConvert"
android:text="@string/confirm_exchange"
android:textSize="16sp"
android:textColor="@color/base_selector_color_theme_btn"
android:layout_width="match_parent"
android:layout_height="46dp"
android:gravity="center"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_50"
android:layout_height="@dimen/dp_48"
android:layout_marginHorizontal="@dimen/dp_36"
android:layout_marginTop="@dimen/dp_33"
android:background="@drawable/base_selector_theme_30dp"
android:enabled="false"
app:layout_constraintTop_toBottomOf="@+id/csConvertDetail"/>
android:gravity="center"
android:text="@string/confirm_exchange"
android:textColor="@color/base_selector_color_theme_btn"
android:textSize="@dimen/dp_16"
app:layout_constraintTop_toBottomOf="@id/csMyDiamond" />
</androidx.constraintlayout.widget.ConstraintLayout>

37
app/src/main/res/layout/activity_wallet.xml
View File

@@ -1,37 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<data>
</data>
<merge
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<com.chwl.app.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="@dimen/common_toolbar_height" />
<com.chwl.app.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator2"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginTop="@dimen/common_toolbar_height"
android:background="@color/white" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/vPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="88dp"
android:flipInterval="30"
android:background="@color/color_F5F5F5"
android:persistentDrawingCache="animation" />
</merge>
</layout>

73
app/src/main/res/layout/list_item_charge.xml
View File

@@ -4,41 +4,64 @@
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/ll_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_72"
android:layout_margin="@dimen/dp_8"
android:background="@drawable/bg_google_charge_bg_selector">
android:layout_height="@dimen/dp_121"
android:layout_margin="@dimen/dp_4"
android:background="@drawable/charge_bg_item"
tools:layout_width="@dimen/dp_108">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_5"
android:drawablePadding="@dimen/dp_2"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/color_1E1E1F"
android:textSize="@dimen/dp_16"
app:drawableStartCompat="@drawable/ic_charge_diamond"
app:layout_constraintBottom_toTopOf="@id/item_charge_money"
<ImageView
android:id="@+id/iv_currency_icon"
android:layout_width="@dimen/dp_55"
android:layout_height="@dimen/dp_48"
android:layout_marginTop="@dimen/dp_13"
android:src="@drawable/charge_ic_currency_icon"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/tv_currency_value"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_4"
android:gravity="center"
android:includeFontPadding="false"
android:maxLines="1"
android:textColor="#8A4B00"
android:textSize="@dimen/dp_15"
app:autoSizeMaxTextSize="@dimen/dp_15"
app:autoSizeMinTextSize="@dimen/dp_8"
app:autoSizeStepGranularity="1px"
app:autoSizeTextType="uniform"
app:layout_constraintTop_toBottomOf="@id/iv_currency_icon"
tools:text="400" />
<TextView
android:id="@+id/item_charge_money"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="end"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_26"
android:background="@drawable/charge_bg_money"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="@color/color_84868A"
android:textSize="12sp"
android:maxLines="1"
android:textColor="#513C0B"
android:textSize="@dimen/dp_12"
app:autoSizeMaxTextSize="@dimen/dp_12"
app:autoSizeMinTextSize="@dimen/dp_8"
app:autoSizeStepGranularity="1px"
app:autoSizeTextType="uniform"
app:layout_constraintBottom_toBottomOf="parent"
tools:text="0.99" />
<ImageView
android:id="@+id/iv_selected"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="@drawable/charge_bg_item_selected"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title"
tools:text="0.99" />
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

41
app/src/main/res/layout/wallet_activity.xml Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/iv_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
android:src="@drawable/wallet_bg_coins_top"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.app.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_30"
app:layout_constraintTop_toTopOf="parent" />
<com.chwl.app.ui.widget.magicindicator.MagicIndicator
android:id="@+id/magic_indicator"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_28"
android:layout_marginTop="@dimen/dp_10"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/title_bar" />
<androidx.viewpager2.widget.ViewPager2
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@id/magic_indicator" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

114
app/src/main/res/layout/wallet_coins_fragment.xml Normal file
View File

@@ -0,0 +1,114 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.chwl.app.view.AutoMirroredImageView
android:id="@+id/iv_bg"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_19"
android:src="@drawable/wallet_bg_coins_card"
app:layout_constraintDimensionRatio="339:118"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.904" />
<ImageView
android:id="@+id/iv_currency"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_15"
android:src="@drawable/wallet_ic_coins"
app:layout_constraintBottom_toBottomOf="@id/iv_bg"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="@id/iv_bg"
app:layout_constraintTop_toTopOf="@id/iv_bg"
app:layout_constraintWidth_percent="0.125" />
<TextView
android:id="@+id/tv_currency_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
android:includeFontPadding="false"
android:text="@string/charge_my_diamond"
android:textColor="#9F4805"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toTopOf="@id/tv_currency_value"
app:layout_constraintStart_toEndOf="@id/iv_currency"
app:layout_constraintTop_toTopOf="@id/iv_bg"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/tv_currency_value"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_10"
android:includeFontPadding="false"
android:maxLines="1"
android:text="0"
android:textColor="#FFFBD5"
android:textSize="@dimen/dp_24"
android:textStyle="bold"
app:autoSizeMaxTextSize="@dimen/dp_24"
app:autoSizeMinTextSize="@dimen/dp_10"
app:autoSizeStepGranularity="1px"
app:autoSizeTextType="uniform"
app:layout_constraintBottom_toBottomOf="@id/iv_bg"
app:layout_constraintEnd_toEndOf="@id/iv_bg"
app:layout_constraintStart_toStartOf="@id/tv_currency_name"
app:layout_constraintTop_toBottomOf="@id/tv_currency_name" />
<LinearLayout
android:id="@+id/layout_details"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_19"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingVertical="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="@id/iv_bg"
app:layout_constraintEnd_toEndOf="@id/iv_bg"
app:layout_constraintTop_toTopOf="@id/iv_bg"
app:layout_constraintVertical_bias="0.32">
<TextView
android:id="@+id/tv_details"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_3"
android:text="@string/detail"
android:textColor="#B38C3F"
android:textSize="@dimen/dp_12" />
<ImageView
android:id="@+id/iv_details_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/wallet_ic_coins_details_arrow" />
</LinearLayout>
<TextView
android:id="@+id/tv_next"
android:layout_width="0dp"
android:layout_height="@dimen/dp_48"
android:layout_marginTop="@dimen/dp_46"
android:background="@drawable/base_shape_theme_24dp"
android:gravity="center"
android:text="@string/charge"
android:textColor="@color/white"
android:textSize="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_bg"
app:layout_constraintWidth_percent="0.808" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

113
app/src/main/res/layout/wallet_diamond_fragment.xml Normal file
View File

@@ -0,0 +1,113 @@
<?xml version="1.0" encoding="utf-8"?>
<layout>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.chwl.app.view.AutoMirroredImageView
android:id="@+id/iv_bg"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginHorizontal="@dimen/dp_18"
android:layout_marginTop="@dimen/dp_19"
android:src="@drawable/wallet_bg_diamond_card"
app:layout_constraintDimensionRatio="339:118"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintWidth_percent="0.904" />
<ImageView
android:id="@+id/iv_currency"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginStart="@dimen/dp_15"
android:src="@drawable/wallet_ic_diamond"
app:layout_constraintBottom_toBottomOf="@id/iv_bg"
app:layout_constraintDimensionRatio="1:1"
app:layout_constraintStart_toStartOf="@id/iv_bg"
app:layout_constraintTop_toTopOf="@id/iv_bg"
app:layout_constraintWidth_percent="0.125" />
<TextView
android:id="@+id/tv_currency_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_5"
android:includeFontPadding="false"
android:text="@string/my_gold_text"
android:textColor="@color/white"
android:textSize="@dimen/dp_15"
app:layout_constraintBottom_toTopOf="@id/tv_currency_value"
app:layout_constraintStart_toEndOf="@id/iv_currency"
app:layout_constraintTop_toTopOf="@id/iv_bg"
app:layout_constraintVertical_chainStyle="packed" />
<TextView
android:id="@+id/tv_currency_value"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_6"
android:layout_marginEnd="@dimen/dp_10"
android:includeFontPadding="false"
android:maxLines="1"
android:text="0"
android:textColor="#FFFBD5"
android:textSize="@dimen/dp_24"
android:textStyle="bold"
app:autoSizeMaxTextSize="@dimen/dp_24"
app:autoSizeMinTextSize="@dimen/dp_10"
app:autoSizeStepGranularity="1px"
app:autoSizeTextType="uniform"
app:layout_constraintBottom_toBottomOf="@id/iv_bg"
app:layout_constraintEnd_toEndOf="@id/iv_bg"
app:layout_constraintStart_toStartOf="@id/tv_currency_name"
app:layout_constraintTop_toBottomOf="@id/tv_currency_name" />
<LinearLayout
android:id="@+id/layout_details"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_19"
android:gravity="start|center_vertical"
android:orientation="horizontal"
android:paddingVertical="@dimen/dp_5"
app:layout_constraintBottom_toBottomOf="@id/iv_bg"
app:layout_constraintEnd_toEndOf="@id/iv_bg"
app:layout_constraintTop_toTopOf="@id/iv_bg"
app:layout_constraintVertical_bias="0.32">
<TextView
android:id="@+id/tv_details"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_3"
android:text="@string/detail"
android:textColor="#B38C3F"
android:textSize="@dimen/dp_12" />
<ImageView
android:id="@+id/iv_details_arrow"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/wallet_ic_coins_details_arrow" />
</LinearLayout>
<TextView
android:id="@+id/tv_next"
android:layout_width="0dp"
android:layout_height="@dimen/dp_48"
android:layout_marginTop="@dimen/dp_46"
android:background="@drawable/base_shape_theme_24dp"
android:gravity="center"
android:text="@string/fairy_convert"
android:textColor="@color/white"
android:textSize="@dimen/dp_16"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/iv_bg"
app:layout_constraintWidth_percent="0.808" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>

5
app/src/main/res/values-ar/strings.xml
View File

@@ -4903,6 +4903,7 @@
<string name="convert_diamond">تبادل العملات الذهبية</string>
<string name="gold">الماس</string>
<string name="my_gold">الماس: %s</string>
<string name="my_gold_text">الماس</string>
<string name="my_diamond">كوينزاتي: %s</string>
<string name="confirm_exchange">تأكيد التبادل</string>
<string name="no_withdrawal_account_is_attached">لم يتم تعيين حساب السحب</string>
@@ -5287,4 +5288,8 @@
<string name="room_switch_standard_room_tips">確認切換成普通房嗎？</string>
<string name="room_switch_game_failed_in_game">遊戲進行中，不可中止～</string>
<string name="room_game_number_full">當前遊戲人數已滿!</string>
<string name="wallet">錢包</string>
<string name="please_enter">請輸入..</string>
</resources>

6
app/src/main/res/values-zh-rTW/strings.xml
View File

@@ -4900,6 +4900,7 @@
<string name="convert_diamond">兌換金幣</string>
<string name="gold">鑽石</string>
<string name="my_gold">我的鑽石:%s</string>
<string name="my_gold_text">我的鑽石</string>
<string name="my_diamond">我的金幣:%s</string>
<string name="confirm_exchange">確定兌換</string>
<string name="no_withdrawal_account_is_attached">未綁定提現賬戶</string>
@@ -5229,4 +5230,9 @@
<string name="room_switch_standard_room_tips">確認切換成普通房嗎？</string>
<string name="room_switch_game_failed_in_game">遊戲進行中，不可中止～</string>
<string name="room_game_number_full">當前遊戲人數已滿!</string>
<string name="wallet">錢包</string>
<string name="please_enter">請輸入..</string>
</resources>

3
app/src/main/res/values/colors.xml
View File

@@ -729,4 +729,7 @@
<color name="color_4D415E">#4D415E</color>
<color name="color_DE3446">#DE3446</color>
<color name="color_FF6629">#FF6629</color>
<color name="color_AA7400">#AA7400</color>
<color name="color_4E390A">#4E390A</color>
<color name="color_7E8373">#7E8373</color>
</resources>

4
app/src/main/res/values/strings.xml
View File

@@ -4882,6 +4882,7 @@
<string name="convert_diamond">Convert Coins</string>
<string name="gold">Diamonds</string>
<string name="my_gold">My Diamonds: %s</string>
<string name="my_gold_text">My Diamonds</string>
<string name="my_diamond">My Coins: %s</string>
<string name="confirm_exchange">Confirm Exchange</string>
<string name="no_withdrawal_account_is_attached">Withdrawal account is not attached</string>
@@ -5269,6 +5270,9 @@ You cannot join again within 24 hours after leaving</string>
<string name="room_switch_standard_room_tips">確認切換成普通房嗎？</string>
<string name="room_switch_game_failed_in_game">遊戲進行中，不可中止～</string>
<string name="room_game_number_full">當前遊戲人數已滿!</string>
<string name="wallet">錢包</string>
<string name="please_enter">請輸入..</string>
</resources>

8
modules/module_base/src/main/res/drawable/base_selector_theme_24dp.xml Normal file
View File

@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/base_shape_theme_24dp" android:state_pressed="true" />
<item android:drawable="@drawable/base_shape_theme_24dp" android:state_focused="true" />
<item android:drawable="@drawable/base_shape_theme_24dp" android:state_enabled="true" />
<item android:drawable="@drawable/base_shape_theme_unselected_24dp" android:state_enabled="false" />
</selector>

6
modules/module_base/src/main/res/drawable/base_shape_theme_unselected_24dp.xml Normal file
View File

@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient android:startColor="#B7F2FF" android:centerColor="#D5C1FF" android:endColor="#FDACF1"/>
<corners android:radius="24dp" />
</shape>