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

UI调整:设置页面相关三级页面

Browse Source
This commit is contained in:
huangjian
2021-03-30 16:03:29 +08:00
parent e010cba5b7
commit bd0e1a81b4
52 changed files with 279 additions and 445 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/yizhuan/erban/common/widget/TutuSwitchView.java
View File

@@ -3,6 +3,9 @@ package com.yizhuan.erban.common.widget;
import android.content.Context;
import android.util.AttributeSet;
import androidx.core.content.ContextCompat;
import com.yizhuan.erban.R;
import com.yizhuan.xchat_android_library.widget.IOSSwitchView;
/**
@@ -21,6 +24,6 @@ public class TutuSwitchView extends IOSSwitchView {
@Override
public int getSelectedColor() {
return 0xFF7154EE;
return ContextCompat.getColor(getContext(), R.color.app_248cfe);
}
}

21
app/src/main/java/com/yizhuan/erban/ui/im/avtivity/BlackListManageActivity.java
View File

@@ -3,11 +3,12 @@ package com.yizhuan.erban.ui.im.avtivity;
import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.view.View;
import android.widget.ImageView;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.netease.nim.uikit.StatusBarUtil;
import com.netease.nimlib.sdk.uinfo.model.NimUserInfo;
import com.yizhuan.erban.R;
@@ -25,10 +26,9 @@ import java.util.List;
*/
@CreatePresenter(BlackListManagePresenter.class)
public class BlackListManageActivity extends BaseMvpActivity<IBlackListManageView, BlackListManagePresenter> implements
IBlackListManageView, View.OnClickListener {
IBlackListManageView {
private BlackListAdapter mAdapter;
private ImageView ivBack;
private RecyclerView mRecyclerView;
private LinearLayoutManager mLayoutManager;
@@ -36,13 +36,12 @@ public class BlackListManageActivity extends BaseMvpActivity<IBlackListManageVie
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_friend_black_list_manage);
initWhiteTitleBar("黑名单");
initViews();
}
private void initViews() {
showLoading();
ivBack = (ImageView) findViewById(R.id.iv_back);
ivBack.setOnClickListener(this);
// 黑名单
mRecyclerView = (RecyclerView) findViewById(R.id.recycler_view);
mAdapter = new BlackListAdapter(mRecyclerView);
@@ -56,13 +55,6 @@ public class BlackListManageActivity extends BaseMvpActivity<IBlackListManageVie
}
}
@Override
public void onClick(View v) {
if (v.getId() == R.id.iv_back) {
finish();
}
}
@Override
public void onGetBlackListInfoSuccess(List<NimUserInfo> nimUserInfos) {
if (ListUtils.isListEmpty(nimUserInfos)) {
@@ -82,7 +74,7 @@ public class BlackListManageActivity extends BaseMvpActivity<IBlackListManageVie
}
View status = findViewById(R.id.status_layout);
if (status == null || status.getId() <= 0) {
if (status == null || status.getId() == View.NO_ID) {
return;
}
NoDataFragment fragment = NoDataFragment.newInstance(R.layout.fragment_no_data_large_iv, drawable, charSequence);
@@ -122,7 +114,6 @@ public class BlackListManageActivity extends BaseMvpActivity<IBlackListManageVie
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}

38
app/src/main/java/com/yizhuan/erban/ui/login/BinderPhoneActivity.java
View File

@@ -9,19 +9,16 @@ import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageView;
import android.widget.TextView;
import com.trello.rxlifecycle3.android.ActivityEvent;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.ui.login.helper.LogoutHelper;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.code.CodeModel;
import com.yizhuan.xchat_android_core.code.CodeType;
import com.yizhuan.xchat_android_core.statistic.StatisticManager;
import com.yizhuan.xchat_android_core.statistic.protocol.StatisticsProtocol;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_library.utils.SingleToastUtil;
import com.yizhuan.xchat_android_library.utils.TextWatcherWrapper;
@@ -48,10 +45,6 @@ public class BinderPhoneActivity extends BaseActivity implements View.OnClickLis
private Button btnBinderRquest;
private CodeDownTimer timer;
private TextView tvSkip;
private ImageView ivBack;
private TextView tvBackLogin;
private boolean isBackLogin;
public static void start(Context context, boolean backLogin) {
Intent intent = new Intent(context, BinderPhoneActivity.class);
@@ -67,6 +60,7 @@ public class BinderPhoneActivity extends BaseActivity implements View.OnClickLis
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_binder_phone);
initWhiteTitleBar("绑定手机");
initView();
initData();
setListener();
@@ -84,16 +78,11 @@ public class BinderPhoneActivity extends BaseActivity implements View.OnClickLis
btnGetCode = findViewById(R.id.btn_get_code);
btnBinderRquest = findViewById(R.id.btn_binder_request);
tvSkip = findViewById(R.id.tv_skip);
ivBack = findViewById(R.id.iv_back);
tvBackLogin = findViewById(R.id.tv_back_login);
}
private void initData() {
//设置是否显示跳过按钮
tvSkip.setVisibility(View.GONE);
isBackLogin = getIntent().getBooleanExtra(KEY_BACK_LOGIN, false);
tvBackLogin.setVisibility(View.VISIBLE);
tvBackLogin.setText(isBackLogin ? R.string.back_login_page : R.string.back);
}
private void setListener() {
@@ -120,8 +109,6 @@ public class BinderPhoneActivity extends BaseActivity implements View.OnClickLis
etSmsCode.addTextChangedListener(textWatcher);
tvSkip.setOnClickListener(this);
ivBack.setOnClickListener(this);
tvBackLogin.setOnClickListener(this);
}
private void bindPhone() {
@@ -153,12 +140,6 @@ public class BinderPhoneActivity extends BaseActivity implements View.OnClickLis
}
private void bindSuccessDialog() {
BindSuccessDialog dialog = new BindSuccessDialog();
dialog.setmListener(this);
dialog.show(getSupportFragmentManager(), "bindSuccess");
}
private void getCode() {
String phoneNumber = etAlipayAccount.getText().toString().trim();
Number parse = null;
@@ -210,10 +191,6 @@ public class BinderPhoneActivity extends BaseActivity implements View.OnClickLis
StatisticManager.Instance().onEvent(StatisticsProtocol.Event.LOGIN_BINDING_PHONE_SKIP, "绑定手机-跳过");
finish();
break;
case R.id.iv_back:
case R.id.tv_back_login:
handleFinish();
break;
default:
break;
}
@@ -239,17 +216,4 @@ public class BinderPhoneActivity extends BaseActivity implements View.OnClickLis
}
}
@Override
public void onBackPressed() {
handleFinish();
}
private void handleFinish() {
if (!isBackLogin) {
toast("请先绑定手机号");
return;
}
LogoutHelper.logout();
finish();
}
}

3
app/src/main/java/com/yizhuan/erban/ui/login/ShowBindPhoneActivity.java
View File

@@ -24,7 +24,7 @@ public class ShowBindPhoneActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_show_bind_phone);
initTitleBar("绑定手机");
initWhiteTitleBar("绑定手机");
TextView tv_phone = findViewById(R.id.tv_phone);
UserInfo userInfo = UserModel.get().getCacheLoginUserInfo();
if (userInfo != null && !TextUtils.isEmpty(userInfo.getPhone())) {
@@ -46,6 +46,5 @@ public class ShowBindPhoneActivity extends BaseActivity {
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}

4
app/src/main/java/com/yizhuan/erban/ui/patriarch/PatriarchPwdActivity.java
View File

@@ -97,10 +97,11 @@ public class PatriarchPwdActivity extends BaseBindingActivity<ActivityPatriarchP
mBinding.tvCommit.setClickable(canClick);
if (canClick) {
mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_confirm_normal);
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_title_white));
} else {
mBinding.tvCommit.setBackgroundResource(R.drawable.bg_common_disable);
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.text_secondary_4f516a));
}
mBinding.tvCommit.setTextColor(getResources().getColor(R.color.white));
}
private void resetEditViewLocation() {
@@ -121,7 +122,6 @@ public class PatriarchPwdActivity extends BaseBindingActivity<ActivityPatriarchP
@Override
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
}

3
app/src/main/java/com/yizhuan/erban/ui/setting/FeedbackActivity.java
View File

@@ -32,7 +32,7 @@ public class FeedbackActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_feedback);
initTitleBar("反馈");
initWhiteTitleBar("反馈");
initView();
initData();
SetListener();
@@ -95,6 +95,5 @@ public class FeedbackActivity extends BaseActivity {
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}

9
app/src/main/java/com/yizhuan/erban/ui/setting/ModifyPwdActivity.java
View File

@@ -89,7 +89,7 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
}
private void setModifyPwdUI() {
initTitleBar("修改登录密码");
initWhiteTitleBar("修改登录密码");
mBinding.edCurrentPwd.setTitleHint("原密码");
mBinding.edCurrentPwd.setEditHint("请输入当前登录密码");
@@ -102,7 +102,7 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
private void setLoginPwdUI() {
type = SET_LOGIN_PWD;
initTitleBar("设置登录密码");
initWhiteTitleBar("设置登录密码");
mBinding.edCurrentPwd.setVisibility(View.GONE);
mBinding.btnForget.setVisibility(View.GONE);
@@ -115,7 +115,7 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
}
private void setModifyPayPwdUI() {
initTitleBar("修改支付密码");
initWhiteTitleBar("修改支付密码");
mBinding.edCurrentPwd.setTitleHint("原密码");
mBinding.edCurrentPwd.setEditHint("请输入当前支付密码");
mBinding.edPwd.setTitleHint("新密码");
@@ -127,7 +127,7 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
}
private void setPayPwdUI(String title) {
initTitleBar(title);
initWhiteTitleBar(title);
mBinding.edCurrentPwd.setVisibility(View.GONE);
mBinding.btnForget.setVisibility(View.GONE);
mBinding.edPwd.setTitleHint("设置密码");
@@ -353,6 +353,5 @@ public class ModifyPwdActivity extends BaseBindingActivity<ActivityModifyPwdBind
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}

38
app/src/main/java/com/yizhuan/erban/ui/setting/NoticeSettingActivity.java
View File

@@ -43,9 +43,6 @@ public class NoticeSettingActivity extends BaseActivity {
private View systemNoticeView;
private TutuSwitchView switchSystemNotice;
private View communityNoticeView;
private TutuSwitchView switchCommunityNotice;
private UserInfo.Location userExpand;
@Override
@@ -53,7 +50,7 @@ public class NoticeSettingActivity extends BaseActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_notice_setting);
ButterKnife.bind(this);
initTitleBar(R.string.notice_setting);
initWhiteTitleBar("通知提醒设置");
userExpand = new UserInfo.Location();
userExpand.setInteractiveMsgNotify(false);
@@ -102,38 +99,6 @@ public class NoticeSettingActivity extends BaseActivity {
}
});
// if (communityNoticeView == null) {
// communityNoticeView = LayoutInflater.from(context).inflate(R.layout.item_system_notice, null);
// switchCommunityNotice = communityNoticeView.findViewById(R.id.switch_notice);
// llContainer.addView(communityNoticeView, new ViewGroup.LayoutParams(
// ViewGroup.LayoutParams.MATCH_PARENT,
// getResources().getDimensionPixelOffset(R.dimen.dp_setting_sys_notice_item_height))
// );
// setName(communityNoticeView, "互动通知");
// setDesc(communityNoticeView, "关闭后，收到动态互动消息不再提示");
// }
// switchCommunityNotice.setOn(userExpand.isInteractiveMsgNotify());
//
// switchCommunityNotice.setOnSwitchStateChangeListener(new IOSSwitchView.OnSwitchStateChangeListener() {
// @Override
// public void onStateSwitched(boolean isOn) {
// SettingsModel.get().interactiveMsgNotify(isOn)
// .compose(bindUntilEvent(ActivityEvent.DESTROY))
// .subscribe(new DontWarnObserver<String>() {
// @Override
// public void accept(String s, String error) {
// super.accept(s, error);
// if (error == null) {
// userExpand.setInteractiveMsgNotify(isOn);
// } else {
// toast(error);
// }
// }
// });
//
// }
// });
}
private void setName(View targetView, String name) {
@@ -165,7 +130,6 @@ public class NoticeSettingActivity extends BaseActivity {
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}

21
app/src/main/java/com/yizhuan/erban/ui/setting/VerifyPhoneActivity.java
View File

@@ -1,12 +1,13 @@
package com.yizhuan.erban.ui.setting;
import android.annotation.SuppressLint;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import androidx.core.content.ContextCompat;
import android.text.TextUtils;
import android.view.View;
import com.netease.nim.uikit.StatusBarUtil;
import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseBindingActivity;
import com.yizhuan.erban.databinding.ActivityVerifyPhoneBinding;
@@ -14,7 +15,6 @@ import com.yizhuan.erban.ui.login.BindSuccessDialog;
import com.yizhuan.erban.ui.login.CodeDownTimer;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.bean.response.ServiceResult;
import com.yizhuan.xchat_android_core.code.CodeModel;
import com.yizhuan.xchat_android_core.code.CodeType;
import com.yizhuan.xchat_android_core.pay.PayModel;
import com.yizhuan.xchat_android_core.user.UserModel;
@@ -56,7 +56,7 @@ public class VerifyPhoneActivity extends BaseBindingActivity<ActivityVerifyPhone
@Override
protected void init() {
initTitleBar("验证已绑定手机号码");
initWhiteTitleBar("验证已绑定手机号码");
isForgetPwd = getIntent().getBooleanExtra("isForgetPwd", false);
resetPwd = getIntent().getBooleanExtra("resetPwd", false);
if (UserModel.get().getCacheLoginUserInfo() != null
@@ -70,6 +70,7 @@ public class VerifyPhoneActivity extends BaseBindingActivity<ActivityVerifyPhone
mBinding.ivCodeDelete.setOnClickListener(this);
}
@SuppressLint("CheckResult")
private void getCode() {
if (isForgetPwd) {
type = CodeType.RESET_PAY_PSW;
@@ -186,7 +187,7 @@ public class VerifyPhoneActivity extends BaseBindingActivity<ActivityVerifyPhone
private void showModifyView() {
isVerify = true;
initTitleBar("更改绑定手机");
initWhiteTitleBar("更改绑定手机");
if (timer != null) {
timer.cancel();
@@ -195,7 +196,6 @@ public class VerifyPhoneActivity extends BaseBindingActivity<ActivityVerifyPhone
mBinding.text.setVisibility(View.GONE);
mBinding.btnGetCode.setText("获取验证码");
mBinding.btnGetCode.setTextColor(ContextCompat.getColor(this, R.color.appColor));
mBinding.btnGetCode.setClickable(true);//重新获得点击
mBinding.btnRegist.setText("提交");
@@ -257,4 +257,15 @@ public class VerifyPhoneActivity extends BaseBindingActivity<ActivityVerifyPhone
timer = null;
}
}
@Override
protected boolean needSteepStateBar() {
return true;
}
@Override
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
}
}

3
app/src/main/java/com/yizhuan/erban/ui/user/AboutActivity.java
View File

@@ -16,7 +16,7 @@ public class AboutActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_about);
initTitleBar("关于音游");
initWhiteTitleBar("关于音游");
initView();
initData();
}
@@ -38,6 +38,5 @@ public class AboutActivity extends BaseActivity {
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}

33
app/src/main/java/com/yizhuan/erban/ui/withdraw/BinderAlipayActivity.java
View File

@@ -18,9 +18,7 @@ import com.yizhuan.erban.R;
import com.yizhuan.erban.base.BaseActivity;
import com.yizhuan.erban.ui.login.CodeDownTimer;
import com.yizhuan.xchat_android_core.auth.AuthModel;
import com.yizhuan.xchat_android_core.code.CodeModel;
import com.yizhuan.xchat_android_core.code.CodeType;
import com.yizhuan.xchat_android_core.redPacket.bean.RedPacketInfo;
import com.yizhuan.xchat_android_core.user.UserModel;
import com.yizhuan.xchat_android_core.user.bean.UserInfo;
import com.yizhuan.xchat_android_core.utils.net.BeanObserver;
@@ -34,7 +32,6 @@ import io.reactivex.Single;
import io.reactivex.SingleObserver;
import io.reactivex.SingleSource;
import io.reactivex.disposables.Disposable;
import io.reactivex.functions.Consumer;
import io.reactivex.functions.Function;
public class BinderAlipayActivity extends BaseActivity {
@@ -72,7 +69,7 @@ public class BinderAlipayActivity extends BaseActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_binder_alipay);
initTitleBar("绑定支付宝");
initWhiteTitleBar("绑定支付宝");
initView();
initData();
onSetListener();
@@ -96,12 +93,12 @@ public class BinderAlipayActivity extends BaseActivity {
.flatMap(new Function<UserInfo, SingleSource<String>>() {
@Override
public SingleSource<String> apply(UserInfo userInfo) throws Exception {
if (userInfo.isBindPhone()){
if (userInfo.isBindPhone()) {
String phone = userInfo.getPhone();
phoneSB.append(phone);
return AuthModel.get()
return AuthModel.get()
.sendLoginCode(phone, CodeType.BIND_ALI);
}else {
} else {
return Single.error(new Throwable("没有绑定手机号。"));
}
@@ -116,7 +113,7 @@ public class BinderAlipayActivity extends BaseActivity {
@Override
public void onSuccess(String s) {
String phoneMod = FormatUtils.formatPhoneNumWithPrivacy(phoneSB.toString(),3,7);
String phoneMod = FormatUtils.formatPhoneNumWithPrivacy(phoneSB.toString(), 3, 7);
String msg = MessageFormat.format(getResources().getString(R.string.tips_bind_alipay_sms_code), phoneMod);
onGetSmsCode(msg);
}
@@ -130,14 +127,10 @@ public class BinderAlipayActivity extends BaseActivity {
});
//请求绑定支付宝
btnBinderRquest.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
// System.out.println("aliPayAccount"+aliPayAccount+"aliPayAccountName"+aliPayAccountName+"code"+code);
WithdrawModel.get().binderAlipay(
etAlipayAccount.getText().toString(),
etAlipayName.getText().toString(),
etSmsCode.getText().toString())
btnBinderRquest.setOnClickListener(v -> WithdrawModel.get().binderAlipay(
etAlipayAccount.getText().toString(),
etAlipayName.getText().toString(),
etSmsCode.getText().toString())
.subscribe(new BeanObserver<String>() {
@Override
public void onErrorMsg(String error) {
@@ -148,9 +141,7 @@ public class BinderAlipayActivity extends BaseActivity {
public void onSuccess(String s) {
onBinderAlipay();
}
});
}
});
}));
//输入框监听改变
textWatcher = new TextWatcher() {
@Override
@@ -214,9 +205,6 @@ public class BinderAlipayActivity extends BaseActivity {
private void initView() {
etAlipayAccount = (EditText) findViewById(R.id.et_phone);
/* //不需要判断支付宝账号格式，布局里面也不要写type=phone
etAlipayAccount.addValidator(new AccountValidator("Only Integer Valid!", "\\d+"));
etAlipayAccount.setFilters(new InputFilter[]{new InputFilter.LengthFilter(11)});*/
etAlipayName = (EditText) findViewById(R.id.et_name);
etSmsCode = (EditText) findViewById(R.id.et_smscode);
etSmsCode.setFilters(new InputFilter[]{new InputFilter.LengthFilter(5)});
@@ -250,7 +238,6 @@ public class BinderAlipayActivity extends BaseActivity {
protected void setStatusBar() {
super.setStatusBar();
StatusBarUtil.transparencyBar(this);
StatusBarUtil.StatusBarLightMode(this);
}
}

2
app/src/main/res/drawable/bg_code_edit_pm.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/color_F4F4F4" />
<solid android:color="@color/bg_secondary_2a2a39" />
<corners android:radius="10dp" />
</shape>

6
app/src/main/res/drawable/bg_common_confirm.xml
View File

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

7
app/src/main/res/drawable/bg_common_confirm_press.xml
View File

@@ -4,12 +4,11 @@
<gradient
android:angle="180"
android:endColor="#197FEA"
android:startColor="#701CE1"
android:endColor="#1873D3"
android:startColor="#5F17C1"
android:type="linear"
android:useLevel="true" />
<corners android:radius="100dp"/>
<corners android:radius="100dp" />
</shape>

6
app/src/main/res/drawable/bg_common_touch_trans.xml
View File

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

11
app/src/main/res/drawable/bg_common_unuseful_22r.xml
View File

@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#DBDBDB" />
<corners android:radius="22dp" />
</shape>

8
app/src/main/res/layout/activity_about.xml
View File

@@ -3,14 +3,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
android:layout_marginTop="@dimen/dp_25"/>
<ImageView
android:id="@+id/img_about_logo"
@@ -30,7 +30,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:text=""
android:textColor="#999999"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14sp" />
<TextView
@@ -40,7 +40,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="85dp"
android:text="@string/slogan"
android:textColor="#333333"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
</RelativeLayout>

71
app/src/main/res/layout/activity_binder_alipay.xml
View File

@@ -1,33 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
android:layout_marginTop="@dimen/dp_25" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginTop="50dp"
android:paddingLeft="32dp"
android:paddingRight="32dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="32dp"
android:paddingRight="32dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:gravity="center_vertical"
android:text="支付宝账号"
android:textColor="@color/text_color_primary"
android:textColor="@color/text_title_white"
android:textSize="14dp" />
<EditText
@@ -37,8 +36,8 @@
android:background="@null"
android:hint="请输入支付宝账号"
android:paddingLeft="15dp"
android:textColor="@color/text_color_primary"
android:textColorHint="@color/text_color_secondary"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="@dimen/font_normal" />
</LinearLayout>
@@ -48,18 +47,17 @@
android:id="@+id/code_layout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:paddingLeft="32dp"
android:paddingRight="32dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="32dp"
android:paddingRight="32dp">
<TextView
android:layout_width="wrap_content"
android:layout_height="40dp"
android:gravity="center_vertical"
android:text="真实姓名"
android:textColor="@color/text_color_primary"
android:textColor="@color/text_title_white"
android:textSize="14dp" />
<EditText
@@ -70,8 +68,8 @@
android:background="@null"
android:hint="请输入实名认证的真实姓名"
android:paddingLeft="15dp"
android:textColor="@color/text_color_primary"
android:textColorHint="@color/text_color_secondary"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="@dimen/font_normal" />
@@ -80,7 +78,7 @@
android:layout_width="17dp"
android:layout_height="17dp"
android:layout_centerVertical="true"
android:src="@drawable/ic_nick_delete"/>
android:src="@drawable/ic_nick_delete" />
</LinearLayout>
<TextView
@@ -89,18 +87,17 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:text="手机验证码"
android:textColor="#666666"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="14dp"
android:visibility="gone"/>
android:visibility="gone" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="32dp"
android:paddingRight="32dp"
android:background="@color/white"
android:gravity="center_vertical"
android:orientation="horizontal">
android:orientation="horizontal"
android:paddingLeft="32dp"
android:paddingRight="32dp">
<RelativeLayout
android:layout_width="match_parent"
@@ -114,11 +111,11 @@
android:hint="请输入手机验证码"
android:inputType="number"
android:maxLength="5"
tools:text="123"
android:textColor="#333333"
android:textColorHint="@color/text_color_secondary"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="@dimen/font_normal" />
android:textSize="@dimen/font_normal"
tools:text="123" />
<Button
android:id="@+id/btn_get_code"
@@ -138,9 +135,9 @@
android:layout_width="17dp"
android:layout_height="17dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/btn_get_code"
android:layout_marginRight="20dp"
android:src="@drawable/ic_nick_delete"/>
android:layout_toLeftOf="@id/btn_get_code"
android:src="@drawable/ic_nick_delete" />
</RelativeLayout>
@@ -151,9 +148,9 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="32dp"
android:layout_marginRight="32dp"
android:layout_marginTop="30dp"
android:background="@drawable/bg_common_confirm_normal"
android:layout_marginRight="32dp"
android:background="@drawable/bg_common_confirm"
android:clickable="true"
android:text="确认绑定"
android:textColor="@color/white"
@@ -164,9 +161,9 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_marginLeft="32dp"
android:layout_marginRight="32dp"
android:layout_marginTop="30dp"
android:background="@drawable/shape_semi_round_yellow_solid"
android:layout_marginRight="32dp"
android:background="@drawable/bg_common_confirm"
android:clickable="true"
android:text="确认绑定"
android:textColor="@color/white"
@@ -180,7 +177,9 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_10"
android:gravity="center_horizontal"
tools:text="验证码已发送"
android:layout_marginStart="@dimen/dp_15"
android:layout_marginEnd="@dimen/dp_15"
android:textColor="@color/text_color_red"
android:textSize="@dimen/dp_16" />
android:textSize="@dimen/dp_16"
tools:text="验证码已发送" />
</LinearLayout>

61
app/src/main/res/layout/activity_binder_phone.xml
View File

@@ -4,47 +4,15 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
tools:context=".ui.login.BinderPhoneActivity">
<ImageView
android:id="@+id/iv_back"
android:layout_width="wrap_content"
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="20dp"
android:src="@drawable/ic_register_back"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/tv_back_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="2.5dp"
android:text="@string/back_login_page"
android:textColor="@color/color_333333"
android:textSize="@dimen/sp_14"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/iv_back"
app:layout_constraintStart_toEndOf="@id/iv_back"
app:layout_constraintTop_toTopOf="@id/iv_back"
tools:visibility="visible" />
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="26dp"
android:layout_marginTop="85dp"
android:text="@string/text_bind_phone"
android:textColor="#ff333333"
android:textSize="25sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias=".2" />
android:layout_marginTop="@dimen/dp_25"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/et_phone"
@@ -57,13 +25,13 @@
android:hint="@string/hint_register_input_phone_number"
android:inputType="phone"
android:paddingBottom="15dp"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_b3b3b3"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textSize="15sp"
android:theme="@style/common_edittext_style"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_title"
app:layout_constraintTop_toBottomOf="@id/title_bar"
tools:ignore="Autofill" />
<EditText
@@ -71,14 +39,13 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20"
android:layout_marginEnd="8dp"
android:gravity="start|center_vertical"
android:hint="@string/hint_require_code_2"
android:inputType="number"
android:maxLength="15"
android:paddingBottom="15dp"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_b3b3b3"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textSize="15sp"
android:theme="@style/common_edittext_style"
app:layout_constraintEnd_toEndOf="@id/et_phone"
@@ -111,10 +78,10 @@
android:layout_marginStart="38dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="38dp"
android:background="@drawable/bg_login_button"
android:background="@drawable/bg_common_confirm"
android:enabled="false"
android:text="@string/text_bind"
android:textColor="@drawable/bg_login_button"
android:textColor="@color/text_title_white"
android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@@ -127,7 +94,7 @@
android:layout_gravity="center_horizontal"
android:padding="@dimen/dp_15"
android:text="@string/text_skip"
android:textColor="@color/color_999999"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_14"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"

2
app/src/main/res/layout/activity_collection_room.xml
View File

@@ -10,7 +10,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
/>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout

2
app/src/main/res/layout/activity_common_web_view.xml
View File

@@ -10,7 +10,7 @@
<FrameLayout
android:id="@+id/layout_title_bar"
android:layout_width="match_parent"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:layout_height="48dp">
<LinearLayout

2
app/src/main/res/layout/activity_create_pk.xml
View File

@@ -15,7 +15,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:background="@color/color_FFFFFF"
android:orientation="horizontal">

2
app/src/main/res/layout/activity_dating_rule_web_view.xml
View File

@@ -17,7 +17,7 @@
<FrameLayout
android:id="@+id/layout_title_bar"
android:layout_width="match_parent"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:visibility="gone"
android:layout_height="48dp">

2
app/src/main/res/layout/activity_fans.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
android:layout_marginTop="@dimen/dp_25"/>
<androidx.legacy.widget.Space
android:layout_width="match_parent"

32
app/src/main/res/layout/activity_feedback.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical"
tools:context="com.yizhuan.erban.ui.setting.FeedbackActivity">
@@ -11,12 +11,12 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
android:layout_marginTop="@dimen/dp_25" />
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/color_F5F5F5"/>
android:background="@color/line_color_353548" />
<TextView
android:layout_width="match_parent"
@@ -26,44 +26,46 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:text="问题描述"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="15sp" />
<EditText
android:id="@+id/edt_content"
android:layout_width="match_parent"
android:layout_height="161dp"
android:background="@drawable/bg_shape_modify_nick"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:background="@drawable/bg_2a2a39_0_15"
android:gravity="left"
android:hint="请输入反馈内容(必填)"
android:padding="10dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:textColor="@color/color_999999"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textSize="14sp" />
<EditText
android:id="@+id/edt_contact"
android:layout_width="match_parent"
android:layout_height="44dp"
android:layout_marginStart="15dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="15dp"
android:layout_marginStart="15dp"
android:background="@drawable/bg_shape_modify_nick"
android:background="@drawable/bg_2a2a39_0_15"
android:hint="请输入您的QQ或微信号"
android:padding="10dp"
android:textColor="@color/color_999999"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textSize="14sp" />
<Button
android:id="@+id/btn_commit"
style="?android:attr/borderlessButtonStyle"
android:layout_width="310dp"
android:layout_height="45dp"
android:layout_marginTop="45dp"
android:layout_gravity="center_horizontal"
style="?android:attr/borderlessButtonStyle"
android:background="@drawable/bg_binding_button"
android:layout_marginTop="45dp"
android:background="@drawable/bg_common_confirm"
android:text="提交反馈"
android:textColor="@color/white"
android:textColor="@color/text_title_white"
android:textSize="15sp" />
</LinearLayout>

31
app/src/main/res/layout/activity_friend_black_list_manage.xml
View File

@@ -3,44 +3,23 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<androidx.appcompat.widget.Toolbar
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_marginTop="@dimen/dp_23"
app:contentInsetEnd="0dp"
app:contentInsetStart="0dp">
<ImageView
android:id="@+id/iv_back"
android:layout_width="?attr/actionBarSize"
android:layout_height="?attr/actionBarSize"
android:layout_gravity="left"
android:padding="15dp"
android:src="@drawable/arrow_left" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="黑名单"
android:textAppearance="@style/Toolbar.TitleText" />
</androidx.appcompat.widget.Toolbar>
android:layout_marginTop="@dimen/dp_25" />
<com.yizhuan.erban.common.widget.StatusLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="5dp" />
android:layout_height="match_parent" />
</com.yizhuan.erban.common.widget.StatusLayout>
</LinearLayout>

2
app/src/main/res/layout/activity_list_attention.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
android:layout_marginTop="@dimen/dp_25"/>
<androidx.legacy.widget.Space
android:layout_width="match_parent"

80
app/src/main/res/layout/activity_modify_pwd.xml
View File

@@ -4,71 +4,73 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="click"
type="android.view.View.OnClickListener"/>
type="android.view.View.OnClickListener" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
android:layout_marginTop="@dimen/dp_25" />
<com.yizhuan.erban.ui.widget.SuperEditText
android:id="@+id/ed_current_pwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint_color="@color/color_CACACB"
app:text_color="@color/color_333333"
app:title_hint="原密码"
app:hint="请输入当前登录密码"/>
app:hint="请输入当前登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:title_hint="原密码" />
<com.yizhuan.erban.ui.widget.SuperEditText
android:id="@+id/ed_pwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint_color="@color/color_CACACB"
app:text_color="@color/color_333333"
app:title_hint="新密码"
app:hint="请输入新的登录密码"/>
app:hint="请输入新的登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:title_hint="新密码" />
<com.yizhuan.erban.ui.widget.SuperEditText
android:id="@+id/ed_sure_pwd"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:hint_color="@color/color_CACACB"
app:text_color="@color/color_333333"
app:title_hint="确认密码"
app:hint="再次确认新的登录密码"/>
app:hint="再次确认新的登录密码"
app:hint_color="@color/text_hint_555574"
app:text_color="@color/text_normal_c6c6e9"
app:title_hint="确认密码" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/container_code"
android:layout_marginTop="@dimen/dp_20"
android:layout_width="match_parent"
android:layout_height="wrap_content" >
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_20">
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/et_code_pay_pwd"
app:layout_constraintTop_toTopOf="parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="start|center_vertical"
android:inputType="number"
android:paddingBottom="20dp"
android:hint="@string/hint_require_code"
android:textColor="@color/color_333333"
android:textColorHint="@color/color_b3b3b3"
android:textSize="@dimen/dp_14"
android:layout_marginStart="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_25"
android:background="@null"
android:gravity="start|center_vertical"
android:hint="@string/hint_require_code"
android:inputType="number"
android:maxLength="16"
android:paddingBottom="20dp"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textSize="@dimen/dp_14"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="SpUsage" />
<Button
@@ -84,7 +86,7 @@
android:focusable="true"
android:onClick="@{click}"
android:text="@string/text_request_code"
android:textColor="@color/appColor"
android:textColor="@color/app_248cfe"
android:textSize="@dimen/dp_13"
app:layout_constraintBottom_toBottomOf="@+id/et_code_pay_pwd"
app:layout_constraintEnd_toEndOf="@+id/et_code_pay_pwd"
@@ -108,37 +110,37 @@
android:id="@+id/tv_password_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/dp_25"
android:layout_marginTop="@dimen/dp_10"
android:layout_marginStart="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_32"
android:text="@string/register_password_strong_tip"
android:textSize="@dimen/sp_12"
android:textColor="@color/color_999999"
/>
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_12" />
<TextView
android:id="@+id/btn_forget"
android:layout_gravity="end"
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_gravity="end"
android:layout_marginRight="30dp"
android:background="@color/transparent"
android:gravity="center"
android:onClick="@{click}"
android:text="忘记密码?"
android:textSize="13sp"
android:textColor="@color/color_D1D1D2" />
android:textColor="@color/text_normal_c6c6e9"
android:textSize="13sp" />
<Button
android:id="@+id/btn_commit"
android:layout_width="310dp"
android:layout_height="45dp"
android:layout_marginTop="20dp"
android:layout_gravity="center_horizontal"
android:background="@drawable/bg_common_confirm_normal"
android:layout_marginTop="20dp"
android:background="@drawable/bg_common_confirm"
android:clickable="true"
android:text="提交"
android:textSize="18sp"
android:enabled="true"
android:onClick="@{click}"/>
android:onClick="@{click}"
android:text="提交"
android:textSize="18sp" />
</LinearLayout>
</layout>

2
app/src/main/res/layout/activity_my_decoration.xml
View File

@@ -16,7 +16,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
app:contentInsetStart="0dp">
<ImageView

6
app/src/main/res/layout/activity_notice_setting.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -9,14 +9,14 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
app:layout_constraintTop_toTopOf="parent" />
<View
android:id="@+id/view_line"
android:layout_width="match_parent"
android:layout_height="1px"
android:background="@color/line_color"
android:background="@color/line_color_353548"
app:layout_constraintTop_toBottomOf="@id/title_bar" />
<LinearLayout

6
app/src/main/res/layout/activity_patriarch_pwd.xml
View File

@@ -18,14 +18,14 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"/>
android:layout_marginTop="@dimen/dp_25"/>
<TextView
android:id="@+id/tv_close_pm_tips"
android:textSize="25sp"
android:visibility="gone"
android:layout_marginTop="@dimen/dp_60"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:text="@string/text_pm_close_pwd"
android:layout_gravity="center_horizontal"
android:layout_width="wrap_content"
@@ -58,7 +58,7 @@
android:inputType="numberPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/color_666666"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="@dimen/sp_18"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp"

2
app/src/main/res/layout/activity_privacy_setting.xml
View File

@@ -9,7 +9,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
app:layout_constraintTop_toTopOf="parent" />
<View

2
app/src/main/res/layout/activity_setting.xml
View File

@@ -19,7 +19,7 @@
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23" />
android:layout_marginTop="@dimen/dp_25" />
<ScrollView
android:layout_width="match_parent"

70
app/src/main/res/layout/activity_show_bind_phone.xml
View File

@@ -4,61 +4,63 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
tools:context="com.yizhuan.erban.ui.login.ShowBindPhoneActivity">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="@dimen/dp_23">
</com.yizhuan.erban.base.TitleBar>
android:layout_marginTop="@dimen/dp_25"
app:layout_constraintTop_toTopOf="parent" />
<ImageView
android:id="@+id/phone_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_40"
app:layout_constraintTop_toBottomOf="@id/title_bar"
android:src="@drawable/icon_show_bind_phone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:src="@drawable/icon_show_bind_phone"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
app:layout_constraintTop_toBottomOf="@id/title_bar" />
<TextView
android:id="@+id/phone_tips"
android:textSize="@dimen/sp_14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
app:layout_constraintTop_toBottomOf="@id/phone_icon"
android:text="您当前绑定的手机号为"
android:textColor="@color/text_secondary_4f516a"
android:textSize="@dimen/sp_14"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:textColor="@color/color_999999"
android:text="您当前绑定的手机号为"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
app:layout_constraintTop_toBottomOf="@id/phone_icon" />
<TextView
android:id="@+id/tv_phone"
app:layout_constraintTop_toBottomOf="@id/phone_tips"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
tools:text="10010000000"
android:textColor="@color/appColor"
android:textSize="@dimen/sp_18"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<com.coorchice.library.SuperTextView
android:id="@+id/tv_change_phone"
android:text="更改手机号码"
android:gravity="center"
app:corner="@dimen/dp_40"
app:solid="@color/appColor"
android:textColor="@color/white"
android:layout_height="wrap_content"
android:textColor="@color/app_248cfe"
android:textSize="@dimen/sp_18"
android:layout_marginTop="@dimen/dp_36"
app:layout_constraintTop_toBottomOf="@id/tv_phone"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginStart="@dimen/dp_32"
android:layout_marginEnd="@dimen/dp_32"
app:layout_constraintTop_toBottomOf="@id/phone_tips"
tools:text="10010000000" />
<TextView
android:id="@+id/tv_change_phone"
android:layout_width="0dp"
android:layout_height="45dp" />
android:layout_height="45dp"
android:layout_marginStart="@dimen/dp_32"
android:layout_marginTop="@dimen/dp_36"
android:layout_marginEnd="@dimen/dp_32"
android:background="@drawable/bg_common_confirm"
android:gravity="center"
android:text="更改手机号码"
android:textColor="@color/text_title_white"
android:textSize="@dimen/sp_18"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_phone" />
</androidx.constraintlayout.widget.ConstraintLayout>

82
app/src/main/res/layout/activity_verify_phone.xml
View File

@@ -4,20 +4,22 @@
xmlns:tools="http://schemas.android.com/tools">
<data>
<variable
name="click"
type="android.view.View.OnClickListener"/>
type="android.view.View.OnClickListener" />
</data>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/bg_normal_1c1b22"
android:orientation="vertical"
tools:context="com.yizhuan.erban.ui.setting.VerifyPhoneActivity">
<com.yizhuan.erban.base.TitleBar
android:id="@+id/title_bar"
android:layout_marginTop="@dimen/dp_25"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
@@ -33,14 +35,14 @@
android:id="@+id/vs_phone_country"
android:layout_width="310dp"
android:layout_height="48dp"
android:layout="@layout/layout_phone_country_choose"/>
android:layout="@layout/layout_phone_country_choose" />
<View
android:id="@+id/v_divider_one"
android:layout_width="310dp"
android:layout_height="1px"
android:background="@color/color_F5F5F5"
android:visibility="gone"/>
android:visibility="gone" />
<RelativeLayout
android:layout_width="310dp"
@@ -51,36 +53,36 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textSize="14sp"
android:textColor="@color/color_999999"
android:text="+86"/>
android:text="+86"
android:textColor="@color/text_secondary_4f516a"
android:textSize="14sp" />
<EditText
android:id="@+id/et_phone"
android:layout_width="match_parent"
android:layout_marginStart="51dp"
android:layout_height="match_parent"
android:layout_centerVertical="true"
android:layout_marginStart="60dp"
android:layout_marginEnd="65dp"
android:background="@null"
android:gravity="center_vertical"
android:inputType="phone"
android:maxLength="11"
android:textColor="@color/text_color_primary"
android:textColorHint="@color/color_999999"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14sp" />
<Button
android:layout_alignParentEnd="true"
android:id="@+id/btn_get_code"
android:layout_width="wrap_content"
android:layout_height="29dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:background="@color/transparent"
android:clickable="true"
android:text="获取验证码"
android:background="@color/transparent"
android:textColor="@color/appColor"
android:textColor="@color/app_248cfe"
android:textSize="12sp" />
</RelativeLayout>
@@ -88,7 +90,7 @@
<View
android:layout_width="310dp"
android:layout_height="1px"
android:background="@color/color_F5F5F5" />
android:background="@color/line_color_353548" />
<RelativeLayout
android:layout_width="310dp"
@@ -98,23 +100,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/color_999999"
android:textSize="14sp"
android:text="验证码"/>
android:text="验证码:"
android:textColor="@color/text_secondary_4f516a"
android:textSize="14sp" />
<EditText
android:id="@+id/et_code"
android:layout_toStartOf="@+id/iv_code_delete"
android:layout_marginStart="122dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginStart="60dp"
android:layout_toStartOf="@+id/iv_code_delete"
android:background="@null"
android:inputType="number"
android:maxLength="5"
android:gravity="center_vertical"
android:hint="请输入验证码"
android:textColor="@color/text_color_primary"
android:textColorHint="@color/color_CCCCCC"
android:inputType="number"
android:maxLength="5"
android:textColor="@color/text_normal_c6c6e9"
android:textColorHint="@color/text_hint_555574"
android:textCursorDrawable="@null"
android:textSize="14sp" />
@@ -122,54 +124,38 @@
android:id="@+id/iv_code_delete"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:padding="10dp"
android:src="@drawable/ic_nick_delete"/>
android:src="@drawable/ic_nick_delete" />
</RelativeLayout>
<!--<LinearLayout-->
<!--android:id="@+id/code_layout"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="wrap_content"-->
<!--android:gravity="center_vertical"-->
<!--android:orientation="horizontal">-->
<!--<android.support.design.widget.TextInputLayout-->
<!--android:layout_width="0dp"-->
<!--android:layout_height="wrap_content"-->
<!--android:layout_weight="1"-->
<!--android:gravity="center_vertical"-->
<!--android:hint="请输入验证码">-->
<!--</android.support.design.widget.TextInputLayout>-->
<!--</LinearLayout>-->
<View
android:layout_width="310dp"
android:layout_height="1px"
android:background="@color/color_F5F5F5" />
android:background="@color/line_color_353548" />
<Button
android:id="@+id/btn_regist"
style="@style/largerText_primary"
android:layout_width="310dp"
android:layout_height="45dp"
android:layout_marginBottom="50dp"
android:layout_marginTop="56dp"
android:background="@drawable/bg_binding_button"
android:textSize="18sp"
android:textColor="@color/white"
android:layout_marginBottom="50dp"
android:background="@drawable/bg_common_confirm"
android:clickable="true"
android:text="下一步" />
android:text="下一步"
android:textColor="@color/text_title_white"
android:textSize="18sp" />
<TextView
android:id="@+id/text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="如果您的手机号已丢失\n请联系客服微信:xingqiu66kefu"
android:textColor="@color/color_999999"
android:textColor="@color/text_secondary_4f516a"
android:textSize="14sp" />
</LinearLayout>

2
app/src/main/res/layout/dialog_key_deficiency.xml
View File

@@ -40,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="41dp"
android:layout_marginRight="41dp"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:text="haha"
android:textColor="@color/color_666666"
android:textSize="15sp"

2
app/src/main/res/layout/fragment_dialog_room_title.xml
View File

@@ -27,7 +27,7 @@
<TextView
android:layout_below="@id/tv_title"
android:id="@+id/tv_dialog_desc"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginStart="28dp"
android:layout_marginEnd="28dp"
android:layout_marginBottom="28dp"

4
app/src/main/res/layout/include_layout_room_lable.xml
View File

@@ -10,7 +10,7 @@
android:id="@+id/iv_close_label"
android:src="@drawable/icon_close_labe"
android:layout_gravity="end"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginEnd="@dimen/dp_23"
android:layout_width="@dimen/dp_22"
android:layout_height="@dimen/dp_22" />
@@ -27,7 +27,7 @@
<TextView
android:layout_marginStart="46dp"
android:text="聊天"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:textColor="@color/white_transparent_50"
android:textSize="@dimen/sp_14"
android:layout_width="wrap_content"

2
app/src/main/res/layout/item_car_garage_normal.xml
View File

@@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:gravity="left"
android:layout_toEndOf="@+id/ll_car_cover"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginStart="10dp"
android:textColor="@color/color_333333"
android:singleLine="true"

9
app/src/main/res/layout/item_friend_black_list_manage.xml
View File

@@ -12,7 +12,7 @@
android:background="#F95654"
android:gravity="center"
android:text="移除"
android:textColor="#FFF"
android:textColor="@color/text_title_white"
android:textSize="15dp" />
@@ -20,13 +20,12 @@
android:id="@+id/rl_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/bg_normal_1c1b22">
<View
android:layout_width="match_parent"
android:layout_height="1px"
android:background="#f0f0f0"
tools:background="#FF0" />
android:background="@color/line_color_353548" />
<ImageView
android:id="@+id/iv_avatar"
@@ -43,7 +42,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:layout_toRightOf="@id/iv_avatar"
android:textColor="#333333"
android:textColor="@color/text_title_white"
android:textSize="15dp"
tools:text="单刀也学士" />

5
app/src/main/res/layout/item_system_notice.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:background="@color/white"
android:layout_height="@dimen/dp_setting_sys_notice_item_height"
xmlns:tools="http://schemas.android.com/tools">
@@ -17,7 +16,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text="名称"
android:textColor="@color/color_333333"
android:textColor="@color/text_title_white"
android:textSize="14sp" />
<TextView
@@ -26,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
tools:text="描述"
android:textColor="@color/color_b3b3b3"
android:textColor="@color/text_normal_c6c6e9"
android:textSize="12sp" />
</LinearLayout>

2
app/src/main/res/layout/layout_total_reward.xml
View File

@@ -7,7 +7,7 @@
<com.yizhuan.erban.radish.signin.view.RewardProgressView
android:id="@+id/reward_progress_view"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginStart="46dp"
android:layout_marginEnd="46dp"
android:layout_width="match_parent"

2
app/src/module_bank_card/res/layout/item_nameplate_normal.xml
View File

@@ -38,7 +38,7 @@
android:textColor="@color/color_333333"
android:singleLine="true"
android:layout_toEndOf="@+id/ll_nameplate_cover"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginStart="10dp"
android:drawablePadding="5dp"
android:textSize="15sp"

3
app/src/module_bank_card/res/layout/item_room_collection.xml
View File

@@ -7,7 +7,7 @@
android:layout_height="wrap_content"
tools:background="@color/bg_normal_1c1b22">
<com.yizhuan.erban.common.widget.RectRoundImageView
<com.yizhuan.erban.common.widget.CircleImageView
android:id="@+id/rriv_room_img"
android:layout_width="@dimen/dp_45"
android:layout_height="@dimen/dp_45"
@@ -16,7 +16,6 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:type="circle"
tools:src="@drawable/default_avatar" />
<LinearLayout

2
app/src/module_music/res/layout/activity_add_music_list.xml
View File

@@ -147,7 +147,7 @@
android:layout_height="44dp"
android:layout_below="@id/tv_tips_empty"
android:layout_centerHorizontal="true"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:background="@drawable/bg_binding_button"
android:gravity="center"
android:text="添加共享音乐"

4
app/src/module_music/res/layout/layout_bg_music_empty.xml
View File

@@ -36,7 +36,7 @@
android:layout_height="44dp"
android:layout_below="@id/tv_share_music_option"
android:layout_centerHorizontal="true"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:background="@drawable/bg_binding_button"
android:gravity="center"
android:text="扫描本地音乐"
@@ -49,7 +49,7 @@
android:layout_height="44dp"
android:layout_below="@id/tv_tips_empty"
android:layout_centerHorizontal="true"
android:layout_marginTop="23dp"
android:layout_marginTop="@dimen/dp_25"
android:background="@drawable/bg_binding_button"
android:gravity="center"
android:text="添加共享音乐"

2
app/src/module_room_chat/res/layout/activity_room_invite_fans.xml
View File

@@ -38,7 +38,7 @@
android:layout_marginEnd="30dp"
android:textColor="@color/color_666666"
android:textSize="@dimen/dp_12"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
/>
<TextView
android:layout_width="wrap_content"

2
app/src/module_treasure_box/res/layout/activity_box_help.xml
View File

@@ -44,7 +44,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginLeft="6dp"
android:src="@drawable/box_help_title"
app:layout_constraintLeft_toRightOf="@+id/iv_icon"

2
app/src/module_treasure_box/res/layout/activity_box_prize.xml
View File

@@ -48,7 +48,7 @@
android:id="@+id/iv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginLeft="6dp"
android:src="@drawable/box_prize_title"
app:layout_constraintLeft_toRightOf="@+id/iv_icon"

2
app/src/module_treasure_box/res/layout/activity_box_prize_record.xml
View File

@@ -43,7 +43,7 @@
android:id="@+id/iv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginLeft="6dp"
android:src="@drawable/box_prize_record_title"
app:layout_constraintLeft_toRightOf="@+id/iv_icon"

2
app/src/module_treasure_box/res/layout/activity_honour_box_prize.xml
View File

@@ -48,7 +48,7 @@
android:id="@+id/iv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginLeft="6dp"
android:src="@drawable/box_prize_title"
app:layout_constraintLeft_toRightOf="@+id/iv_icon"

2
app/src/module_treasure_box/res/layout/activity_honour_box_prize_record.xml
View File

@@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_gravity="center"
android:layout_marginTop="@dimen/dp_23"
android:layout_marginTop="@dimen/dp_25"
android:layout_marginLeft="6dp"
android:src="@drawable/box_prize_record_title"
app:layout_constraintLeft_toRightOf="@+id/iv_icon"