panqihua
/
pocketcommunityclient
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

更新登录注册UI

Browse Source
master
JevinHu 5 years ago
parent 6eda0c03b9
commit c9e527c6ea
18 changed files with 368 additions and 223 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      app/build.gradle
  2. 3
      app/src/main/java/com/community/pocket/ui/login/LoginActivity.java
  3. 6
      app/src/main/java/com/community/pocket/ui/register/RegisterActivity.java
  4. 3
      app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep1.java
  5. 5
      app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep2.java
  6. 3
      app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep3.java
  7. 6
      app/src/main/res/drawable/bg_round_main.xml
  8. 118
      app/src/main/res/layout/activity_login.xml
  9. 215
      app/src/main/res/layout/activity_register.xml
  10. 73
      app/src/main/res/layout/resetpwd/layout/step1.xml
  11. 86
      app/src/main/res/layout/resetpwd/layout/step2.xml
  12. 71
      app/src/main/res/layout/resetpwd/layout/step3.xml
  13. BIN
      app/src/main/res/mipmap-mdpi/bg_login.png
  14. BIN
      app/src/main/res/mipmap-mdpi/ic_clock.png
  15. BIN
      app/src/main/res/mipmap-mdpi/ic_email.png
  16. BIN
      app/src/main/res/mipmap-mdpi/ic_register.png
  17. BIN
      app/src/main/res/mipmap-mdpi/ic_tel.png
  18. BIN
      app/src/main/res/mipmap-mdpi/ic_user.png

2
app/build.gradle
Unescape View File

@ -121,4 +121,6 @@ dependencies {
implementation 'com.youth.banner:banner:2.0.7' implementation 'com.youth.banner:banner:2.0.7'
implementation 'de.hdodenhof:circleimageview:3.1.0' implementation 'de.hdodenhof:circleimageview:3.1.0'
implementation 'com.rengwuxian.materialedittext:library:2.1.4'
} }

3
app/src/main/java/com/community/pocket/ui/login/LoginActivity.java
Unescape View File

@ -10,6 +10,7 @@ import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import androidx.annotation.RequiresApi; import androidx.annotation.RequiresApi;
@ -70,7 +71,7 @@ public class LoginActivity extends BaseActivity {
private ProgressBar loadingProgressBar; private ProgressBar loadingProgressBar;
@ViewInject(R.id.login_layout) @ViewInject(R.id.login_layout)
private ConstraintLayout layout; private LinearLayout layout;
private MutableLiveData<Boolean> bool = new MutableLiveData<>(); private MutableLiveData<Boolean> bool = new MutableLiveData<>();

6
app/src/main/java/com/community/pocket/ui/register/RegisterActivity.java
Unescape View File

@ -6,8 +6,8 @@ import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.lifecycle.Observer; import androidx.lifecycle.Observer;
@ -55,7 +55,7 @@ public class RegisterActivity extends BaseActivity {
//注册按钮 //注册按钮
@ViewInject(R.id.register) @ViewInject(R.id.register)
private Button registerButton; private TextView registerButton;
@Override @Override
protected void onCreate(@Nullable Bundle savedInstanceState) { protected void onCreate(@Nullable Bundle savedInstanceState) {
@ -136,7 +136,7 @@ public class RegisterActivity extends BaseActivity {
@Event(value = R.id.back) @Event(value = R.id.back)
private void back(View v) { private void back(View v) {
startActivity(new Intent(this, LoginActivity.class)); // startActivity(new Intent(this, LoginActivity.class));
finish(); finish();
} }
} }

3
app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep1.java
Unescape View File

@ -9,6 +9,7 @@ import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -46,7 +47,7 @@ public class ResetPwdStep1 extends BaseFragment {
private ResetPwdViewModel resetPwdViewModel; private ResetPwdViewModel resetPwdViewModel;
@ViewInject(R.id.next) @ViewInject(R.id.next)
private Button resetpwdButton; private TextView resetpwdButton;
@Override @Override
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {

5
app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep2.java
Unescape View File

@ -7,6 +7,7 @@ import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -45,11 +46,11 @@ public class ResetPwdStep2 extends BaseFragment {
//发送验证码按钮 //发送验证码按钮
@ViewInject(R.id.sendcode) @ViewInject(R.id.sendcode)
private Button sendCode; private TextView sendCode;
//下一步按钮 //下一步按钮
@ViewInject(R.id.next) @ViewInject(R.id.next)
private Button next; private TextView next;
private ResetPwdViewModel resetPwdViewModel; private ResetPwdViewModel resetPwdViewModel;

3
app/src/main/java/com/community/pocket/ui/resetpwd/ResetPwdStep3.java
Unescape View File

@ -8,6 +8,7 @@ import android.text.TextWatcher;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -46,7 +47,7 @@ public class ResetPwdStep3 extends BaseFragment {
//重置密码按钮 //重置密码按钮
@ViewInject(R.id.reset_pwd) @ViewInject(R.id.reset_pwd)
private Button resetpwdButton; private TextView resetpwdButton;
private ResetPwdViewModel resetPwdViewModel; private ResetPwdViewModel resetPwdViewModel;

6
app/src/main/res/drawable/bg_round_main.xml
Unescape View File

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

118
app/src/main/res/layout/activity_login.xml
Unescape View File

@ -11,46 +11,62 @@
android:id="@+id/titlebar" android:id="@+id/titlebar"
layout="@layout/titlebar_layout" layout="@layout/titlebar_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" />
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/login_layout" android:id="@+id/login_layout"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:visibility="gone" android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titlebar"> app:layout_constraintTop_toTopOf="parent">
<ImageView
android:id="@+id/imageView"
android:layout_width="300dp"
android:layout_height="230dp"
android:layout_marginTop="60dp"
android:src="@mipmap/bg_login"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/username" android:id="@+id/username"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/prompt_user" android:hint="@string/prompt_user"
android:importantForAutofill="no"
android:inputType="text" android:inputType="text"
android:selectAllOnFocus="true" android:layout_marginTop="20dp"
app:layout_constraintEnd_toStartOf="@id/login_to_resetPwd" android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
app:met_iconLeft="@mipmap/ic_user"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/imageView"
app:met_floatingLabel="highlight" />
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/password" android:id="@+id/password"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:hint="@string/prompt_password" android:hint="@string/prompt_password"
android:imeActionLabel="@string/action_sign_in_short" android:imeActionLabel="@string/action_sign_in_short"
android:importantForAutofill="no"
android:inputType="textPassword" android:inputType="textPassword"
app:met_iconLeft="@mipmap/ic_clock"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/username" /> app:layout_constraintTop_toBottomOf="@id/username"
app:met_floatingLabel="highlight" />
<ProgressBar <ProgressBar
android:id="@+id/loading" android:id="@+id/loading"
@ -62,43 +78,69 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/password" /> app:layout_constraintTop_toBottomOf="@id/password" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="0dp" <LinearLayout
android:id="@+id/register"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal"
android:layout_marginTop="32dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/loading"> app:layout_constraintTop_toBottomOf="@+id/loading">
<ImageView
android:layout_width="30dp"
android:layout_height="30dp"
android:src="@mipmap/ic_register"
app:layout_constraintBottom_toBottomOf="@+id/register"
app:layout_constraintEnd_toStartOf="@+id/register"
app:layout_constraintTop_toTopOf="@+id/register" />
<Button <TextView
android:id="@+id/login"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/size_50" android:enabled="true"
android:enabled="false" android:paddingTop="4dp"
android:text="@string/action_sign_in" android:paddingBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" android:text="@string/action_register" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> <TextView
android:layout_width="1dp"
android:layout_height="16dp"
android:background="#999999"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" />
<Button <TextView
android:id="@+id/register" android:id="@+id/login_to_resetPwd"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/size_50" android:padding="4dp"
android:enabled="true" android:text="@string/action_reset_password"
android:text="@string/action_register"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintStart_toStartOf="parent"
</androidx.constraintlayout.widget.ConstraintLayout> app:layout_constraintTop_toBottomOf="@+id/password" />
</LinearLayout>
<Button <TextView
android:id="@+id/login_to_resetPwd" android:id="@+id/login"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/action_reset_password" android:layout_marginLeft="44dp"
android:layout_marginRight="44dp"
android:layout_marginTop="20dp"
android:background="@drawable/bg_round_main"
android:enabled="false"
android:gravity="center"
android:padding="8dp"
android:text="@string/action_sign_in"
android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/username" /> app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/register" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

215
app/src/main/res/layout/activity_register.xml
Unescape View File

@ -12,113 +12,150 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<androidx.constraintlayout.widget.ConstraintLayout <ScrollView
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent">
android:layout_gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/titlebar">
<EditText
android:id="@+id/username"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:importantForAutofill="no"
android:hint="@string/prompt_user"
android:inputType="text"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<EditText
android:id="@+id/password"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:importantForAutofill="no"
android:hint="@string/prompt_password"
android:inputType="text|textPassword"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/username" />
<EditText <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/confirmPassword" android:layout_width="match_parent"
android:layout_width="0dp" android:layout_height="match_parent">
android:layout_height="wrap_content"
<ImageView
android:id="@+id/imageView"
android:layout_width="300dp"
android:layout_height="230dp"
android:layout_marginTop="60dp"
android:src="@mipmap/bg_login"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
android:layout_marginTop="8dp"
android:importantForAutofill="no"
android:hint="@string/prompt_confirm_password"
android:inputType="text|textPassword"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/password" />
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/phone" android:id="@+id/username"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:hint="@string/prompt_user"
android:importantForAutofill="no"
android:inputType="text"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView"
app:met_floatingLabel="highlight"
app:met_iconLeft="@mipmap/ic_user" />
android:layout_marginTop="8dp" <com.rengwuxian.materialedittext.MaterialEditText
android:importantForAutofill="no" android:id="@+id/password"
android:hint="@string/prompt_phone" android:layout_width="0dp"
android:inputType="text|phone" android:layout_height="wrap_content"
android:selectAllOnFocus="true" android:layout_marginStart="44dp"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="8dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginEnd="44dp"
app:layout_constraintTop_toBottomOf="@id/confirmPassword" /> android:hint="@string/prompt_password"
android:importantForAutofill="no"
android:inputType="text|textPassword"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/username"
app:met_floatingLabel="highlight"
app:met_iconLeft="@mipmap/ic_clock" />
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:id="@+id/email" android:id="@+id/confirmPassword"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="44dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="44dp"
android:hint="@string/prompt_confirm_password"
android:importantForAutofill="no"
android:inputType="text|textPassword"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/password"
app:met_floatingLabel="highlight"
app:met_iconLeft="@mipmap/ic_clock" />
android:layout_marginTop="8dp" <com.rengwuxian.materialedittext.MaterialEditText
android:importantForAutofill="no" android:id="@+id/phone"
android:hint="@string/prompt_email" android:layout_width="0dp"
android:inputType="none|textEmailAddress" android:layout_height="wrap_content"
android:selectAllOnFocus="true" android:layout_marginStart="44dp"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginTop="8dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginEnd="44dp"
app:layout_constraintTop_toBottomOf="@id/phone" /> android:hint="@string/prompt_phone"
android:importantForAutofill="no"
android:inputType="text|phone"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/confirmPassword"
app:met_floatingLabel="highlight"
app:met_iconLeft="@mipmap/ic_tel" />
<androidx.constraintlayout.widget.ConstraintLayout <com.rengwuxian.materialedittext.MaterialEditText
android:layout_width="0dp" android:id="@+id/email"
android:layout_height="wrap_content" android:layout_width="0dp"
android:layout_marginTop="8dp" android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent" android:layout_marginStart="44dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginTop="8dp"
app:layout_constraintTop_toBottomOf="@id/email"> android:layout_marginEnd="44dp"
android:hint="@string/prompt_email"
android:importantForAutofill="no"
android:inputType="none|textEmailAddress"
android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/phone"
app:met_floatingLabel="highlight"
app:met_iconLeft="@mipmap/ic_email" />
<Button <TextView
android:id="@+id/register" android:id="@+id/register"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/size_50" android:layout_marginStart="44dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="16dp"
android:background="@drawable/bg_round_main"
android:enabled="false" android:enabled="false"
android:gravity="center"
android:padding="8dp"
android:text="@string/action_register" android:text="@string/action_register"
app:layout_constraintBottom_toBottomOf="parent" android:textColor="@android:color/white"
app:layout_constraintEnd_toStartOf="@+id/guideline"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toBottomOf="@+id/email" />
<Button <TextView
android:id="@+id/back" android:id="@+id/back"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/size_50" android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="44dp"
android:background="@drawable/bg_round_main"
android:gravity="center"
android:padding="8dp"
android:text="@string/action_back" android:text="@string/action_back"
app:layout_constraintBottom_toBottomOf="parent" android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="@+id/guideline"
app:layout_constraintTop_toBottomOf="@+id/email" />
<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.5" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </ScrollView>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

73
app/src/main/res/layout/resetpwd/layout/step1.xml
Unescape View File

@ -6,60 +6,75 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.resetpwd.ResetPwdStep1"> tools:context=".ui.resetpwd.ResetPwdStep1">
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:id="@+id/username" android:id="@+id/username"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAutofill="no" android:importantForAutofill="no"
android:hint="@string/prompt_user" android:hint="@string/prompt_user"
android:inputType="text" android:inputType="text"
app:met_iconLeft="@mipmap/ic_user"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:layout_marginTop="8dp"
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:id="@+id/email" android:id="@+id/email"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:importantForAutofill="no" android:importantForAutofill="no"
android:hint="@string/prompt_email" android:hint="@string/prompt_email"
app:met_iconLeft="@mipmap/ic_email"
android:inputType="text|textEmailAddress" android:inputType="text|textEmailAddress"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/username" /> app:layout_constraintTop_toBottomOf="@id/username" />
<androidx.constraintlayout.widget.ConstraintLayout <TextView
android:id="@+id/next"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="44dp"
android:background="@drawable/bg_round_main"
android:enabled="false"
android:gravity="center"
android:padding="8dp"
android:text="@string/next"
android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/guideline2"
app:layout_constraintTop_toBottomOf="@id/email"> app:layout_constraintTop_toBottomOf="@+id/email" />
<Button <TextView
android:id="@+id/next" android:id="@+id/back"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/size_50" android:layout_marginStart="44dp"
android:enabled="false" android:layout_marginTop="24dp"
android:text="@string/next" android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent" android:background="@drawable/bg_round_main"
app:layout_constraintStart_toStartOf="parent" android:enabled="false"
app:layout_constraintTop_toTopOf="parent" /> android:gravity="center"
android:padding="8dp"
android:text="@string/action_back"
android:textColor="@android:color/white"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/email" />
<Button <androidx.constraintlayout.widget.Guideline
android:id="@+id/back" android:id="@+id/guideline2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/size_50" android:orientation="vertical"
android:text="@string/action_back" app:layout_constraintGuide_percent="0.5" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

86
app/src/main/res/layout/resetpwd/layout/step2.xml
Unescape View File

@ -6,13 +6,15 @@
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.resetpwd.ResetPwdStep2"> tools:context=".ui.resetpwd.ResetPwdStep2">
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:id="@+id/username" android:id="@+id/username"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:enabled="false" android:enabled="false"
android:hint="@string/prompt_user" android:hint="@string/prompt_user"
app:met_iconLeft="@mipmap/ic_user"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -20,14 +22,16 @@
tools:ignore="TextFields" tools:ignore="TextFields"
android:importantForAutofill="no" /> android:importantForAutofill="no" />
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:id="@+id/email" android:id="@+id/email"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:enabled="false" android:enabled="false"
android:hint="@string/prompt_email" android:hint="@string/prompt_email"
app:met_iconLeft="@mipmap/ic_email"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
app:layout_constraintEnd_toStartOf="@id/sendcode" app:layout_constraintEnd_toStartOf="@id/sendcode"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -35,11 +39,14 @@
tools:ignore="TextFields" tools:ignore="TextFields"
android:importantForAutofill="no" /> android:importantForAutofill="no" />
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:id="@+id/code" android:id="@+id/code"
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"
app:met_iconLeft="@mipmap/ic_clock"
android:ems="10" android:ems="10"
android:enabled="false" android:enabled="false"
android:hint="@string/prompt_code" android:hint="@string/prompt_code"
@ -48,42 +55,59 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/email" /> app:layout_constraintTop_toBottomOf="@id/email" />
<androidx.constraintlayout.widget.ConstraintLayout
<TextView
android:id="@+id/next"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="44dp"
android:background="@drawable/bg_round_main"
android:enabled="false"
android:gravity="center"
android:padding="8dp"
android:text="@string/next"
android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/guideline2"
app:layout_constraintTop_toBottomOf="@id/code"> app:layout_constraintTop_toBottomOf="@+id/email" />
<Button <TextView
android:id="@+id/next" android:id="@+id/back"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/size_50" android:layout_marginStart="44dp"
android:enabled="false" android:layout_marginTop="24dp"
android:text="@string/next" android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent" android:background="@drawable/bg_round_main"
app:layout_constraintStart_toStartOf="parent" android:enabled="false"
app:layout_constraintTop_toTopOf="parent" /> android:gravity="center"
android:padding="8dp"
android:text="@string/action_back"
android:textColor="@android:color/white"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/email" />
<Button <androidx.constraintlayout.widget.Guideline
android:id="@+id/back" android:id="@+id/guideline2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/size_50" android:orientation="vertical"
android:text="@string/previous" app:layout_constraintGuide_percent="0.5" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<Button <TextView
android:id="@+id/sendcode" android:id="@+id/sendcode"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:background="@drawable/bg_round_main"
android:enabled="false"
android:gravity="center"
android:padding="8dp"
android:text="@string/action_sendcode" android:text="@string/action_sendcode"
android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/username" /> app:layout_constraintTop_toBottomOf="@id/username" />

71
app/src/main/res/layout/resetpwd/layout/step3.xml
Unescape View File

@ -4,26 +4,30 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:id="@+id/password" android:id="@+id/password"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:importantForAutofill="no" android:importantForAutofill="no"
android:hint="@string/prompt_password" android:hint="@string/prompt_password"
android:inputType="text|textPassword" android:inputType="text|textPassword"
app:met_iconLeft="@mipmap/ic_clock"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<EditText <com.rengwuxian.materialedittext.MaterialEditText
android:layout_marginStart="44dp"
android:layout_marginEnd="44dp"
android:id="@+id/confirmPwd" android:id="@+id/confirmPwd"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:importantForAutofill="no" android:importantForAutofill="no"
app:met_iconLeft="@mipmap/ic_clock"
android:hint="@string/prompt_confirm_password" android:hint="@string/prompt_confirm_password"
android:inputType="text|textPassword" android:inputType="text|textPassword"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
@ -31,33 +35,44 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/password" /> app:layout_constraintTop_toBottomOf="@id/password" />
<androidx.constraintlayout.widget.ConstraintLayout <TextView
android:id="@+id/reset_pwd"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="8dp" android:layout_marginStart="16dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="44dp"
android:background="@drawable/bg_round_main"
android:enabled="false"
android:gravity="center"
android:padding="8dp"
android:text="@string/action_reset_password"
android:textColor="@android:color/white"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="@+id/guideline2"
app:layout_constraintTop_toBottomOf="@id/confirmPwd"> app:layout_constraintTop_toBottomOf="@+id/confirmPwd" />
<Button <TextView
android:id="@+id/back" android:id="@+id/back"
android:layout_width="wrap_content" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/size_50" android:layout_marginStart="44dp"
android:text="@string/action_back" android:layout_marginTop="24dp"
app:layout_constraintBottom_toBottomOf="parent" android:layout_marginEnd="16dp"
app:layout_constraintEnd_toEndOf="parent" android:background="@drawable/bg_round_main"
app:layout_constraintTop_toTopOf="parent" /> android:enabled="false"
android:gravity="center"
android:padding="8dp"
android:text="@string/action_back"
android:textColor="@android:color/white"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/confirmPwd" />
<Button <androidx.constraintlayout.widget.Guideline
android:id="@+id/reset_pwd" android:id="@+id/guideline2"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/size_50" android:orientation="vertical"
android:enabled="false" app:layout_constraintGuide_percent="0.5" />
android:text="@string/action_reset_password"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

BIN
app/src/main/res/mipmap-mdpi/bg_login.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 224 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_clock.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_email.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_register.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_tel.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.1 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_user.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.4 KiB

Write Preview
Loading…
Cancel
Save