Skip to content

Commit 46923a9

Browse files
author
Amanda Riu
committed
Squashed 'libs/login/' changes from cfc0675d21..a3a1c83492
a3a1c83492 Merge pull request #37 from wordpress-mobile/merge/woocommerce-android/dark-mode 990df9483d Merge pull request #40 from wordpress-mobile/fix/9905_Crash_InflateException_Binary_XML_file_line_NEW dfd3ed8246 Fix password drawable bf3e2f3228 Merge pull request #38 from wordpress-mobile/fix/11307-The-wrong-icon-is-used-when-a-Password-is-visible 1428361e69 Merge pull request #39 from wordpress-mobile/merge/WordPress-Android/11934-take2 b77a144e99 using getViewLifecycleOwner() for observers e2f7c1cdee Replace wrong icon with the right one git-subtree-dir: libs/login git-subtree-split: a3a1c834921064c31840003aaa91e4bf8f4f91fc
1 parent d4d2d89 commit 46923a9

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

WordPressLoginFlow/src/main/java/org/wordpress/android/login/LoginSiteAddressFragment.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,12 +141,12 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
141141

142142
mLoginSiteAddressValidator = new LoginSiteAddressValidator();
143143

144-
mLoginSiteAddressValidator.getIsValid().observe(this, new Observer<Boolean>() {
144+
mLoginSiteAddressValidator.getIsValid().observe(getViewLifecycleOwner(), new Observer<Boolean>() {
145145
@Override public void onChanged(Boolean enabled) {
146146
getPrimaryButton().setEnabled(enabled);
147147
}
148148
});
149-
mLoginSiteAddressValidator.getErrorMessageResId().observe(this, new Observer<Integer>() {
149+
mLoginSiteAddressValidator.getErrorMessageResId().observe(getViewLifecycleOwner(), new Observer<Integer>() {
150150
@Override public void onChanged(Integer resId) {
151151
if (resId != null) {
152152
showError(resId);

WordPressLoginFlow/src/main/java/org/wordpress/android/login/widgets/WPLoginInputRow.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,8 @@ private void init(Context context, AttributeSet attrs) {
7979
mEditText.setHintTextColor(getResources().getColor(android.R.color.transparent));
8080
}
8181
if (a.hasValue(R.styleable.wpLoginInputRow_passwordToggleEnabled)) {
82-
mTextInputLayout.setPasswordVisibilityToggleEnabled(
83-
a.getBoolean(R.styleable.wpLoginInputRow_passwordToggleEnabled, false));
82+
mTextInputLayout.setEndIconMode(TextInputLayout.END_ICON_PASSWORD_TOGGLE);
83+
mTextInputLayout.setEndIconDrawable(R.drawable.selector_password_visibility);
8484
}
8585

8686
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
-377 Bytes
Loading

0 commit comments

Comments
 (0)