Merge pull request #2 from zumper/master

Modernizing a bit

Author: dbachelder

.gitignore

@@ -1,16 +1,9 @@
-# built application files
-*.apk
-*.ap_
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
+**/build/
+.idea/
 
 # Local configuration file (sdk path, etc)
 local.properties
+
+# Android Studio
+*.iml
+

CreditCardEntry/AndroidManifest.xml

@@ -3,10 +3,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
-
     <application
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"

CreditCardEntry/build.gradle

@@ -0,0 +1,39 @@
+buildscript {
+    repositories {
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'com.android.tools.build:gradle:1.1.0'
+    }
+}
+apply plugin: 'com.android.library'
+
+repositories {
+    mavenCentral()
+}
+
+android {
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
+
+    defaultConfig {
+        minSdkVersion 8
+        targetSdkVersion 22
+    }
+
+    sourceSets {
+        main {
+            assets.srcDirs       = ['assets']
+            res.srcDirs          = ['res']
+            aidl.srcDirs         = ['src']
+            resources.srcDirs    = ['src']
+            renderscript.srcDirs = ['src']
+            java.srcDirs         = ['src']
+            manifest.srcFile 'AndroidManifest.xml'
+        }
+    }
+}
+
+dependencies {
+    compile 'com.android.support:support-v4:22.0.0'
+}

CreditCardEntry/libs/android-support-v4.jar

@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
 <cycleInterpolator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:cycles="5" />
+    android:cycles="2" />

CreditCardEntry/proguard-project.txt

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <translate xmlns:android="http://schemas.android.com/apk/res/android"
-    android:duration="1000"
+    android:duration="500"
     android:fromXDelta="0%"
-    android:interpolator="@anim/cycle_5"
-    android:toXDelta="2%"
-    android:toYDelta="2%" />
+    android:interpolator="@anim/cycle"
+    android:toXDelta="1%"
+    android:toYDelta="1%" />

CreditCardEntry/project.properties

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <stroke
+        android:width="1dp"
+        android:color="#000000"/>
+    <solid
+        android:color="#ffffff"
+        />
+    <padding
+        android:left="2dp"
+        android:top="2dp"
+        android:right="2dp"
+        android:bottom="2dp" />
+</shape>

CreditCardEntry/res/anim/cycle_5.xml renamed to CreditCardEntry/res/anim/cycle.xml

@@ -0,0 +1,12 @@
+<resources>
+
+    <!--
+        Base application theme for API 21+. This theme completely replaces
+        AppBaseTheme from BOTH res/values/styles.xml and
+        res/values-v14/styles.xml on API 21+ devices.
+    -->
+    <style name="AppBaseTheme" parent="android:Theme.Material.Light">
+        <!-- API 21 theme customizations can go here. -->
+    </style>
+
+</resources>

CreditCardEntry/res/anim/shake.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="CreditCardForm">
+        <attr name="include_zip" format="boolean"/>
+        <attr name="include_helper" format="boolean"/>
+        <attr name="helper_text_color" format="color"/>
+    </declare-styleable>
+</resources>

CreditCardEntry/res/drawable-hdpi/amex.png

@@ -3,4 +3,6 @@
     <color name="stroke">#000</color>
     <color name="grey_dark">#fff</color>
     <color name="grey_light">#ddd</color>
-</resources>
+    <color name="text_helper_color">#a8a8a8</color>
+    <color name="text_helper_color2">#AA0</color>
+</resources>

CreditCardEntry/res/drawable-hdpi/cc_back.png

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="cc_layout" type="id">5555</item>
+</resources>

CreditCardEntry/res/drawable-hdpi/diners_club.png

@@ -1,9 +1,9 @@
 <resources>
 
     <string name="app_name">CreditCardEntry</string>
-    <string name="CreditCardNumberHelp">Enter credit or debit card number</string>
+    <string name="CreditCardNumberHelp"/>
     <string name="ExpirationDateHelp">Expiration date (MM/DD)</string>
-    <string name="SecurityCodeHelp">Security code</string>
+    <string name="SecurityCodeHelp">Security code (CVV)</string>
     <string name="ZipHelp">Zip code of billing address</string>
 
 </resources>

CreditCardEntry/res/drawable-hdpi/discover.png

@@ -1,21 +1,18 @@
 package com.devmarvel.creditcardentry.fields;
 
+import android.annotation.SuppressLint;
 import android.content.Context;
 import android.text.Editable;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.Gravity;
 
 import com.devmarvel.creditcardentry.R;
+import com.devmarvel.creditcardentry.internal.CreditCardFieldDelegate;
 import com.devmarvel.creditcardentry.internal.CreditCardUtil;
 import com.devmarvel.creditcardentry.internal.CreditCardUtil.CardType;
-import com.devmarvel.creditcardentry.internal.CreditCardUtil.CreditCardFieldDelegate;
 
 public class CreditCardText extends CreditEntryFieldBase {
-
 	private CardType type;
-	private CreditCardFieldDelegate delegate;
-
 	private String previousNumber;
 
 	public CreditCardText(Context context) {
@@ -33,20 +30,22 @@ public CreditCardText(Context context, AttributeSet attrs, int defStyle) {
 		init();
 	}
 
-	public void init() {
+	@SuppressLint("RtlHardcoded")
+	@Override
+	void init() {
 		super.init();
 		setGravity(Gravity.LEFT);
 		setHint("1234 5678 9012 3456");
 	}
 
 	/* TextWatcher Implementation Methods */
-	public void beforeTextChanged(CharSequence s, int start, int count,
-			int after) {
+	@Override
+	public void beforeTextChanged(CharSequence s, int start, int count, int after) {
 		previousNumber = s.toString();
 	}
 
+	@Override
 	public void afterTextChanged(Editable s) {
-
 		String number = s.toString();
 
 		if (number.length() >= CreditCardUtil.CC_LEN_FOR_TYPE) {
@@ -70,7 +69,6 @@ public void afterTextChanged(Editable s) {
 			String formatted = CreditCardUtil.formatForViewing(number, type);
 
 			if (!number.equalsIgnoreCase(formatted)) {
-				Log.i("CreditCardText", formatted);
 				this.removeTextChangedListener(this);
 				this.setText(formatted);
 				this.setSelection(formatted.length());
@@ -96,15 +94,11 @@ public void afterTextChanged(Editable s) {
 		}
 	}
 
+	@Override
 	public CreditCardFieldDelegate getDelegate() {
 		return delegate;
 	}
 
-	public void setDelegate(CreditCardFieldDelegate delegate) {
-		this.delegate = delegate;
-		delegate.focusOnField(this);
-	}
-
 	public CardType getType() {
 		return type;
 	}