Merge pull request #4 from hannta/master

Move hint texts to string resources
tipsi · Feb 1, 2018 · 7df3c97 · 7df3c97
2 parents d169f7a + 6d8e85f
commit 7df3c97
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 5 deletions.
diff --git a/CreditCardEntry/res/values/strings.xml b/CreditCardEntry/res/values/strings.xml
@@ -4,5 +4,9 @@
     <string name="ExpirationDateHelp">Expiration date (MM/YY)</string>
     <string name="SecurityCodeHelp">Security code (CVV)</string>
     <string name="ZipHelp">Zip code of billing address</string>
+    <string name="SecurityCodeFieldHint">CVV</string>
+    <string name="ExpDateFieldHint">MM/YY</string>
+    <string name="ZipCodeFieldHint">   ZIP   </string>
+    <string name="CreditCardFormCardNumberHint">1234 5678 9012 3456</string>
 
 </resources>
diff --git a/CreditCardEntry/src/com/devmarvel/creditcardentry/fields/ExpDateText.java b/CreditCardEntry/src/com/devmarvel/creditcardentry/fields/ExpDateText.java
@@ -30,7 +30,7 @@ public ExpDateText(Context context, AttributeSet attrs, int defStyle) {
 
 	void init() {
 		super.init();
-		setHint("MM/YY");
+		setHint(R.string.ExpDateFieldHint);
 	}
 
 	/* TextWatcher Implementation Methods */

diff --git a/CreditCardEntry/src/com/devmarvel/creditcardentry/fields/SecurityCodeText.java b/CreditCardEntry/src/com/devmarvel/creditcardentry/fields/SecurityCodeText.java
@@ -34,7 +34,7 @@ public SecurityCodeText(Context context, AttributeSet attrs, int defStyle) {
 
 	void init() {
 		super.init();
-		setHint("CVV");
+		setHint(R.string.SecurityCodeFieldHint);
 	}
 
 	/* TextWatcher Implementation Methods */

diff --git a/CreditCardEntry/src/com/devmarvel/creditcardentry/fields/ZipCodeText.java b/CreditCardEntry/src/com/devmarvel/creditcardentry/fields/ZipCodeText.java
@@ -31,7 +31,7 @@ void init() {
 		super.init();
 		maxChars = 5;
 		setMaxChars(maxChars);
-		setHint("   ZIP   ");
+		setHint(R.string.ZipCodeFieldHint);
 	}
 
 	@Override

diff --git a/CreditCardEntry/src/com/devmarvel/creditcardentry/library/CreditCardForm.java b/CreditCardEntry/src/com/devmarvel/creditcardentry/library/CreditCardForm.java
@@ -34,7 +34,7 @@ public class CreditCardForm extends RelativeLayout {
 	private Drawable inputBackground;
 	private boolean useDefaultColors;
 	private boolean animateOnError;
-	private String cardNumberHint = "1234 5678 9012 3456";
+	private String cardNumberHint;
 
 	public CreditCardForm(Context context) {
 		this(context, null);
@@ -76,7 +76,7 @@ public CreditCardForm(Context context, AttributeSet attrs, int defStyle) {
 			}
 
 			// defaults if not set by user
-			if(cardNumberHint == null) cardNumberHint = "1234 5678 9012 3456";
+			if(cardNumberHint == null) cardNumberHint = context.getResources().getString(R.string.CreditCardFormCardNumberHint);
 			if(inputBackground == null) {
 				//noinspection deprecation
 				inputBackground = context.getResources().getDrawable(R.drawable.background_white);