Merge remote-tracking branch 'origin/sheep_develop' into sheep_develop

app/src/main/java/com/sheep/gamegroup/module/login/fragments/NewPasswordFgt.java

@@ -4,10 +4,13 @@ package com.sheep.gamegroup.module.login.fragments;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
+import android.widget.ImageView;
 
 import com.sheep.gamegroup.module.login.controller.ChangePasswordController;
 import com.sheep.gamegroup.util.StringUtils;
@@ -27,6 +30,8 @@ public class NewPasswordFgt extends BaseFragment {
 
     @BindView(R.id.new_pwd_box)
     EditText newpwdBox;
+    @BindView(R.id.show_hide_pwd_btn)
+    ImageView showHidePwdBtn;
 
     public static NewPasswordFgt newInstance(ChangePasswordController controller){
         NewPasswordFgt fgt = new NewPasswordFgt();
@@ -48,6 +53,19 @@ public class NewPasswordFgt extends BaseFragment {
 
     }
 
+    @OnClick(R.id.show_hide_pwd_btn)
+    public void doShowHidePwd(View v) {
+        showHidePwdBtn.setSelected(!showHidePwdBtn.isSelected());
+        showHidePwdBtn.setImageResource(showHidePwdBtn.isSelected() ? R.mipmap.pwd_show : R.mipmap.pwd_hide);
+        if (showHidePwdBtn.isSelected()) {
+            //如果选中，显示密码
+            newpwdBox.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+        } else {
+            //否则隐藏密码
+            newpwdBox.setTransformationMethod(PasswordTransformationMethod.getInstance());
+        }
+    }
+
     @OnClick(R.id.done_btn)
     public void doDone(View v){
         String password = newpwdBox.getText().toString().trim();

app/src/main/java/com/sheep/gamegroup/module/login/fragments/OldPasswordFgt.java

@@ -3,11 +3,15 @@ package com.sheep.gamegroup.module.login.fragments;
 
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
+import android.text.InputType;
 import android.text.TextUtils;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.EditText;
+import android.widget.ImageView;
 
 import com.sheep.gamegroup.module.login.controller.ChangePasswordController;
 import com.sheep.gamegroup.util.StringUtils;
@@ -27,8 +31,10 @@ public class OldPasswordFgt extends BaseFragment {
 
     @BindView(R.id.old_pwd_box)
     EditText oldpwdBox;
+    @BindView(R.id.show_hide_pwd_btn)
+    ImageView showHidePwdBtn;
 
-    public static OldPasswordFgt newInstance(ChangePasswordController controller){
+    public static OldPasswordFgt newInstance(ChangePasswordController controller) {
         OldPasswordFgt fgt = new OldPasswordFgt();
         fgt.mController = controller;
         return fgt;
@@ -48,8 +54,21 @@ public class OldPasswordFgt extends BaseFragment {
 
     }
 
+    @OnClick(R.id.show_hide_pwd_btn)
+    public void doShowHidePwd(View v) {
+        showHidePwdBtn.setSelected(!showHidePwdBtn.isSelected());
+        showHidePwdBtn.setImageResource(showHidePwdBtn.isSelected() ? R.mipmap.pwd_show : R.mipmap.pwd_hide);
+        if (showHidePwdBtn.isSelected()) {
+            //如果选中，显示密码
+            oldpwdBox.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+        } else {
+            //否则隐藏密码
+            oldpwdBox.setTransformationMethod(PasswordTransformationMethod.getInstance());
+        }
+    }
+
     @OnClick(R.id.next_btn)
-    public void doNext(View v){
+    public void doNext(View v) {
         String password = oldpwdBox.getText().toString().trim();
         if (TextUtils.isEmpty(password)) {
             G.showToast("旧密码不能为空");

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignInFgt.java

@@ -8,6 +8,8 @@ import android.support.v4.app.Fragment;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -86,6 +88,8 @@ public class SignInFgt extends BaseFragment {
     TextView testChange;
     @BindView(R.id.test_change_user)
     TextView testChangeUser;
+    @BindView(R.id.show_hide_pwd_btn)
+    ImageView showHidePwdBtn;
 
     public SignInFgt() {
         // Required empty public constructor
@@ -432,6 +436,19 @@ public class SignInFgt extends BaseFragment {
         super.onDestroy();
     }
 
+    @OnClick(R.id.show_hide_pwd_btn)
+    public void doShowHidePwd(View v) {
+        showHidePwdBtn.setSelected(!showHidePwdBtn.isSelected());
+        showHidePwdBtn.setImageResource(showHidePwdBtn.isSelected() ? R.mipmap.pwd_show : R.mipmap.pwd_hide);
+        if (showHidePwdBtn.isSelected()) {
+            //如果选中，显示密码
+            passwordBox.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+        } else {
+            //否则隐藏密码
+            passwordBox.setTransformationMethod(PasswordTransformationMethod.getInstance());
+        }
+    }
+
     private abstract class ThirdpartAuthListener implements UMAuthListener {
 
         private String platformName;

app/src/main/java/com/sheep/gamegroup/module/login/fragments/SignUpFgt.java

@@ -3,8 +3,11 @@ package com.sheep.gamegroup.module.login.fragments;
 
 import android.support.v4.app.Fragment;
 import android.text.TextUtils;
+import android.text.method.HideReturnsTransformationMethod;
+import android.text.method.PasswordTransformationMethod;
 import android.view.View;
 import android.widget.EditText;
+import android.widget.ImageView;
 
 import com.alibaba.fastjson.JSONObject;
 import com.sheep.gamegroup.model.entity.BaseMessage;
@@ -37,6 +40,8 @@ public class SignUpFgt extends BaseFragment {
     EditText userNameBox;
     @BindView(R.id.password_box)
     EditText passwordBox;
+    @BindView(R.id.show_hide_pwd_btn)
+    ImageView showHidePwdBtn;
 
     public SignUpFgt() {
         // Required empty public constructor
@@ -58,6 +63,19 @@ public class SignUpFgt extends BaseFragment {
 
     }
 
+    @OnClick(R.id.show_hide_pwd_btn)
+    public void doShowHidePwd(View v) {
+        showHidePwdBtn.setSelected(!showHidePwdBtn.isSelected());
+        showHidePwdBtn.setImageResource(showHidePwdBtn.isSelected() ? R.mipmap.pwd_show : R.mipmap.pwd_hide);
+        if (showHidePwdBtn.isSelected()) {
+            //如果选中，显示密码
+            passwordBox.setTransformationMethod(HideReturnsTransformationMethod.getInstance());
+        } else {
+            //否则隐藏密码
+            passwordBox.setTransformationMethod(PasswordTransformationMethod.getInstance());
+        }
+    }
+
     @OnClick(R.id.register_btn)
     public void doRegister(View v) {
         if (!validate()) return;

app/src/main/res/layout/fragment_new_password.xml

@@ -17,10 +17,29 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <EditText
-        android:id="@+id/new_pwd_box"
-        android:hint="请输入新的登录密码"
-        style="@style/login_edit_style" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/new_pwd_box"
+            android:layout_weight="1"
+            android:inputType="textPassword"
+            style="@style/login_edit_style"
+            android:hint="请输入新的登录密码" />
+
+        <ImageView
+            android:id="@+id/show_hide_pwd_btn"
+            android:src="@mipmap/pwd_hide"
+            android:layout_marginTop="26dp"
+            android:tint="@color/bg_line"
+            android:padding="7dp"
+            android:layout_marginRight="5dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp" />
+
+    </LinearLayout>
 
     <View
         style="@style/login_separetor_line_style" />

app/src/main/res/layout/fragment_old_password.xml

@@ -2,38 +2,56 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:orientation="vertical"
     android:gravity="center_horizontal"
+    android:orientation="vertical"
     android:padding="@dimen/content_padding_24"
     tools:context="com.sheep.gamegroup.module.login.fragments.OldPasswordFgt">
 
     <TextView
-        android:textStyle="bold"
-        android:text="请输入旧登录密码"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="50dp"
         android:gravity="center"
+        android:text="请输入旧登录密码"
         android:textColor="@color/gray_4"
         android:textSize="14sp"
-        android:layout_marginTop="50dp"
+        android:textStyle="bold" />
+
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/old_pwd_box"
+            android:layout_weight="1"
+            android:inputType="textPassword"
+            style="@style/login_edit_style"
+            android:hint="请输入当前登录密码" />
+
+        <ImageView
+            android:id="@+id/show_hide_pwd_btn"
+            android:src="@mipmap/pwd_hide"
+            android:layout_marginTop="26dp"
+            android:tint="@color/bg_line"
+            android:padding="7dp"
+            android:layout_marginRight="5dp"
+            android:layout_width="30dp"
+            android:layout_height="30dp" />
 
-    <EditText
-        android:id="@+id/old_pwd_box"
-        android:hint="请输入当前登录密码"
-        style="@style/login_edit_style" />
+    </LinearLayout>
 
-    <View
-        style="@style/login_separetor_line_style" />
+    <View style="@style/login_separetor_line_style" />
 
     <TextView
         android:id="@+id/forget_pwd_btn"
-        android:layout_marginTop="8dp"
-        android:gravity="right"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:gravity="right"
         android:text="忘记密码?"
-        android:textSize="12sp"
-        android:textColor="@color/blue_34a6e7" />
+        android:textColor="@color/blue_34a6e7"
+        android:textSize="12sp" />
 
     <Button
         android:id="@+id/next_btn"

app/src/main/res/layout/fragment_sign_in.xml

@@ -38,7 +38,19 @@
             android:layout_below="@+id/user_name_box"
             android:hint="输入密码(6-16位)"
             android:inputType="textPassword"
-            android:maxLength="16" />
+            android:maxLength="16"
+            android:paddingLeft="@dimen/content_padding_5"/>
+
+        <ImageView
+            android:id="@+id/show_hide_pwd_btn"
+            android:src="@mipmap/pwd_hide"
+            android:layout_marginTop="26dp"
+            android:layout_below="@+id/user_name_box"
+            android:tint="@color/bg_line"
+            android:padding="7dp"
+            android:layout_alignParentRight="true"
+            android:layout_width="30dp"
+            android:layout_height="30dp" />
 
         <View
             style="@style/login_separetor_line_style"

app/src/main/res/layout/fragment_sign_up.xml

@@ -6,32 +6,49 @@
     android:padding="@dimen/content_padding_24">
 
     <LinearLayout
-        android:layout_marginTop="60dp"
-        android:orientation="vertical"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
+        android:orientation="vertical">
+
         <EditText
             android:id="@+id/user_name_box"
-            android:hint="输入用户名(如邮箱地址、常用英文等唯一标识)"
-            style="@style/login_edit_style" />
-        <View
-            style="@style/login_separetor_line_style" />
-        <EditText
-            android:id="@+id/password_box"
-            android:inputType="textPassword"
-            android:maxLength="16"
-            android:lines="1"
-            android:hint="输入密码(6-16位)"
-            android:layout_below="@+id/user_name_box"
-            style="@style/login_edit_style"  />
-        <View
-            style="@style/login_separetor_line_style" />
+            style="@style/login_edit_style"
+            android:hint="输入用户名(如邮箱地址、常用英文等唯一标识)" />
+
+        <View style="@style/login_separetor_line_style" />
+
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <EditText
+                android:id="@+id/password_box"
+                android:layout_weight="1"
+                style="@style/login_edit_style"
+                android:layout_below="@+id/user_name_box"
+                android:hint="输入密码(6-16位)"
+                android:inputType="textPassword"
+                android:lines="1"
+                android:maxLength="16" />
+            <ImageView
+                android:id="@+id/show_hide_pwd_btn"
+                android:src="@mipmap/pwd_hide"
+                android:layout_marginTop="26dp"
+                android:tint="@color/bg_line"
+                android:padding="7dp"
+                android:layout_width="30dp"
+                android:layout_height="30dp" />
+        </LinearLayout>
+
+        <View style="@style/login_separetor_line_style" />
     </LinearLayout>
 
     <Button
         android:id="@+id/register_btn"
-        android:text="注册"
+        style="@style/login_theme_round_button"
         android:layout_marginTop="50dp"
-        style="@style/login_theme_round_button" />
+        android:text="注册" />
 
 </LinearLayout>