diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-25 03:39:40 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-04-25 03:39:40 +0200 |
commit | 608b66d192fcab62ab44d28c34171f9ca1aff38b (patch) | |
tree | b490d71e39b26a4f392eb2dc95daa32474b0d466 /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | 24d407bce3aefc5ecc2a8ee4de4dac59b5b5972c (diff) | |
download | open-keychain-608b66d192fcab62ab44d28c34171f9ca1aff38b.tar.gz open-keychain-608b66d192fcab62ab44d28c34171f9ca1aff38b.tar.bz2 open-keychain-608b66d192fcab62ab44d28c34171f9ca1aff38b.zip |
change HttpsEditText to generic PrefixEditText
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java | 2 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PrefixedEditText.java (renamed from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/HttpsPrefixedText.java) | 17 |
2 files changed, 13 insertions, 6 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java index c36f98058..d7c7a6f2e 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/linked/LinkedIdCreateTwitterStep1Fragment.java @@ -107,7 +107,7 @@ public class LinkedIdCreateTwitterStep1Fragment extends Fragment { }); mEditHandle = (EditText) view.findViewById(R.id.linked_create_twitter_handle); - mEditHandle.setText("v_debug"); + mEditHandle.setText(""); return view; } diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/HttpsPrefixedText.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PrefixedEditText.java index 292343eb7..3cbb114e8 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/HttpsPrefixedText.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/PrefixedEditText.java @@ -1,20 +1,27 @@ package org.sufficientlysecure.keychain.ui.widget; import android.content.Context; +import android.content.res.TypedArray; import android.graphics.*; import android.support.annotation.NonNull; import android.util.AttributeSet; import android.widget.EditText; -/** */ -public class HttpsPrefixedText extends EditText { +import org.sufficientlysecure.keychain.R; - private String mPrefix; // can be hardcoded for demo purposes +public class PrefixedEditText extends EditText { + + private String mPrefix; private Rect mPrefixRect = new Rect(); - public HttpsPrefixedText(Context context, AttributeSet attrs) { + public PrefixedEditText(Context context, AttributeSet attrs) { super(context, attrs); - mPrefix = "https://"; + TypedArray style = context.getTheme().obtainStyledAttributes( + attrs, R.styleable.PrefixedEditText, 0, 0); + mPrefix = style.getString(R.styleable.PrefixedEditText_prefix); + if (mPrefix == null) { + mPrefix = ""; + } } @Override |