moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2025-02-07 10:30:14 -05:00
Code Issues Releases Wiki Activity

Improved EmailEditText, Added NameEditText, Removed PasswordEditText #1106

Browse Source
This commit is contained in:
chipset95 2015-03-09 17:55:46 +05:30
parent 7ac4f63ea3
commit e2c502a511
3 changed files with 85 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/EmailEditText.java
View File

@ -25,6 +25,7 @@ import android.text.InputType;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.util.Patterns; import android.util.Patterns;
import android.view.inputmethod.EditorInfo;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView; import android.widget.AutoCompleteTextView;
@ -41,6 +42,8 @@ public class EmailEditText extends AutoCompleteTextView {
emailEditText = this; emailEditText = this;
this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
this.addTextChangedListener(textWatcher); this.addTextChangedListener(textWatcher);
removeFlag();
makeAdapter();
} }
public EmailEditText(Context context, AttributeSet attrs) { public EmailEditText(Context context, AttributeSet attrs) {
@ -48,6 +51,8 @@ public class EmailEditText extends AutoCompleteTextView {
emailEditText = this; emailEditText = this;
this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
this.addTextChangedListener(textWatcher); this.addTextChangedListener(textWatcher);
removeFlag();
makeAdapter();
} }
public EmailEditText(Context context, AttributeSet attrs, int defStyleAttr) { public EmailEditText(Context context, AttributeSet attrs, int defStyleAttr) {
@ -55,6 +60,8 @@ public class EmailEditText extends AutoCompleteTextView {
emailEditText = this; emailEditText = this;
this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
this.addTextChangedListener(textWatcher); this.addTextChangedListener(textWatcher);
removeFlag();
makeAdapter();
} }
@TargetApi(Build.VERSION_CODES.LOLLIPOP) @TargetApi(Build.VERSION_CODES.LOLLIPOP)
@ -63,6 +70,8 @@ public class EmailEditText extends AutoCompleteTextView {
emailEditText = this; emailEditText = this;
this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS); this.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_EMAIL_ADDRESS);
this.addTextChangedListener(textWatcher); this.addTextChangedListener(textWatcher);
removeFlag();
makeAdapter();
} }
TextWatcher textWatcher = new TextWatcher() { TextWatcher textWatcher = new TextWatcher() {
@ -94,4 +103,16 @@ public class EmailEditText extends AutoCompleteTextView {
} }
} }
}; };
private void makeAdapter() {
this.setThreshold(1); // Start working from first character
this.setAdapter(new ArrayAdapter<>(getContext(), android.R.layout.simple_spinner_dropdown_item,
ContactHelper.getPossibleUserEmails(getContext())));
}
private void removeFlag() {
int inputType = getInputType();
inputType &= ~EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE;
setRawInputType(inputType);
}
} }

64
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/NameEditText.java Normal file
View File

@ -0,0 +1,64 @@
/*
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.util.AttributeSet;
import android.view.inputmethod.EditorInfo;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import org.sufficientlysecure.keychain.util.ContactHelper;
public class NameEditText extends AutoCompleteTextView {
public NameEditText(Context context) {
super(context);
removeFlag();
}
public NameEditText(Context context, AttributeSet attrs) {
super(context, attrs);
removeFlag();
}
public NameEditText(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
removeFlag();
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public NameEditText(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
removeFlag();
}
private void removeFlag() {
int inputType = getInputType();
inputType &= ~EditorInfo.TYPE_TEXT_FLAG_AUTO_COMPLETE;
setRawInputType(inputType);
}
private void makeAdapter() {
this.setThreshold(1); // Start working from first character
this.setAdapter(new ArrayAdapter<>(
getContext(), android.R.layout.simple_spinner_dropdown_item,
ContactHelper.getPossibleUserNames(getContext())));
}
}

101
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PasswordEditText.java
View File

@ -1,101 +0,0 @@
/*
* Copyright (C) 2014 Dominik Schürmann <dominik@dominikschuermann.de>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui.widget;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.text.Editable;
import android.text.InputType;
import android.text.TextWatcher;
import android.util.AttributeSet;
import android.widget.EditText;
import org.sufficientlysecure.keychain.ui.widget.passwordstrengthindicator.PasswordStrengthView;
/**
* Developer: chipset
* Package : org.sufficientlysecure.keychain.layouts
* Project : open-keychain
* Date : 6/3/15
*/
public class PasswordEditText extends EditText {
PasswordEditText passwordEditText;
PasswordStrengthView passwordStrengthView;
public PasswordEditText(Context context) {
super(context);
passwordEditText = this;
this.setInputType(InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_VARIATION_PASSWORD);
this.addTextChangedListener(textWatcher);
}
public PasswordEditText(Context context, AttributeSet attrs) {
super(context, attrs);
passwordEditText = this;
this.setInputType(InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_VARIATION_PASSWORD);
this.addTextChangedListener(textWatcher);
}
public PasswordEditText(Context context, AttributeSet attrs, int defStyleAttr) {
super(context, attrs, defStyleAttr);
passwordEditText = this;
this.setInputType(InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_VARIATION_PASSWORD);
this.addTextChangedListener(textWatcher);
}
@TargetApi(Build.VERSION_CODES.LOLLIPOP)
public PasswordEditText(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
passwordEditText = this;
this.setInputType(InputType.TYPE_CLASS_TEXT |
InputType.TYPE_TEXT_VARIATION_PASSWORD);
this.addTextChangedListener(textWatcher);
}
TextWatcher textWatcher = new TextWatcher() {
@Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
}
@Override
public void afterTextChanged(Editable editable) {
String passphrase = editable.toString();
passwordStrengthView.setPassword(passphrase);
}
};
// public PasswordStrengthView getPasswordStrengthView() {
// return passwordStrengthView;
// }
public void setPasswordStrengthView(PasswordStrengthView mPasswordStrengthView) {
this.passwordStrengthView = mPasswordStrengthView;
}
}