androidOne/qianyanAndroid
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

登录注册UI修改

Browse Source
This commit is contained in:
被淹死的鱼
2026-03-12 20:03:06 +08:00
parent c0886ed587
commit 21b61b2577
12 changed files with 443 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/com/fengliyan/tianlesue/view/login/ForgetActivity.java
View File

@@ -87,8 +87,9 @@ public class ForgetActivity extends BaseActivity implements View.OnClickListener
public void onCreate(Bundle savedInstanceState){ public void onCreate(Bundle savedInstanceState){
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_forget); setContentView(R.layout.activity_forget);
setTitleName("找回密码"); // setTitleName("找回密码");
setDefaultTitle(); // setDefaultTitle();
hideTitleBar();
initPicCode(); initPicCode();
dissmissTitleBottomLine(); dissmissTitleBottomLine();
initView(); initView();
@@ -140,6 +141,13 @@ public class ForgetActivity extends BaseActivity implements View.OnClickListener
} }
} }
}); });
findViewById(R.id.rl_return).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
finish();
}
});
} }
@Override @Override

8
app/src/main/java/com/fengliyan/tianlesue/view/login/LoginActivity.java
View File

@@ -89,6 +89,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
public static int REQUEST_INFO = 202; public static int REQUEST_INFO = 202;
private TextView tv_login_sms; private TextView tv_login_sms;
private TextView tv_login_pw; private TextView tv_login_pw;
private View tv_login_sms_line;
private View tv_login_pw_line;
private LinearLayout lin_sms_login; private LinearLayout lin_sms_login;
private CaiEditText login_sms_phone_number_layout; private CaiEditText login_sms_phone_number_layout;
private CaiEditText login_vcode; private CaiEditText login_vcode;
@@ -210,6 +212,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
private void initView() { private void initView() {
tv_login_sms = findViewById(R.id.tv_login_sms); tv_login_sms = findViewById(R.id.tv_login_sms);
tv_login_pw = findViewById(R.id.tv_login_pw); tv_login_pw = findViewById(R.id.tv_login_pw);
tv_login_sms_line = findViewById(R.id.tv_login_sms_line);
tv_login_pw_line = findViewById(R.id.tv_login_pw_line);
lin_sms_login = findViewById(R.id.lin_sms_login); lin_sms_login = findViewById(R.id.lin_sms_login);
login_sms_phone_number_layout = findViewById(R.id.login_sms_phone_number_layout); login_sms_phone_number_layout = findViewById(R.id.login_sms_phone_number_layout);
login_vcode = findViewById(R.id.login_vcode); login_vcode = findViewById(R.id.login_vcode);
@@ -306,6 +310,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
tv_login_pw.setTextColor(ContextCompat.getColor(this, R.color.three_text)); tv_login_pw.setTextColor(ContextCompat.getColor(this, R.color.three_text));
tv_login_sms.setBackgroundResource(R.drawable.white_bg_40); tv_login_sms.setBackgroundResource(R.drawable.white_bg_40);
tv_login_sms.setTextColor(ContextCompat.getColor(this, R.color.one_text)); tv_login_sms.setTextColor(ContextCompat.getColor(this, R.color.one_text));
tv_login_sms_line.setVisibility(View.VISIBLE);
tv_login_pw_line.setVisibility(View.INVISIBLE);
lin_sms_login.setVisibility(View.VISIBLE); lin_sms_login.setVisibility(View.VISIBLE);
lin_password_login.setVisibility(View.GONE); lin_password_login.setVisibility(View.GONE);
initLoginBtnEnabled(); initLoginBtnEnabled();
@@ -315,6 +321,8 @@ public class LoginActivity extends BaseActivity implements View.OnClickListener,
tv_login_sms.setTextColor(ContextCompat.getColor(this, R.color.three_text)); tv_login_sms.setTextColor(ContextCompat.getColor(this, R.color.three_text));
tv_login_pw.setBackgroundResource(R.drawable.white_bg_40); tv_login_pw.setBackgroundResource(R.drawable.white_bg_40);
tv_login_pw.setTextColor(ContextCompat.getColor(this, R.color.one_text)); tv_login_pw.setTextColor(ContextCompat.getColor(this, R.color.one_text));
tv_login_sms_line.setVisibility(View.INVISIBLE);
tv_login_pw_line.setVisibility(View.VISIBLE);
lin_sms_login.setVisibility(View.GONE); lin_sms_login.setVisibility(View.GONE);
lin_password_login.setVisibility(View.VISIBLE); lin_password_login.setVisibility(View.VISIBLE);
initLoginBtnEnabled(); initLoginBtnEnabled();

4
app/src/main/res/drawable/edit_change_avatar.xml
View File

@@ -3,8 +3,8 @@
android:shape="rectangle"> android:shape="rectangle">
<gradient <gradient
android:endColor="#925BF7" android:endColor="#EB6969"
android:startColor="#E69EFF" /> android:startColor="#EA6FEE" />
<corners <corners
android:bottomRightRadius="12dp" android:bottomRightRadius="12dp"
android:topLeftRadius="12dp" /> android:topLeftRadius="12dp" />

BIN
app/src/main/res/drawable/onkeylogin_bg.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 85 KiB

After

Width:  |  Height:  |  Size: 90 KiB

4
app/src/main/res/drawable/shape_button_disable_v2.xml
View File

@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<gradient android:angle="0" <gradient android:angle="0"
android:startColor="#B9C2FF" android:startColor="#F9CBFA"
android:endColor="#CAADFF"/> android:endColor="#FDC1C1"/>
<!--<solid android:color="@color/yellow_ffd33e"/>--> <!--<solid android:color="@color/yellow_ffd33e"/>-->

4
app/src/main/res/drawable/shape_button_enable.xml
View File

@@ -2,8 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle"> android:shape="rectangle">
<gradient android:angle="0" <gradient android:angle="0"
android:startColor="#E69EFF" android:startColor="#EA6FEE"
android:endColor="#925BF7"/> android:endColor="#EB6969"/>
<!--<solid android:color="@color/yellow_ffd33e"/>--> <!--<solid android:color="@color/yellow_ffd33e"/>-->

50
app/src/main/res/layout/activity_forget.xml
View File

@@ -5,7 +5,52 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:viewBindingIgnore="true" tools:viewBindingIgnore="true"
xmlns:cai="http://schemas.android.com/apk/res-auto" xmlns:cai="http://schemas.android.com/apk/res-auto"
android:background="@color/colorPrimary"> android:background="@drawable/onkeylogin_bg">
<RelativeLayout
android:id="@+id/rl_return"
android:layout_width="@dimen/dp60"
android:layout_height="@dimen/dp60"
android:layout_marginLeft="@dimen/dp10"
android:layout_marginTop="@dimen/dp30"
>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:src="@drawable/ic_return"/>
</RelativeLayout>
<TextView
android:id="@+id/tv_big_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp20"
android:textSize="@dimen/dp28"
android:layout_below="@+id/rl_return"
android:layout_marginTop="@dimen/dp30"
android:text="忘记密码"
android:textColor="@color/black"/>
<TextView
android:id="@+id/tv_small_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp20"
android:textSize="@dimen/dp15"
android:layout_below="@+id/tv_big_title"
android:text="请牢记密码"
android:textColor="@color/three_text"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_small_title">
<TextView <TextView
android:id="@+id/forget_phone_num_title" android:id="@+id/forget_phone_num_title"
@@ -190,3 +235,6 @@
android:text="确定"/> android:text="确定"/>
</RelativeLayout> </RelativeLayout>
</RelativeLayout>

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

@@ -55,7 +55,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:text="上传真实头像，更容易获得异性喜欢" android:text="上传真实头像，更容易获得异性喜欢"
android:textColor="#925BF7" android:textColor="#E472ED"
android:textSize="12sp" android:textSize="12sp"
android:textStyle="bold" /> android:textStyle="bold" />

208
app/src/main/res/layout/activity_login.xml
View File

@@ -26,23 +26,28 @@
android:src="@drawable/ic_return" android:src="@drawable/ic_return"
android:visibility="gone" /> android:visibility="gone" />
<!-- android:background="@drawable/login_top_bg" -->
<LinearLayout <LinearLayout
android:id="@+id/lin_login_type" android:id="@+id/lin_login_type_title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/login_logo" android:layout_below="@+id/login_logo"
android:layout_marginStart="16dp" android:layout_marginStart="@dimen/dp20"
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
android:background="@drawable/login_top_bg"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_login_sms" android:id="@+id/tv_login_sms"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="6dp" android:layout_margin="6dp"
android:layout_weight="1"
android:gravity="center" android:gravity="center"
android:minHeight="35dp" android:minHeight="35dp"
android:text="短信登录" android:text="短信登录"
@@ -50,25 +55,92 @@
android:textSize="16dp" android:textSize="16dp"
android:textStyle="bold" /> android:textStyle="bold" />
<View
android:id="@+id/tv_login_sms_line"
android:layout_width="@dimen/dp25"
android:layout_height="@dimen/dp5"
android:layout_gravity="center"
android:visibility="invisible"
android:background="@drawable/shape_button_enable"
android:gravity="center" />
</LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp45"
android:orientation="vertical">
<TextView <TextView
android:id="@+id/tv_login_pw" android:id="@+id/tv_login_pw"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="6dp" android:layout_marginTop="6dp"
android:layout_weight="1" android:layout_marginBottom="6dp"
android:background="@drawable/white_bg_40"
android:gravity="center" android:gravity="center"
android:minHeight="35dp" android:minHeight="35dp"
android:text="密码登录" android:text="密码登录"
android:textColor="@color/one_text" android:textColor="@color/one_text"
android:textSize="16dp" android:textSize="16dp"
android:textStyle="bold" /> android:textStyle="bold" />
<View
android:id="@+id/tv_login_pw_line"
android:layout_width="@dimen/dp25"
android:layout_height="@dimen/dp5"
android:layout_gravity="center"
android:background="@drawable/shape_button_enable"
android:gravity="center" />
</LinearLayout>
</LinearLayout>
<!--<LinearLayout
android:id="@+id/lin_login_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lin_login_type_title"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:orientation="horizontal">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<View
android:id="@+id/tv_login_sms"
android:layout_width="@dimen/dp25"
android:layout_height="@dimen/dp5"
android:background="@drawable/shape_button_enable"
android:gravity="center" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/lin_login_type" android:layout_gravity="center"
android:layout_weight="1"
android:gravity="center"
android:orientation="vertical">
<View
android:id="@+id/tv_login_pw"
android:layout_width="@dimen/dp25"
android:layout_height="@dimen/dp5"
android:background="@drawable/shape_button_enable"
android:gravity="center" />
</LinearLayout>
</LinearLayout>-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lin_login_type_title"
android:layout_marginTop="30dp" android:layout_marginTop="30dp"
android:orientation="vertical"> android:orientation="vertical">
@@ -76,47 +148,60 @@
android:id="@+id/lin_sms_login" android:id="@+id/lin_sms_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="48dp" android:layout_marginStart="@dimen/dp20"
android:layout_marginEnd="48dp" android:layout_marginEnd="@dimen/dp20"
android:orientation="vertical" android:orientation="vertical"
android:visibility="gone"> android:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:orientation="horizontal">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="短信登录" android:layout_gravity="center"
android:textColor="@color/one_text" android:text="手机号"
android:textSize="16dp" android:textColor="@color/three_text"
android:textStyle="bold" /> android:textSize="14sp" />
<com.fengliyan.uikit.editor.CaiEditText <com.fengliyan.uikit.editor.CaiEditText
android:id="@+id/login_sms_phone_number_layout" android:id="@+id/login_sms_phone_number_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginTop="8dp" android:layout_marginLeft="@dimen/dp14"
android:gravity="center_vertical" android:gravity="center_vertical"
cai:edit_type="phone" cai:edit_type="phone"
cai:hint="请输入手机号" cai:hint="请输入手机号"
cai:right_img="@drawable/ic_sign_input1" /> cai:right_img="@drawable/ic_sign_input1" />
</LinearLayout>
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:background="#8D73EE" /> android:background="#8D73EE" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="28dp"
android:text="短信验证码"
android:textColor="@color/one_text"
android:textSize="16dp"
android:textStyle="bold" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="验证码"
android:textColor="@color/three_text"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp14"
android:gravity="center_vertical" android:gravity="center_vertical"
android:orientation="horizontal"> android:orientation="horizontal">
@@ -132,11 +217,14 @@
<TextView <TextView
android:id="@+id/tv_send_code" android:id="@+id/tv_send_code"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="@dimen/dp25"
android:background="@drawable/shape_button_enable"
android:gravity="center" android:gravity="center"
android:text="获取" android:paddingHorizontal="@dimen/dp8"
android:textColor="#8D73EE" android:text="获取验证码"
android:textSize="14dp" /> android:textColor="@color/white"
android:textSize="12dp" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<View <View
@@ -149,57 +237,81 @@
android:id="@+id/lin_password_login" android:id="@+id/lin_password_login"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:layout_marginHorizontal="@dimen/dp20"
android:orientation="vertical"
>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="手机号"
android:textColor="#999999"
android:textSize="14sp" />
<com.fengliyan.uikit.editor.CaiEditText <com.fengliyan.uikit.editor.CaiEditText
android:id="@+id/login_phone_number_layout" android:id="@+id/login_phone_number_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginLeft="48dp" android:layout_marginLeft="@dimen/dp14"
android:layout_marginRight="48dp"
android:gravity="center_vertical" android:gravity="center_vertical"
cai:edit_type="phone" cai:edit_type="phone"
cai:hint="请输入手机号" cai:hint="请输入手机号"
cai:left_img="@mipmap/login_phone" cai:left_img="@null"
cai:left_img_enable="true" cai:left_img_enable="true"
cai:right_img="@drawable/ic_sign_input1" /> cai:right_img="@drawable/ic_sign_input1" />
</LinearLayout>
<View <View
android:id="@+id/login_phone_number_line" android:id="@+id/login_phone_number_line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:layout_marginLeft="48dp" android:background="#DDDDDD" />
android:layout_marginRight="48dp"
android:background="#8D73EE" /> <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="密码"
android:textColor="#999999"
android:textSize="14sp" />
<com.fengliyan.uikit.editor.CaiEditText <com.fengliyan.uikit.editor.CaiEditText
android:id="@+id/login_password_layout" android:id="@+id/login_password_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_marginLeft="48dp" android:layout_marginLeft="@dimen/dp25"
android:layout_marginTop="12dp"
android:layout_marginRight="48dp"
android:gravity="center_vertical" android:gravity="center_vertical"
android:paddingLeft="4dp"
cai:edit_type="textPassword" cai:edit_type="textPassword"
cai:hint="请输入密码" cai:hint="请输入密码"
cai:left_img="@mipmap/login_password" cai:left_img="@null"
cai:left_img_enable="true" cai:left_img_enable="true"
cai:right_img="@drawable/ic_sign_input2" /> cai:right_img="@drawable/ic_sign_input2" />
</LinearLayout>
<View <View
android:id="@+id/login_password_line" android:id="@+id/login_password_line"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:layout_marginLeft="48dp" android:background="#DDDDDD" />
android:layout_marginRight="48dp"
android:background="#8D73EE" />
<RelativeLayout <RelativeLayout
android:id="@+id/login_menu_layout" android:id="@+id/login_menu_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="@dimen/dp14"
android:gravity="center_vertical"> android:gravity="center_vertical">
<TextView <TextView
@@ -207,7 +319,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentLeft="true" android:layout_alignParentLeft="true"
android:layout_marginLeft="48dp"
android:text="忘记密码?" android:text="忘记密码?"
android:textColor="#333333" android:textColor="#333333"
android:textSize="14sp" /> android:textSize="14sp" />
@@ -217,7 +328,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_alignParentRight="true"
android:layout_marginRight="48dp"
android:text="注册" android:text="注册"
android:textColor="@color/mainColors" android:textColor="@color/mainColors"
android:textSize="14sp" /> android:textSize="14sp" />

BIN
app/src/main/res/mipmap-xhdpi/check_check.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

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

@@ -8,7 +8,7 @@
<!--登陆页用色--> <!--登陆页用色-->
<color name="loginLine">#cccccc</color> <color name="loginLine">#cccccc</color>
<color name="loginText">#333333</color> <color name="loginText">#333333</color>
<color name="mainColor">#6B2CC4</color> <color name="mainColor">#E472ED</color>
<color name="loginText2">#999999</color> <color name="loginText2">#999999</color>
<color name="loginGradientStart">#2bb1f8</color> <color name="loginGradientStart">#2bb1f8</color>
<color name="loginGradientEnd">#1976e8</color> <color name="loginGradientEnd">#1976e8</color>

2
uikit/src/main/res/values/color.xml
View File

@@ -30,7 +30,7 @@
<color name="gradientStart">#FF828B</color> <color name="gradientStart">#FF828B</color>
<color name="gradientEnd">#F32B2B</color> <color name="gradientEnd">#F32B2B</color>
<color name="editNotifiction">#2A2A2A</color> <color name="editNotifiction">#2A2A2A</color>
<color name="mainColors">#6B2CC4</color> <color name="mainColors">#E472ED</color>
<!-- 消息对话框的颜色--> <!-- 消息对话框的颜色-->
<color name="base_dialog_progress_bg">#cccccc</color> <color name="base_dialog_progress_bg">#cccccc</color>