Skip to content

A
android_goodmoney
Commit f7e0f224 authored by mengcuiguang's avatar mengcuiguang
Browse files
Options

代码优化

parent bb38ab0f
Hide whitespace changes
Inline Side-by-side
Showing with 271 additions and 340 deletions
GoodMoney/app/build.gradle
View file @ f7e0f224
......@@ -180,7 +180,7 @@ dependencies {
// 三方接入
// leakcanary
// debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.4'
// 极光推送
implementation 'cn.jiguang.sdk:jpush:3.6.6'
implementation 'cn.jiguang.sdk:jcore:2.3.8'
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ad/video/WnVedioAdManager.kt
View file @ f7e0f224
......@@ -18,7 +18,7 @@ class WnVedioAdManager private constructor(activity: Activity) :
private val TAG = WnVedioAdManager::class.java.simpleName
lateinit var wnVedioAdPresenter: WnVedioAdPresenter
private var wnVedioAdPresenter: WnVedioAdPresenter? = null
private var wnVedioAdListener: WnVedioAdListener? = null
private var mRewardVideoAd: WNRewardVideoAd? = null
......@@ -44,7 +44,7 @@ class WnVedioAdManager private constructor(activity: Activity) :
private fun init(activity: Activity) {
this.activity = activity
wnVedioAdPresenter = WnVedioAdPresenter()
wnVedioAdPresenter.attachView(this)
wnVedioAdPresenter?.attachView(this)
}
override fun loadAd(activity: Activity, curCoin: Int, carrierType: String, extraId: String?) {
......@@ -96,7 +96,7 @@ class WnVedioAdManager private constructor(activity: Activity) :
}
override fun onAdClose() {
wnVedioAdPresenter.reportAddCoinMsg(activity, getAdMapVO(carrierType, Constant.AD_SOURCE_SDHZ, extraId, curCoin))
wnVedioAdPresenter?.reportAddCoinMsg(activity, getAdMapVO(carrierType, Constant.AD_SOURCE_SDHZ, extraId, curCoin))
TrackManager.getInstance().addCallImp(Constant.AD_SOURCE_SDHZ, Constant.EVENT_TYPE_THREE, "", "")
......@@ -141,8 +141,10 @@ class WnVedioAdManager private constructor(activity: Activity) :
}
override fun onDestory() {
wnVedioAdPresenter.dispose()
wnVedioAdPresenter.detachView()
wnVedioAdPresenter?.let {
it.dispose()
it.detachView()
}
mRewardVideoAd?.let {
it.downloadListener = null
......
GoodMoney/app/src/main/java/com/mints/goodmoney/manager/NotifyManager.java
View file @ f7e0f224
......@@ -115,10 +115,10 @@ public class NotifyManager {
if (remoteViews != null && context != null) {
remoteViews.setTextViewText(R.id.notify_step,
new SpanUtils()
.append(step + "").setBold().setForegroundColor(context.getResources().getColor(R.color.main_mints))
.append("步 ︲ ").setForegroundColor(context.getResources().getColor(R.color.black_text))
.append(getDistanceByStep(step) + "").setBold().setForegroundColor(context.getResources().getColor(R.color.main_mints))
.append(" 公里").setForegroundColor(context.getResources().getColor(R.color.black_text))
.append(step + "").setBold().setForegroundColor(context.getResources().getColor(R.color.color_FF9837))
.append("步 ︲ ").setForegroundColor(context.getResources().getColor(R.color.color_333))
.append(getDistanceByStep(step) + "").setBold().setForegroundColor(context.getResources().getColor(R.color.color_FF9837))
.append(" 公里").setForegroundColor(context.getResources().getColor(R.color.color_333))
.create());
// remoteViews.setTextViewText(R.id.notify_step, step + "步 ︲ " + getDistanceByStep(step) + "公里");
if (manager != null && notification != null) {
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/AwardActivity.kt
View file @ f7e0f224
......@@ -359,11 +359,11 @@ class AwardActivity : BaseActivity(), AwardView, View.OnClickListener {
tvAwardCash.setText(
SpanUtils()
.append("我的金币").setFontSize(40).setForegroundColor(resources.getColor(R.color.black_text))
.append(sumCoin).setFontSize(40).setForegroundColor(resources.getColor(R.color.main_mints))
.append("≈").setFontSize(40).setForegroundColor(resources.getColor(R.color.black_text))
.append("" + cashStr).setFontSize(40).setForegroundColor(resources.getColor(R.color.main_mints))
.append("元").setFontSize(40).setForegroundColor(resources.getColor(R.color.black_text))
.append("我的金币").setFontSize(40).setForegroundColor(resources.getColor(R.color.color_333))
.append(sumCoin).setFontSize(40).setForegroundColor(resources.getColor(R.color.color_FF9837))
.append("≈").setFontSize(40).setForegroundColor(resources.getColor(R.color.color_333))
.append("" + cashStr).setFontSize(40).setForegroundColor(resources.getColor(R.color.color_FF9837))
.append("元").setFontSize(40).setForegroundColor(resources.getColor(R.color.color_333))
.create()
)
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/DrawcashActivity.kt
View file @ f7e0f224
......@@ -95,6 +95,12 @@ class DrawcashActivity : BaseActivity(),
// readyGo(CoinRecordActivity::class.java)
}
R.id.tvDrawcashWx -> {
// 是否登录
if (!userManager.userIsLogin()) {
readyGo(WxLoginActivity::class.java)
return
}
if (!TextUtils.isEmpty(userConfig?.openid)) {
return
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/LiebaoGameActivity.kt
View file @ f7e0f224
......@@ -96,9 +96,9 @@ class LiebaoGameActivity : BaseActivity()
} else {
tvGameHint.setText(
SpanUtils()
.append("畅玩").append("${sumTime / 60}").setForegroundColor(mContext.resources.getColor(R.color.main_mints)).append("分钟, ")
.append("奖励").append("${sumCoin}").setForegroundColor(mContext.resources.getColor(R.color.red)).append("金币, ")
.append("已玩").append("${gameTime / 60}").setForegroundColor(mContext.resources.getColor(R.color.main_mints)).append("分钟")
.append("畅玩").append("${sumTime / 60}").setForegroundColor(mContext.resources.getColor(R.color.color_FF9837)).append("分钟, ")
.append("奖励").append("${sumCoin}").setForegroundColor(mContext.resources.getColor(R.color.color_cb4a39)).append("金币, ")
.append("已玩").append("${gameTime / 60}").setForegroundColor(mContext.resources.getColor(R.color.color_FF9837)).append("分钟")
.create())
}
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/MorningClockActivity.kt
View file @ f7e0f224
......@@ -82,7 +82,7 @@ class MorningClockActivity : BaseActivity()
tvMorningClockClick.text = data.buttonMsg
tvMorningClockDay.text = SpanUtils()
.append("打卡领金币 已连续打卡")
.append("${data.continuityDays}").setForegroundColor(resources.getColor(R.color.main_mints))
.append("${data.continuityDays}").setForegroundColor(resources.getColor(R.color.color_FF9837))
.append("天")
.create()
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/SettingsActivity.kt
View file @ f7e0f224
......@@ -8,6 +8,8 @@ import android.widget.EditText
import android.widget.ImageView
import android.widget.TextView
import androidx.appcompat.app.AlertDialog
import cn.sharesdk.framework.ShareSDK
import cn.sharesdk.wechat.friends.Wechat
import com.mints.goodmoney.R
import com.mints.goodmoney.common.Constant
import com.mints.goodmoney.login.LoginApi
......@@ -49,11 +51,11 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
item_phone.findViewById<TextView>(R.id.tv_right).text = "未绑定"
}
// if (userManager.wxOpenid.isNotEmpty()) {
// item_wechat.findViewById<TextView>(R.id.tv_right).text = userManager.wxName
// } else {
// item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权"
// }
if (userManager.wxOpenid.isNotEmpty()) {
item_wechat.findViewById<TextView>(R.id.tv_right).text = userManager.wxName
} else {
item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权"
}
}
private fun initLayout() {
......@@ -67,7 +69,7 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
iv_left_icon.setOnClickListener(this)
item_phone.setOnClickListener(this)
// item_wechat.setOnClickListener(this)
item_wechat.setOnClickListener(this)
item_invitedCode.setOnClickListener(this)
item_cleanCache.setOnClickListener(this)
item_userAgree.setOnClickListener(this)
......@@ -88,17 +90,17 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
item_phone.findViewById<TextView>(R.id.tv_right).text = "未绑定"
}
// item_wechat.findViewById<TextView>(R.id.tv_title).text = "微信昵称"
// val wechat = resources.getDrawable(R.mipmap.icon_settings_wechat)
// wechat.setBounds(0, 0, 56, 56)
// item_wechat.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(wechat, null, null, null)
// item_wechat.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
// item_wechat.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
// if (userManager.wxOpenid.isNotEmpty()) {
// item_wechat.findViewById<TextView>(R.id.tv_right).text = userManager.wxName
// } else {
// item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权"
// }
item_wechat.findViewById<TextView>(R.id.tv_title).text = "微信昵称"
val wechat = resources.getDrawable(R.mipmap.icon_settings_wechat)
wechat.setBounds(0, 0, 56, 56)
item_wechat.findViewById<TextView>(R.id.tv_title).setCompoundDrawables(wechat, null, null, null)
item_wechat.findViewById<TextView>(R.id.tv_right).visibility = View.VISIBLE
item_wechat.findViewById<ImageView>(R.id.iv_right).visibility = View.GONE
if (userManager.wxOpenid.isNotEmpty()) {
item_wechat.findViewById<TextView>(R.id.tv_right).text = userManager.wxName
} else {
item_wechat.findViewById<TextView>(R.id.tv_right).text = "未授权"
}
// item_invitedCode.findViewById<TextView>(R.id.tv_title).text = "邀请码"
// val invitedCode = resources.getDrawable(R.mipmap.icon_settings_invite)
......@@ -161,20 +163,20 @@ class SettingsActivity : BaseActivity(), View.OnClickListener, OnLoginListener,
readyGo(BindMobileActivity::class.java)
}
}
// R.id.item_wechat -> {
// if (userManager.wxOpenid.isEmpty()) {
//
// val wechat = ShareSDK.getPlatform(Wechat.NAME)
// if (!wechat.isClientValid) {
// showToast("请先安装微信")
// return
// }
//
// loginApi.setOnLoginListener(this)
// loginApi.setPlatform(Wechat.NAME)
// loginApi.login(this)
// }
// }
R.id.item_wechat -> {
if (userManager.wxOpenid.isEmpty()) {
val wechat = ShareSDK.getPlatform(Wechat.NAME)
if (!wechat.isClientValid) {
showToast("请先安装微信")
return
}
loginApi.setOnLoginListener(this)
loginApi.setPlatform(Wechat.NAME)
loginApi.login(this)
}
}
R.id.item_invitedCode -> {
submitInvitedCode()
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/activitys/WxLoginActivity.kt
View file @ f7e0f224
......@@ -166,7 +166,7 @@ class WxLoginActivity : BaseActivity()
}
override fun updateDrawState(ds: TextPaint) {
ds.setColor(resources.getColor(R.color.main_mints))
ds.setColor(resources.getColor(R.color.color_FF9837))
ds.setUnderlineText(false)
}
})
......@@ -180,7 +180,7 @@ class WxLoginActivity : BaseActivity()
}
override fun updateDrawState(ds: TextPaint) {
ds.setColor(resources.getColor(R.color.main_mints))
ds.setColor(resources.getColor(R.color.color_FF9837))
ds.setUnderlineText(false)
}
})
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/CoinRecordAdapter.kt
View file @ f7e0f224
......@@ -69,10 +69,10 @@ class CoinRecordAdapter(context: Context, coinData: MutableList<GoldRecordBean.L
if (coinData.rewardType == 0) {
// 0-金币
holder.tv_goldrecord_cash_type.text = "金币"
holder.tv_goldrecord_cash.setTextColor(ContextCompat.getColor(mContext, R.color.main_mints))
holder.tv_goldrecord_cash.setTextColor(ContextCompat.getColor(mContext, R.color.color_FF9837))
} else {
holder.tv_goldrecord_cash_type.text = "钻石"
holder.tv_goldrecord_cash.setTextColor(ContextCompat.getColor(mContext, R.color.versus_task_play_text))
holder.tv_goldrecord_cash.setTextColor(ContextCompat.getColor(mContext, R.color.color_63A0B9))
}
holder.tv_goldrecord_cash.text = "+" + coinData.unitCoin
}
......@@ -84,7 +84,7 @@ class CoinRecordAdapter(context: Context, coinData: MutableList<GoldRecordBean.L
holder.tv_goldrecord_cash_type.text = "钻石"
}
holder.tv_goldrecord_cash.text = "-" + coinData.unitCoin
holder.tv_goldrecord_cash.setTextColor(ContextCompat.getColor(mContext, R.color.loan_green))
holder.tv_goldrecord_cash.setTextColor(ContextCompat.getColor(mContext, R.color.color_7CCD7C))
}
}
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/DrawcashAdapter.kt
View file @ f7e0f224
package com.mints.goodmoney.ui.adapter
import android.content.Context
import android.text.TextUtils
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
......@@ -70,8 +69,8 @@ class DrawcashAdapter(val priceList: MutableList<DrawcashBean.CashOutMoneyArrBea
}
if (!priceBean.isCanCashOut) {
holder.tvDrawItemCash.setTextColor(ContextCompat.getColor(context, R.color.grayc))
holder.tvDrawItemGold.setTextColor(ContextCompat.getColor(context, R.color.grayc))
holder.tvDrawItemCash.setTextColor(ContextCompat.getColor(context, R.color.color_ccc))
holder.tvDrawItemGold.setTextColor(ContextCompat.getColor(context, R.color.color_ccc))
holder.llDrawItem.setBackgroundResource(R.drawable.shape_vip_adapter)
} else {
//当前选中
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/DrawcashRecordAdapter.kt
View file @ f7e0f224
......@@ -51,10 +51,10 @@ class DrawcashRecordAdapter(context: Context, invitedData: MutableList<DrawcashR
// viewHolder.tv_drawcashrecord_account.setText("支付宝账户:" + data.getAccount());
if (TextUtils.equals(data.payChannel, "ALIPAY")) {
viewHolder.tv_drawcashrecord_account.text = "提现账户：支付宝"
viewHolder.tv_drawcashrecord_account.setTextColor(ContextCompat.getColor(mContext, R.color.water_color))
viewHolder.tv_drawcashrecord_account.setTextColor(ContextCompat.getColor(mContext, R.color.color_7EE2FF))
} else {
viewHolder.tv_drawcashrecord_account.text = "提现账户：微信"
viewHolder.tv_drawcashrecord_account.setTextColor(ContextCompat.getColor(mContext, R.color.loan_green))
viewHolder.tv_drawcashrecord_account.setTextColor(ContextCompat.getColor(mContext, R.color.color_7CCD7C))
}
val errormsg: String = data.errormsg
if (TextUtils.isEmpty(errormsg)) {
......@@ -66,19 +66,19 @@ class DrawcashRecordAdapter(context: Context, invitedData: MutableList<DrawcashR
when (data.status) {
0, 1 -> {
viewHolder.tv_drawcashrecord_status.text = "处理中"
viewHolder.tv_drawcashrecord_status.setTextColor(ContextCompat.getColor(mContext, R.color.text_font))
viewHolder.tv_drawcashrecord_status.setTextColor(ContextCompat.getColor(mContext, R.color.color_454A69))
}
2 -> {
viewHolder.tv_drawcashrecord_status.text = "已提现"
viewHolder.tv_drawcashrecord_status.setTextColor(ContextCompat.getColor(mContext, R.color.main_nor_color))
viewHolder.tv_drawcashrecord_status.setTextColor(ContextCompat.getColor(mContext, R.color.color_BEC2CC))
}
3, 4 -> {
viewHolder.tv_drawcashrecord_status.text = "提现失败"
viewHolder.tv_drawcashrecord_status.setTextColor(ContextCompat.getColor(mContext, R.color.tv_message_recente_money))
viewHolder.tv_drawcashrecord_status.setTextColor(ContextCompat.getColor(mContext, R.color.color_FF5E5E))
}
else -> {
viewHolder.tv_drawcashrecord_status.text = "未知"
viewHolder.tv_drawcashrecord_status.setTextColor(ContextCompat.getColor(mContext, R.color.text_font))
viewHolder.tv_drawcashrecord_status.setTextColor(ContextCompat.getColor(mContext, R.color.color_454A69))
}
}
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/adapter/MainMyAdapter.kt
View file @ f7e0f224
......@@ -84,7 +84,7 @@ class MainMyAdapter(context: Context, taskData: MutableList<MyInfo.AutoListBean>
2 -> {
if (taskBean.baseConfig.taskId == APP_SHAREFRIEND) {
holder.itemTaskClick.setBackgroundResource(R.drawable.shape_btn_orange)
holder.itemTaskClick.setTextColor(mContext.resources.getColor(R.color.my_color_orange))
holder.itemTaskClick.setTextColor(mContext.resources.getColor(R.color.color_FB560C))
} else {
holder.itemTaskClick.setBackgroundResource(R.drawable.shape_btn_gury)
holder.itemTaskClick.setTextColor(Color.WHITE)
......@@ -92,12 +92,12 @@ class MainMyAdapter(context: Context, taskData: MutableList<MyInfo.AutoListBean>
}
0 -> {
holder.itemTaskClick.setBackgroundResource(R.drawable.shape_btn_orange)
holder.itemTaskClick.setTextColor(mContext.resources.getColor(R.color.my_color_orange))
holder.itemTaskClick.setTextColor(mContext.resources.getColor(R.color.color_FB560C))
}
}
} else {
holder.itemTaskClick.setBackgroundResource(R.drawable.shape_btn_orange)
holder.itemTaskClick.setTextColor(mContext.resources.getColor(R.color.my_color_orange))
holder.itemTaskClick.setTextColor(mContext.resources.getColor(R.color.color_FB560C))
}
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/FriendsFragment.kt
View file @ f7e0f224
......@@ -87,7 +87,7 @@ class FriendsFragment : BaseFragment(), FriendsView, OnRefreshListener, View.OnC
private fun initView() {
tv_right_subtitle.visibility = View.VISIBLE
tv_right_subtitle.text = "玩法规则"
tv_right_subtitle.setTextColor(resources.getColor(R.color.main_bg_text))
tv_right_subtitle.setTextColor(resources.getColor(R.color.color_666))
tv_right_subtitle.setOnClickListener { }
tv_title.text = "瓜分百万现金福利"
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/MyFragment.kt
View file @ f7e0f224
......@@ -348,9 +348,9 @@ class MyFragment : BaseFragment(), MyView, OnItemChildClickListener, OnRefreshLi
nowDate
}
item_clock_signday.text = SpanUtils()
.append(" 已连续签到").setForegroundColor(mContext.resources.getColor(R.color.product_text))
.append(" $alwaysSignDay ").setForegroundColor(mContext.resources.getColor(R.color.versus_sign_day))
.append("天").setForegroundColor(mContext.resources.getColor(R.color.product_text))
.append(" 已连续签到").setForegroundColor(mContext.resources.getColor(R.color.color_172B54))
.append(" $alwaysSignDay ").setForegroundColor(mContext.resources.getColor(R.color.color_F18542))
.append("天").setForegroundColor(mContext.resources.getColor(R.color.color_172B54))
.create()
val finalSignStatus = signStatus
item_clock_signview.setSignViewListener { day ->
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/ZhangyueFragment.kt
View file @ f7e0f224
......@@ -91,9 +91,9 @@ class ZhangyueFragment : LazyLoadBaseFragment(), BookView, IreaderApi.OnReadChan
tvZhangContent.text = "今日阅读任务已完成"
} else {
tvZhangContent.text = SpanUtils()
.append("阅读").append("${sumTime / 60}").setForegroundColor(mContext.resources.getColor(R.color.main_mints)).append("分钟, ")
.append("奖励").append("${sumCoin}").setForegroundColor(mContext.resources.getColor(R.color.red)).append("金币, ")
.append("已读").append("${readTime / 60}").setForegroundColor(mContext.resources.getColor(R.color.main_mints)).append("分钟")
.append("阅读").append("${sumTime / 60}").setForegroundColor(mContext.resources.getColor(R.color.color_FF9837)).append("分钟, ")
.append("奖励").append("${sumCoin}").setForegroundColor(mContext.resources.getColor(R.color.color_cb4a39)).append("金币, ")
.append("已读").append("${readTime / 60}").setForegroundColor(mContext.resources.getColor(R.color.color_FF9837)).append("分钟")
.create()
}
}
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/CircleProgress.java
View file @ f7e0f224
......@@ -16,7 +16,6 @@ import android.view.View;
import androidx.core.content.ContextCompat;
import com.mints.goodmoney.R;
import com.mints.goodmoney.common.Constant;
import com.mints.goodmoney.utils.MiscUtil;
......@@ -150,7 +149,7 @@ public class CircleProgress extends View {
// throw new Resources.NotFoundException("the give resource not found.");
// }
// }
int waterColor = ContextCompat.getColor(mContext, R.color.water_color);
int waterColor = ContextCompat.getColor(mContext, R.color.color_7EE2FF);
mGradientColors = new int[]{waterColor, waterColor, waterColor};
typedArray.recycle();
......
GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/SignView.java
View file @ f7e0f224
......@@ -206,7 +206,7 @@ public class SignView extends LinearLayout implements View.OnClickListener {
} else {
tvDay.setText(days + "天");
tvContent.setTextColor(resources.getColor(R.color.my_color_orange2));
tvContent.setTextColor(resources.getColor(R.color.color_EBB20D));
tvContent.setBackground(resources.getDrawable(R.mipmap.ic_sign_nofinish));
}
tvDay.setTextColor(resources.getColor(R.color.black));
......@@ -214,7 +214,7 @@ public class SignView extends LinearLayout implements View.OnClickListener {
case 1:
if (isCurFlag) {
tvContent.setText("");
tvContent.setTextColor(resources.getColor(R.color.graya));
tvContent.setTextColor(resources.getColor(R.color.color_AAA));
tvContent.setBackground(resources.getDrawable(R.mipmap.ic_sign_video));
tvDay.setTextColor(resources.getColor(R.color.black));
tvDay.setText("可翻倍");
......@@ -230,8 +230,8 @@ public class SignView extends LinearLayout implements View.OnClickListener {
}
tvContent.setText("");
tvContent.setTextColor(resources.getColor(R.color.graya));
tvDay.setTextColor(resources.getColor(R.color.graya));
tvContent.setTextColor(resources.getColor(R.color.color_AAA));
tvDay.setTextColor(resources.getColor(R.color.color_AAA));
tvDay.setText("已领");
}
break;
......@@ -244,8 +244,8 @@ public class SignView extends LinearLayout implements View.OnClickListener {
}
tvContent.setText("");
tvContent.setTextColor(resources.getColor(R.color.graya));
tvDay.setTextColor(resources.getColor(R.color.graya));
tvContent.setTextColor(resources.getColor(R.color.color_AAA));
tvDay.setTextColor(resources.getColor(R.color.color_AAA));
tvDay.setText("已领");
break;
default:
......
GoodMoney/app/src/main/res/drawable/item_rb_selector_left_selected.xml
View file @ f7e0f224
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/blue" />
<solid android:color="@color/color_0000FF" />
<corners
android:bottomLeftRadius="10dp"
android:topLeftRadius="10dp" />
......
GoodMoney/app/src/main/res/drawable/item_rb_selector_left_unselected.xml
View file @ f7e0f224
......@@ -9,6 +9,6 @@
<padding android:right="-1dp" />
<stroke
android:width="1dp"
android:color="@color/blue" />
android:color="@color/color_0000FF" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/item_rb_selector_right_selected.xml
View file @ f7e0f224
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/blue" />
<solid android:color="@color/color_0000FF" />
<corners
android:bottomRightRadius="10dp"
android:topRightRadius="10dp" />
......
GoodMoney/app/src/main/res/drawable/item_rb_selector_right_unselected.xml
View file @ f7e0f224
......@@ -9,6 +9,6 @@
<padding android:left="-1dp" />
<stroke
android:width="1dp"
android:color="@color/blue" />
android:color="@color/color_0000FF" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/item_rb_tv_color_selector.xml
View file @ f7e0f224
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/blue" android:state_checked="false" />
<item android:color="@color/color_0000FF" android:state_checked="false" />
<item android:color="@color/white" android:state_checked="true" />
</selector>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/item_txt_sel.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:color="@color/main_mints" android:state_selected="true" />
<item android:color="@color/color_FF9837" android:state_selected="true" />
<item android:color="@color/color_999" android:state_selected="false" />
</selector>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/progress_bar_horizontal.xml
View file @ f7e0f224
......@@ -9,7 +9,7 @@
<item android:id="@android:id/progress">
<clip>
<shape>
<solid android:color="@color/main" />
<solid android:color="@color/color_3D5AFE" />
</shape>
</clip>
</item>
......
GoodMoney/app/src/main/res/drawable/progressbar_versus_changevedio_bg.xml
View file @ f7e0f224
......@@ -8,7 +8,7 @@
<solid android:color="@color/white" />
<stroke
android:width="1dp"
android:color="@color/grayc" />
android:color="@color/color_ccc" />
</shape>
</item>
<!--一级进度条的颜色，也可以直接替换成图片-->
......@@ -16,7 +16,7 @@
<clip>
<shape>
<corners android:radius="20dip" />
<solid android:color="@color/main_mints" />
<solid android:color="@color/color_FF9837" />
</shape>
</clip>
</item>
......
GoodMoney/app/src/main/res/drawable/rb_opinion_selected.xml
View file @ f7e0f224
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@android:color/white" android:drawable="@drawable/btn_index_submit" android:state_checked="true"></item>
<item android:color="@color/tv_loan_bg" android:drawable="@drawable/btn_index_submit_unchecked" android:state_checked="false"></item>
<item android:color="@color/color_FEB63D" android:drawable="@drawable/btn_index_submit_unchecked" android:state_checked="false"></item>
</selector>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_back.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="105pt" android:height="40pt">
<shape android:shape="oval">
<solid android:color="@color/full_transparent" />
<solid android:color="@color/color_0000" />
<stroke
android:width="1dp"
android:color="#9F9F9F" />
......
GoodMoney/app/src/main/res/drawable/shape_btn_friends_unenabled.xml
View file @ f7e0f224
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/main_mints" />
<solid android:color="@color/color_FF9837" />
<corners android:radius="100dp" />
......
GoodMoney/app/src/main/res/drawable/shape_btn_gury.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/grayc" />
<solid android:color="@color/color_ccc" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="20dip" />
......
GoodMoney/app/src/main/res/drawable/shape_btn_orange.xml
View file @ f7e0f224
......@@ -5,7 +5,7 @@
<stroke
android:width="1.5dp"
android:color="@color/my_color_orange" />
android:color="@color/color_FB560C" />
<corners android:radius="100dp" />
......
GoodMoney/app/src/main/res/drawable/shape_green.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/loan_green" />
<solid android:color="@color/color_7CCD7C" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="30dip" />
......
GoodMoney/app/src/main/res/drawable/shape_loading_bg.xml
View file @ f7e0f224
......@@ -2,12 +2,12 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/loading_bg" />
<solid android:color="@color/color_600c224b" />
<!-- 边缘线的宽度和颜色 -->
<stroke
android:width="1dp"
android:color="@color/full_transparent" />
android:color="@color/color_0000" />
<corners android:radius="5dip" />
......
GoodMoney/app/src/main/res/drawable/shape_login_code.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:width="345dp" android:height="44dp">
<shape android:shape="rectangle">
<stroke android:width="1dp" android:color="@color/main_mints" />
<stroke android:width="1dp" android:color="@color/color_FF9837" />
<solid android:color="#ffffff" />
<corners android:radius="20dp" />
</shape>
......
GoodMoney/app/src/main/res/drawable/shape_main.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/main_mints" />
<solid android:color="@color/color_FF9837" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="30dip" />
......
GoodMoney/app/src/main/res/drawable/shape_main_water.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/main_water_btn" />
<solid android:color="@color/color_A7BCFE" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="40dip" />
......
GoodMoney/app/src/main/res/drawable/shape_morning_clock.xml
View file @ f7e0f224
......@@ -6,6 +6,6 @@
<stroke
android:width="1dp"
android:color="@color/main_bg_text" />
android:color="@color/color_666" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_my_red.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/loan_year_color" />
<solid android:color="@color/color_FF2326" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="14dip" />
......
GoodMoney/app/src/main/res/drawable/shape_tips.xml
View file @ f7e0f224
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="6dp" />
<solid android:color="@color/white_transparent" />
<solid android:color="@color/color_50000000" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_toast_bg.xml
View file @ f7e0f224
......@@ -7,7 +7,7 @@
<!-- 边缘线的宽度和颜色 -->
<stroke
android:width="1dp"
android:color="@color/full_transparent" />
android:color="@color/color_0000" />
<corners android:radius="5dip" />
......
GoodMoney/app/src/main/res/drawable/shape_tv_gold_gury.xml
View file @ f7e0f224
......@@ -6,6 +6,6 @@
<stroke
android:width="1dp"
android:color="@color/main_bg_text" />
android:color="@color/color_666" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_tv_gold_none.xml
View file @ f7e0f224
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/grayc" />
<solid android:color="@color/color_ccc" />
<corners android:radius="20dip" />
<stroke
android:width="1dp"
android:color="@color/main_bg_text" />
android:color="@color/color_666" />
</shape>
\ No newline at end of file
GoodMoney/app/src/main/res/drawable/shape_vip_adapter_none.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!-- 填充的颜色 -->
<solid android:color="@color/main_mints" />
<solid android:color="@color/color_FF9837" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="5dip" />
......
GoodMoney/app/src/main/res/drawable/tabitem_txt_sel.xml
View file @ f7e0f224
......@@ -2,8 +2,8 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Non focused states -->
<item android:color="@color/text_font" android:state_enabled="false" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:color="@color/text_font" android:state_enabled="false" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<item android:color="@color/color_454A69" android:state_enabled="false" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
<item android:color="@color/color_454A69" android:state_enabled="false" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
<!-- Focused states -->
<item android:color="@color/white" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
<item android:color="#caf9ff" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
......
GoodMoney/app/src/main/res/layout/activity_aboutus.xml
View file @ f7e0f224
......@@ -25,7 +25,7 @@
android:layout_marginTop="30dp"
android:layout_marginBottom="15dp"
android:text="@string/app_name"
android:textColor="@color/text_font"
android:textColor="@color/color_454A69"
android:textSize="13sp" />
<ImageView
......@@ -65,7 +65,7 @@
android:layout_marginRight="2dp"
android:padding="5dp"
android:text="@string/register_name"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="14sp" />
<View
......@@ -73,7 +73,7 @@
android:layout_height="match_parent"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:background="@color/main_mints" />
android:background="@color/color_FF9837" />
<TextView
android:id="@+id/tvAboutasPolicy"
......@@ -82,7 +82,7 @@
android:layout_marginLeft="2dp"
android:padding="5dp"
android:text="隐私政策"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="14sp" />
</LinearLayout>
......@@ -95,7 +95,7 @@
android:layout_marginRight="30dp"
android:gravity="center"
android:text="Copyright © 2020 Inc.."
android:textColor="@color/text_font"
android:textColor="@color/color_454A69"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
......
GoodMoney/app/src/main/res/layout/activity_award.xml
View file @ f7e0f224
......@@ -55,7 +55,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="70dp"
android:layout_marginBottom="10dp"
android:textColor="@color/black_text"
android:textColor="@color/color_333"
android:textSize="18sp"
tools:text="恭喜获取120金币" />
......@@ -64,7 +64,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:textColor="@color/graya"
android:textColor="@color/color_AAA"
android:textSize="18sp"
android:visibility="gone"
tools:text="123" />
......@@ -91,7 +91,7 @@
android:layout_gravity="center_horizontal"
android:layout_marginTop="14dp"
android:layout_marginBottom="10dp"
android:textColor="@color/black_text"
android:textColor="@color/color_333"
android:textSize="14sp"
tools:text="123" />
......@@ -120,7 +120,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@color/full_transparent">
android:background="@color/color_0000">
</FrameLayout>
</FrameLayout>
......
GoodMoney/app/src/main/res/layout/activity_bind_mobile.xml
View file @ f7e0f224
......@@ -50,8 +50,8 @@
android:inputType="number"
android:maxLength="13"
android:maxLines="1"
android:textColor="@color/product_text"
android:textColorHint="@color/main_nor_color"
android:textColor="@color/color_172B54"
android:textColorHint="@color/color_BEC2CC"
android:textSize="12sp" />
</LinearLayout>
......@@ -89,8 +89,8 @@
android:inputType="number"
android:maxLength="4"
android:maxLines="1"
android:textColor="@color/product_text"
android:textColorHint="@color/main_nor_color"
android:textColor="@color/color_172B54"
android:textColorHint="@color/color_BEC2CC"
android:textSize="12sp" />
......@@ -102,7 +102,7 @@
android:layout_centerVertical="true"
android:gravity="center"
android:text="发送验证码"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="12sp" />
</RelativeLayout>
......
GoodMoney/app/src/main/res/layout/activity_drawcash.xml
View file @ f7e0f224
......@@ -48,7 +48,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="0"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="22sp"
android:textStyle="bold" />
......@@ -74,7 +74,7 @@
android:layout_height="1px"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:background="@color/my_color_gray3" />
android:background="@color/color_F8F8F8" />
<RelativeLayout
android:layout_width="match_parent"
......@@ -98,7 +98,7 @@
android:background="@drawable/shape_login_code"
android:gravity="center"
android:text="去授权"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="14sp" />
</RelativeLayout>
......@@ -123,7 +123,7 @@
android:layout_marginLeft="20dp"
android:layout_marginTop="15dp"
android:layout_marginRight="20dp"
android:textColor="@color/black_text"
android:textColor="@color/color_333"
android:textSize="14sp" />
<TextView
......@@ -133,7 +133,7 @@
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="20dp"
android:textColor="@color/black_text"
android:textColor="@color/color_333"
android:textSize="14sp" />
</LinearLayout>
</com.mints.goodmoney.ui.widgets.ElasticScrollView>
......@@ -157,7 +157,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:text="所需金币:3000"
android:textColor="@color/black_text"
android:textColor="@color/color_333"
android:textSize="14sp"
android:visibility="gone" />
......
GoodMoney/app/src/main/res/layout/activity_erase.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/my_color_gray2"
android:background="@color/color_F9FAFB"
android:orientation="vertical">
<include layout="@layout/header_layout" />
......
GoodMoney/app/src/main/res/layout/activity_feekback.xml
View file @ f7e0f224
......@@ -11,7 +11,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_color"
android:background="@color/color_F9F9F9"
android:orientation="vertical">
<LinearLayout
......
GoodMoney/app/src/main/res/layout/activity_food_subsidy.xml
View file @ f7e0f224
......@@ -47,7 +47,7 @@
android:layout_height="340dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:background="@color/full_transparent" />
android:background="@color/color_0000" />
</LinearLayout>
</ScrollView>
GoodMoney/app/src/main/res/layout/activity_friends.xml
View file @ f7e0f224
......@@ -41,7 +41,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray" />
android:background="@color/color_E6E6E6" />
<androidx.viewpager.widget.ViewPager
android:id="@+id/view_pager_friends"
......
GoodMoney/app/src/main/res/layout/activity_guide.xml
View file @ f7e0f224
......@@ -23,8 +23,8 @@
app:piv_animationType="worm"
app:piv_dynamicCount="true"
app:piv_interactiveAnimation="true"
app:piv_selectedColor="@color/main_mints"
app:piv_unselectedColor="@color/ban_transparent"
app:piv_selectedColor="@color/color_FF9837"
app:piv_unselectedColor="@color/color_60000000"
app:piv_viewPager="@id/vp_guide_viewpager"
attrs:piv_padding="12dp"
attrs:piv_radius="8dp" />
......
GoodMoney/app/src/main/res/layout/activity_liebao_game.xml
View file @ f7e0f224
......@@ -12,7 +12,7 @@
android:id="@+id/tvGameHint"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/my_color_gray"
android:background="@color/color_E6E6E6"
android:drawableLeft="@mipmap/ic_voice"
android:drawablePadding="10pt"
android:gravity="center_vertical"
......
GoodMoney/app/src/main/res/layout/activity_main.xml
View file @ f7e0f224
......@@ -23,7 +23,7 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:background="@color/authentic_text"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
......
GoodMoney/app/src/main/res/layout/activity_mobile_login.xml
View file @ f7e0f224
......@@ -38,8 +38,8 @@
android:inputType="number"
android:maxLength="13"
android:maxLines="1"
android:textColor="@color/product_text"
android:textColorHint="@color/main_nor_color"
android:textColor="@color/color_172B54"
android:textColorHint="@color/color_BEC2CC"
android:textSize="12sp" />
</LinearLayout>
......@@ -77,8 +77,8 @@
android:inputType="number"
android:maxLength="4"
android:maxLines="1"
android:textColor="@color/product_text"
android:textColorHint="@color/main_nor_color"
android:textColor="@color/color_172B54"
android:textColorHint="@color/color_BEC2CC"
android:textSize="12sp" />
......@@ -90,7 +90,7 @@
android:layout_centerVertical="true"
android:gravity="center"
android:text="发送验证码"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="12sp" />
</RelativeLayout>
......
GoodMoney/app/src/main/res/layout/activity_morning_clock.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/order_hint_color"
android:background="@color/color_50E8E8E8"
android:fadingEdge="none"
android:overScrollMode="never">
......@@ -46,7 +46,7 @@
android:background="@drawable/shape_tv_gold_none"
android:enabled="false"
android:gravity="center"
android:textColor="@color/water_hint_btn"
android:textColor="@color/color_255186"
android:textSize="14sp" />
</RelativeLayout>
</FrameLayout>
......@@ -90,7 +90,7 @@
android:layout_height="340dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:background="@color/full_transparent">
android:background="@color/color_0000">
</FrameLayout>
</LinearLayout>
......
GoodMoney/app/src/main/res/layout/activity_settings.xml
View file @ f7e0f224
......@@ -20,7 +20,6 @@
layout="@layout/item_settings" />
<include
android:visibility="gone"
android:id="@+id/item_wechat"
layout="@layout/item_settings" />
......
GoodMoney/app/src/main/res/layout/activity_walk.xml
View file @ f7e0f224
......@@ -45,7 +45,7 @@
android:layout_width="340dp"
android:layout_height="340dp"
android:layout_marginTop="20dp"
android:background="@color/full_transparent"
android:background="@color/color_0000"
android:layout_gravity="center_horizontal" />
</LinearLayout>
......
GoodMoney/app/src/main/res/layout/activity_water.xml
View file @ f7e0f224
......@@ -45,7 +45,7 @@
android:layout_height="340dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:background="@color/full_transparent" />
android:background="@color/color_0000" />
</LinearLayout>
</ScrollView>
......
GoodMoney/app/src/main/res/layout/activity_web.xml
View file @ f7e0f224
......@@ -31,14 +31,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:textColor="@color/product_net_text"
android:textColor="@color/color_121B32"
android:textSize="16sp" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:background="@color/my_color_gray" />
android:background="@color/color_E6E6E6" />
</RelativeLayout>
<ProgressBar
......
GoodMoney/app/src/main/res/layout/activity_wx_login.xml
View file @ f7e0f224
......@@ -74,7 +74,7 @@
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_gravity="center_horizontal"
android:textColor="@color/product_hint_text"
android:textColor="@color/color_707A8D"
android:textSize="12sp" />
</LinearLayout>
</RelativeLayout>
......
GoodMoney/app/src/main/res/layout/dialog_main.xml
View file @ f7e0f224
......@@ -54,7 +54,7 @@
android:background="@null"
android:gravity="center"
android:padding="10dp"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="14sp" />
<View
......@@ -69,7 +69,7 @@
android:background="@null"
android:gravity="center"
android:padding="10dp"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="14sp" />
</LinearLayout>
......
GoodMoney/app/src/main/res/layout/dialog_power.xml
View file @ f7e0f224
......@@ -72,7 +72,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:text="我们会严格按照《网络安全法》、《信息网络传播保护条例》等保护您的个人信息"
android:textColor="@color/ban_transparent"
android:textColor="@color/color_60000000"
android:textSize="14sp" />
</LinearLayout>
......@@ -96,7 +96,7 @@
android:layout_gravity="center_vertical"
android:layout_marginLeft="4dp"
android:text="如果未经您的授权，我们不会使用您的个人信息用于您未授权的其他途径和目的"
android:textColor="@color/ban_transparent"
android:textColor="@color/color_60000000"
android:textSize="14sp" />
</LinearLayout>
......@@ -124,7 +124,7 @@
android:paddingTop="4dp"
android:paddingBottom="6dp"
android:text="查看完整版"
android:textColor="@color/ban_transparent"
android:textColor="@color/color_60000000"
android:textSize="12sp" />
<TextView
......@@ -136,7 +136,7 @@
android:paddingRight="2dp"
android:paddingBottom="6dp"
android:text="@string/register_name"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="12sp" />
<TextView
......@@ -145,7 +145,7 @@
android:paddingTop="6dp"
android:paddingBottom="6dp"
android:text="及"
android:textColor="@color/ban_transparent"
android:textColor="@color/color_60000000"
android:textSize="12sp" />
<TextView
......@@ -157,7 +157,7 @@
android:paddingRight="2dp"
android:paddingBottom="6dp"
android:text="隐私政策"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="12sp" />
</LinearLayout>
......@@ -188,7 +188,7 @@
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:background="@color/grayc"
android:background="@color/color_ccc"
android:text="不同意"
android:textColor="@color/white" />
......@@ -203,7 +203,7 @@
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:layout_weight="1"
android:background="@color/main_mints"
android:background="@color/color_FF9837"
android:text="同意"
android:textColor="@color/white" />
</LinearLayout>
......
GoodMoney/app/src/main/res/layout/dialog_share.xml
View file @ f7e0f224
......@@ -31,7 +31,7 @@
android:layout_below="@id/img_share"
android:layout_marginTop="20dp"
android:text="@string/app_name"
android:textColor="@color/main_mints" />
android:textColor="@color/color_FF9837" />
<TextView
android:layout_width="wrap_content"
......@@ -39,10 +39,10 @@
android:layout_below="@id/tv_share_code"
android:layout_marginTop="10dp"
android:text="好玩好赚钱"
android:textColor="@color/main_mints" />
android:textColor="@color/color_FF9837" />
<ImageView
android:background="@color/main_mints"
android:background="@color/color_FF9837"
android:id="@+id/img_qr_code"
android:layout_width="60dp"
android:layout_height="60dp"
......
GoodMoney/app/src/main/res/layout/fragment_main_friends.xml
View file @ f7e0f224
......@@ -26,7 +26,7 @@
<com.google.android.material.appbar.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/my_color_gray3"
android:background="@color/color_F8F8F8"
app:layout_behavior=".ui.widgets.FlingBehavior">
<com.google.android.material.appbar.CollapsingToolbarLayout
......@@ -38,7 +38,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/my_color_gray3"
android:background="@color/color_F8F8F8"
android:orientation="vertical">
<RelativeLayout
......@@ -277,7 +277,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="15dp"
android:background="@color/my_color_gray3"
android:background="@color/color_F8F8F8"
app:layout_constraintTop_toBottomOf="@id/textView" />
<LinearLayout
......@@ -390,7 +390,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray3" />
android:background="@color/color_F8F8F8" />
</LinearLayout>
......@@ -420,7 +420,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:background="@color/my_color_gray3" />
android:background="@color/color_F8F8F8" />
</RelativeLayout>
......
GoodMoney/app/src/main/res/layout/fragment_main_money.xml
View file @ f7e0f224
......@@ -14,7 +14,7 @@
app:xTabIndicatorHeight="4dp"
app:xTabIndicatorWidth="10dp"
app:xTabMode="scrollable"
app:xTabSelectedTextColor="@color/main_mints"
app:xTabSelectedTextColor="@color/color_FF9837"
app:xTabSelectedTextSize="22sp"
app:xTabTextColor="#000"
app:xTabTextSize="18sp" />
......
GoodMoney/app/src/main/res/layout/fragment_main_zy.xml
View file @ f7e0f224
......@@ -15,7 +15,7 @@
android:id="@+id/tvZhangContent"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/my_color_gray"
android:background="@color/color_E6E6E6"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:paddingStart="14dp"
......
GoodMoney/app/src/main/res/layout/header_layout.xml
View file @ f7e0f224
......@@ -19,7 +19,7 @@
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/product_net_text"
android:textColor="@color/color_121B32"
android:textSize="18sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -51,7 +51,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:textColor="@color/product_net_text"
android:textColor="@color/color_121B32"
android:textSize="16sp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
......@@ -61,7 +61,7 @@
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/my_color_gray"
android:background="@color/color_E6E6E6"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@+id/iv_right_icon" />
......
GoodMoney/app/src/main/res/layout/item_banner.xml
View file @ f7e0f224
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/full_transparent"
android:background="@color/color_0000"
android:foreground="?android:selectableItemBackground"
android:orientation="vertical">
......
GoodMoney/app/src/main/res/layout/item_divider_gray.xml
View file @ f7e0f224
......@@ -2,4 +2,4 @@
<View xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="10dp"
android:background="@color/my_color_gray3" />
\ No newline at end of file
android:background="@color/color_F8F8F8" />
\ No newline at end of file
GoodMoney/app/src/main/res/layout/item_fragment_main_my_promotions.xml
View file @ f7e0f224
......@@ -9,7 +9,7 @@
android:divider="@null"
android:dividerHeight="10dp"
android:elevation="6dip"
android:listSelector="@color/full_transparent"
android:listSelector="@color/color_0000"
android:numColumns="4"
android:scrollbars="none"
android:stretchMode="spacingWidthUniform" />
\ No newline at end of file
GoodMoney/app/src/main/res/layout/item_fragment_main_my_task.xml
View file @ f7e0f224
......@@ -29,7 +29,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="15sp"
app:layout_constraintStart_toEndOf="@id/item_task_title"
app:layout_constraintTop_toTopOf="parent" />
......@@ -39,7 +39,7 @@
android:layout_width="260dp"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textColor="@color/grayc"
android:textColor="@color/color_ccc"
android:textSize="15sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/item_task_title" />
......@@ -60,7 +60,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:textColor="@color/loan_green"
android:textColor="@color/color_7CCD7C"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@id/item_task_pb"
app:layout_constraintStart_toEndOf="@id/item_task_pb"
......@@ -74,7 +74,7 @@
android:gravity="center"
android:paddingStart="12dp"
android:paddingEnd="12dp"
android:textColor="@color/my_color_orange"
android:textColor="@color/color_FB560C"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......
GoodMoney/app/src/main/res/layout/item_fragment_main_my_title.xml
View file @ f7e0f224
......@@ -46,7 +46,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textColor="@color/loan_tv_choose_paycash"
android:textColor="@color/color_333"
android:textSize="14sp" />
<TextView
......@@ -61,7 +61,7 @@
android:paddingRight="10dp"
android:paddingBottom="2dp"
android:text="复制"
android:textColor="@color/main_bg_text"
android:textColor="@color/color_666"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
......@@ -99,7 +99,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="6dp"
android:text="0"
android:textColor="@color/my_color_orange"
android:textColor="@color/color_FB560C"
android:textSize="26sp" />
<TextView
......
GoodMoney/app/src/main/res/layout/item_list_drawcashrecord.xml
View file @ f7e0f224
......@@ -11,7 +11,7 @@
android:layout_marginStart="15dp"
android:layout_marginTop="15dp"
android:text="单号"
android:textColor="@color/text_font"
android:textColor="@color/color_454A69"
android:textSize="14sp" />
<LinearLayout
......@@ -25,7 +25,7 @@
android:layout_width="3dp"
android:layout_height="10dp"
android:layout_gravity="center_vertical"
android:background="@color/tv_loan_bg" />
android:background="@color/color_FEB63D" />
<TextView
android:id="@+id/tv_drawcashrecord_date"
......@@ -34,7 +34,7 @@
android:layout_gravity="center_vertical"
android:layout_marginStart="5dp"
android:text="2020-10-19"
android:textColor="@color/text_font"
android:textColor="@color/color_454A69"
android:textSize="12sp" />
</LinearLayout>
......@@ -51,7 +51,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="¥ 50"
android:textColor="@color/text_font"
android:textColor="@color/color_454A69"
android:textSize="26sp" />
<TextView
......@@ -72,7 +72,7 @@
android:layout_marginTop="2pt"
android:layout_marginBottom="15dp"
android:text="提现账户"
android:textColor="@color/main_nor_color"
android:textColor="@color/color_BEC2CC"
android:textSize="12sp" />
<TextView
......@@ -82,7 +82,7 @@
android:layout_marginStart="15dp"
android:layout_marginTop="1dp"
android:layout_marginBottom="15dp"
android:textColor="@color/red"
android:textColor="@color/color_cb4a39"
android:textSize="12sp"
android:visibility="gone" />
</LinearLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/item_list_goldrecord.xml
View file @ f7e0f224
......@@ -13,7 +13,7 @@
android:drawablePadding="10pt"
android:gravity="center_vertical"
android:text="今日"
android:textColor="@color/versus_task_play_text"
android:textColor="@color/color_63A0B9"
android:textSize="18sp"
android:visibility="gone" />
......@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="7dp"
android:text="0"
android:textColor="@color/main_mints"
android:textColor="@color/color_FF9837"
android:textSize="14sp" />
<TextView
......
GoodMoney/app/src/main/res/layout/item_recy_invited.xml
View file @ f7e0f224
......@@ -18,7 +18,7 @@
android:layout_width="30dp"
android:layout_height="30dp"
android:gravity="center"
android:textColor="@color/black_text"
android:textColor="@color/color_333"
android:textSize="@dimen/font_size_16"
android:visibility="gone" />
......@@ -34,14 +34,14 @@
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_weight="1"
android:textColor="@color/black_text"
android:textColor="@color/color_333"
android:textSize="16sp" />
<TextView
android:id="@+id/item_invited_tv_coin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/my_color_orange"
android:textColor="@color/color_FB560C"
android:textSize="22sp" />
<TextView
......@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:textColor="@color/my_color_orange"
android:textColor="@color/color_FB560C"
android:textSize="14sp" />
</LinearLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/item_rv_morning_clock.xml
View file @ f7e0f224
......@@ -30,7 +30,7 @@
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_height="24dp"
android:background="@color/red"></View>
android:background="@color/color_cb4a39"></View>
<TextView
android:id="@+id/tvMorningClockItemCoin"
......
GoodMoney/app/src/main/res/layout/item_settings.xml
View file @ f7e0f224
......@@ -13,7 +13,7 @@
android:layout_centerVertical="true"
android:drawablePadding="10dp"
android:gravity="center_vertical"
android:textColor="@color/product_net_text"
android:textColor="@color/color_121B32"
android:textSize="16sp" />
<ImageView
......@@ -37,5 +37,5 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:background="@color/my_color_gray" />
android:background="@color/color_E6E6E6" />
</RelativeLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/loading.xml
View file @ f7e0f224
......@@ -3,7 +3,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/full_transparent"
android:background="@color/color_0000"
android:gravity="center"
android:orientation="horizontal">
......@@ -24,6 +24,6 @@
android:lineSpacingExtra="@dimen/common_loading_text_lines_spacing"
android:maxLines="2"
android:text="@string/common_loading_message"
android:textColor="@color/graya"
android:textColor="@color/color_AAA"
android:textSize="12sp" />
</LinearLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/message.xml
View file @ f7e0f224
......@@ -19,7 +19,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/full_transparent"
android:background="@color/color_0000"
android:gravity="center_horizontal"
android:orientation="vertical">
......
GoodMoney/app/src/main/res/layout/title_bar_.xml
View file @ f7e0f224
......@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/status_bg"
android:background="@color/color_002444"
android:orientation="vertical">
<RelativeLayout
......
GoodMoney/app/src/main/res/layout/view_countdown_vedio.xml
View file @ f7e0f224
......@@ -14,7 +14,7 @@
android:layout_gravity="center"
android:layout_margin="4dp"
app:cd_animator_time="8"
app:cd_arc_color="@color/main_mints"
app:cd_arc_color="@color/color_FF9837"
app:cd_arc_width="3dp"
app:cd_bg_color="#20FF9837"
app:cd_circle_radius="25dp"
......
GoodMoney/app/src/main/res/layout/view_dialog_update.xml
View file @ f7e0f224
......@@ -27,7 +27,7 @@
android:layout_marginBottom="15dp"
android:layout_marginTop="15dp"
android:text="更新提示"
android:textColor="@color/black_text"
android:textColor="@color/color_333"
android:textSize="14sp" />
<View
......@@ -55,7 +55,7 @@
android:padding="5dp"
android:scrollbars="vertical"
android:singleLine="false"
android:textColor="@color/order_color"
android:textColor="@color/color_63677E"
android:textSize="14sp" />
<Button
......@@ -68,7 +68,7 @@
android:background="@drawable/shape_main"
android:text="立即更新"
android:layout_marginBottom="10dp"
android:textColor="@color/authentic_text"
android:textColor="@color/white"
android:textSize="14sp" />
</RelativeLayout>
......
GoodMoney/app/src/main/res/layout/view_sign.xml
View file @ f7e0f224
......@@ -41,7 +41,7 @@
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:text="1天"
android:textColor="@color/main_bg_text"
android:textColor="@color/color_666"
android:textSize="@dimen/font_size_12" />
</LinearLayout>
......@@ -69,7 +69,7 @@
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:text="2天"
android:textColor="@color/main_bg_text"
android:textColor="@color/color_666"
android:textSize="@dimen/font_size_12" />
</LinearLayout>
......@@ -97,7 +97,7 @@
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:text="3天"
android:textColor="@color/main_bg_text"
android:textColor="@color/color_666"
android:textSize="@dimen/font_size_12" />
</LinearLayout>
......@@ -125,7 +125,7 @@
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:text="4天"
android:textColor="@color/main_bg_text"
android:textColor="@color/color_666"
android:textSize="@dimen/font_size_12" />
</LinearLayout>
......@@ -153,7 +153,7 @@
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:text="5天"
android:textColor="@color/main_bg_text"
android:textColor="@color/color_666"
android:textSize="@dimen/font_size_12" />
</LinearLayout>
......@@ -181,7 +181,7 @@
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:text="6天"
android:textColor="@color/main_bg_text"
android:textColor="@color/color_666"
android:textSize="@dimen/font_size_12" />
</LinearLayout>
......@@ -210,7 +210,7 @@
android:layout_marginTop="6dp"
android:gravity="center_vertical"
android:text="7天"
android:textColor="@color/main_bg_text"
android:textColor="@color/color_666"
android:textSize="@dimen/font_size_12" />
</LinearLayout>
......
GoodMoney/app/src/main/res/layout/view_title.xml
View file @ f7e0f224
......@@ -25,6 +25,6 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:background="@color/my_color_gray" />
android:background="@color/color_E6E6E6" />
</RelativeLayout>
\ No newline at end of file
GoodMoney/app/src/main/res/layout/view_water.xml
View file @ f7e0f224
......@@ -40,7 +40,7 @@
android:layout_marginTop="5dp"
android:layout_marginBottom="2dp"
android:text="今日喝水目标"
android:textColor="@color/main_yellow"
android:textColor="@color/color_fcf16e"
android:textSize="12sp" />
<TextView
......@@ -57,7 +57,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="后喝水领金币"
android:textColor="@color/grayc"
android:textColor="@color/color_ccc"
android:textSize="12sp"
android:visibility="invisible" />
</LinearLayout>
......@@ -80,7 +80,7 @@
android:background="@drawable/shape_water_btn"
android:gravity="center"
android:text="喝水打卡"
android:textColor="@color/water_hint_btn"
android:textColor="@color/color_255186"
android:textSize="14sp" />
</RelativeLayout>
......
GoodMoney/app/src/main/res/values/colors.xml
View file @ f7e0f224
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="main_mints">#FF9837</color>
<color name="color_FF9837">#FF9837</color>
<color name="white">#FFFFFF</color>
<color name="graygai">#D9D9D9</color>
<color name="black">#000000</color>
<color name="gray">#808080</color>
<color name="main">#3D5AFE</color>
<color name="red">#cb4a39</color>
<color name="red_t">#60FF0000</color>
<color name="blue">#0000FF</color>
<color name="grayc">#cccccc</color>
<color name="graya">#AAAAAA</color>
<color name="gray_fc">#FCFCFC</color>
<color name="lightblue">#0083FF</color>
<color name="full_transparent">#00000000</color>
<color name="ban_transparent">#60000000</color>
<color name="white_transparent">#50000000</color>
<color name="title_bg">#2B3238</color>
<color name="status_bg">#002444</color>
<color name="loading_bg">#600c224b</color>
<color name="main_yellow">#fcf16e</color>
<color name="main_all_yellow">#fffeb63d</color>
<color name="versus_sign_day">#F18542</color>
<color name="versus_sign_change">#6881D0</color>
<color name="versus_task_change">#C9C3FF</color>
<color name="versus_task_play">#8DDBE2</color>
<color name="versus_task_play_text">#63A0B9</color>
<color name="versus_task_drink_text">#5487B9</color>
<color name="versus_task_pan_text">#C04B34</color>
<color name="versus_task_erase_text">#F0833F</color>
<color name="shadow_color">#66000000</color>
<color name="water_color">#7EE2FF</color>
<color name="water_hint_color">#08448B</color>
<color name="water_hint_btn">#255186</color>
<color name="main_water_color">#90AFFD</color>
<color name="main_water_btn">#A7BCFE</color>
<color name="drink_time_color">#323643</color>
<color name="drink_time_color_cur">#F28335</color>
<color name="title_color">#3D5AFE</color>
<color name="main_bg">#f2f2f2</color>
<color name="main_bg_text">#666666</color>
<color name="btn_nor">#cb4a39</color>
<color name="btn_select">#ac3e30</color>
<color name="btn_enabled">#F1F2F8</color>
<drawable name="item_enabled">#FFFFFF</drawable>
<color name="black_text">#333333</color>
<color name="line_color">#d3d3d3</color>
<color name="rippelColor">#07FCF5</color>
<color name="toastbg_transparent">#aa000000</color>
<color name="authentic_font">#cb4d39</color>
<color name="title_font">#2B3238</color>
<color name="text_font">#454A69</color>
<color name="coupon_font">#8007FCF5</color>
<color name="list_date">#D5D5D5</color>
<color name="seekbar_bs_smallstage_choosecash">#D6D6D6</color>
<color name="rbtn_bs_smallstage_textcolor">#D4D4D4</color>
<color name="tv_main_title">#2B3238</color>
<color name="loan_tv_choose_paycash">#333333</color>
<color name="loan_tv_choose_paycash_text">#a8a8b9</color>
<color name="loan_tv_choose_paycash_font">#f2776d</color>
<color name="loan_seekbar_line">#cf6a60</color>
<color name="loan_green">#7CCD7C</color>
<color name="tv_loan_bg">#FEB63D</color>
<color name="tv_payday_arrivalamount">#FFC107</color>
<color name="tv_payday_status">#4066BED0</color>
<color name="tv_payday_title">#FFC97D</color>
<color name="iv_payday_coupon">#4007FCF5</color>
<color name="tv_basic_color">#FFF0D8</color>
<color name="friend_color">#FFF0DA</color>
<color name="tv_message_recente_money">#FF5E5E</color>
<color name="tv_repayment_status">#f58686</color>
<color name="tv_main_data_fragment_title">#464545</color>
<color name="tv_main_data_fragment_promt">#cc4a3a</color>
<color name="authentic_text">#FFFFFF</color>
<color name="authentic_text_transparent">#60FFFFFF</color>
<color name="authentic_none">#969ba7</color>
<color name="product_text">#172B54</color>
<color name="product_hint_text">#707A8D</color>
<color name="product_net_text">#121B32</color>
<color name="credit_text">#49546C</color>
<color name="background_color">#F9F9F9</color>
<color name="vip_money_color">#D9C3A0</color>
<color name="countdown_color">#07FCF5</color>
<color name="btn_text_color_false">#4066bed0</color>
<color name="et_bg_color">#4066bed0</color>
<color name="text_hint_color">#C1C2CB</color>
<color name="message_text_color">#8007FCF5</color>
<color name="emptyprompt_text_color">#09b8b9</color>
<color name="coffers_text_color">#FEFEFE</color>
<color name="coffers_item_text_color">#babac1</color>
<color name="drawing_text_color">#149CA4</color>
<color name="drawing_money_color">#FF0000</color>
<color name="drawing_dialog_code_color">#179B9E</color>
<color name="drawing_dialog_record_color">#BABBC2</color>
<color name="drawing_dialog_record_success_color">#92949F</color>
<color name="drawing_dialog_record_faile_color">#EEEFF6</color>
<color name="my_order_color">#B6B8C5</color>
<color name="order_color">#63677E</color>
<color name="main_color">#FD9A2A</color>
<color name="main_nor_color">#BEC2CC</color>
<color name="person_hint_color">#D4D5DE</color>
<color name="loan_hint_color">#B8BAC6</color>
<color name="order_hint_color">#50E8E8E8</color>
<color name="loan_year_color">#FF2326</color>
<color name="dialog_text_color">#030303</color>
<color name="mian_text_color">#D4D5DE</color>
<color name="line_gury_color">#DBDBDB</color>
<color name="my_color">#CCD7EA</color>
<color name="gold_try_color">#8F9BB3</color>
<color name="my_color_blue">#93B7D9</color>
<color name="my_color_gray">#E6E6E6</color>
<color name="my_color_gray2">#F9FAFB</color>
<color name="my_color_gray3">#F8F8F8</color>
<color name="my_color_black">#343C4F</color>
<color name="my_color_orange">#FB560C</color>
<color name="my_color_orange2">#EBB20D</color>
<color name="color_3D5AFE">#3D5AFE</color>
<color name="color_cb4a39">#cb4a39</color>
<color name="color_0000FF">#0000FF</color>
<color name="color_ccc">#cccccc</color>
<color name="color_AAA">#AAAAAA</color>
<color name="color_0000">#00000000</color>
<color name="color_60000000">#60000000</color>
<color name="color_50000000">#50000000</color>
<color name="color_2B3238">#2B3238</color>
<color name="color_002444">#002444</color>
<color name="color_600c224b">#600c224b</color>
<color name="color_fcf16e">#fcf16e</color>
<color name="color_F18542">#F18542</color>
<color name="color_63A0B9">#63A0B9</color>
<color name="color_7EE2FF">#7EE2FF</color>
<color name="color_255186">#255186</color>
<color name="color_A7BCFE">#A7BCFE</color>
<color name="color_666">#666666</color>
<color name="color_454A69">#454A69</color>
<color name="color_333">#333333</color>
<color name="color_7CCD7C">#7CCD7C</color>
<color name="color_FEB63D">#FEB63D</color>
<color name="color_FF5E5E">#FF5E5E</color>
<color name="color_172B54">#172B54</color>
<color name="color_707A8D">#707A8D</color>
<color name="color_121B32">#121B32</color>
<color name="color_F9F9F9">#F9F9F9</color>
<color name="color_63677E">#63677E</color>
<color name="color_BEC2CC">#BEC2CC</color>
<color name="color_50E8E8E8">#50E8E8E8</color>
<color name="color_FF2326">#FF2326</color>
<color name="color_93B7D9">#93B7D9</color>
<color name="color_E6E6E6">#E6E6E6</color>
<color name="color_F9FAFB">#F9FAFB</color>
<color name="color_F8F8F8">#F8F8F8</color>
<color name="color_343C4F">#343C4F</color>
<color name="color_FB560C">#FB560C</color>
<color name="color_EBB20D">#EBB20D</color>
<color name="color_999">#999999</color>
<color name="color_555">#555555</color>
<color name="color_F5F">#F5F5F5</color>
......@@ -125,7 +50,6 @@
<color name="color_00895B">#00895B</color>
<color name="color_8F6D21">#8F6D21</color>
<color name="color_FFDD0C">#FFDD0C</color>
<color name="color_CF7E7E">#CF7E7E</color>
<color name="color_FF4A4A">#FF4A4A</color>
<color name="color_AF6F36">#AF6F36</color>
......
GoodMoney/app/src/main/res/values/drawables.xml
View file @ f7e0f224
......@@ -16,8 +16,8 @@
<resources>
<drawable name="progress_bar_bg">@color/full_transparent</drawable>
<drawable name="sr_primary">@color/title_bg</drawable>
<drawable name="sr_primary_r">@color/status_bg</drawable>
<drawable name="progress_bar_bg">@color/color_0000</drawable>
<drawable name="sr_primary">@color/color_2B3238</drawable>
<drawable name="sr_primary_r">@color/color_002444</drawable>
</resources>
\ No newline at end of file
GoodMoney/app/src/main/res/values/styles.xml
View file @ f7e0f224
......@@ -5,7 +5,7 @@
</style>
<style name="dialog" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@color/full_transparent</item>
<item name="android:windowBackground">@color/color_0000</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment