Merge pull request #2 from tipsi/short_card_number_position

Short card number position
tipsi · Nov 7, 2017 · fa4ad49 · agrosner · Nov 15, 2017 · fa4ad49
2 parents 3eb0f16 + 3b9358f
commit fa4ad49
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 14 deletions.
diff --git a/CreditCardEntry/build.gradle b/CreditCardEntry/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0.0"
     }
@@ -36,5 +36,9 @@ artifacts {
 }
 
 dependencies {
-    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:support-compat:25.3.1'
+    compile 'com.android.support:support-core-utils:25.3.1'
+    compile 'com.android.support:support-core-ui:25.3.1'
+    compile 'com.android.support:support-media-compat:25.3.1'
+    compile 'com.android.support:support-fragment:25.3.1'
 }
diff --git a/CreditCardEntry/src/com/devmarvel/creditcardentry/fields/CreditEntryFieldBase.java b/CreditCardEntry/src/com/devmarvel/creditcardentry/fields/CreditEntryFieldBase.java
@@ -73,7 +73,7 @@ void init(AttributeSet attrs) {
 		addTextChangedListener(this);
 		setOnKeyListener(this);
 		setOnClickListener(this);
-		setPadding(20, 0, 20, 0);
+		setPadding(50, 0, 50, 0);
 
         setStyle(attrs);
     }

diff --git a/CreditCardEntry/src/com/devmarvel/creditcardentry/internal/CreditCardEntry.java b/CreditCardEntry/src/com/devmarvel/creditcardentry/internal/CreditCardEntry.java
@@ -98,7 +98,7 @@ public CreditCardEntry(Context context, boolean includeExp, boolean includeSecur
         } else {
             textColor = null;
         }
-        textSize = typedArray.getDimensionPixelSize(R.styleable.CreditCardForm_text_size, 19);
+        textSize = typedArray.getDimensionPixelSize(R.styleable.CreditCardForm_text_size, 26);
         typedArray.recycle();
 
         WindowManager wm = (WindowManager) context.getSystemService(Context.WINDOW_SERVICE);
@@ -217,6 +217,15 @@ public void onClick(View v) {
         });
     }
 
+    @Override
+    protected void onLayout(boolean changed, int l, int t, int r, int b) {
+        super.onLayout(changed, l, t, r, b);
+        int shiftPadding = r - l - cardImage.getWidth() - expDateText.getWidth() - securityCodeText.getWidth() - 20;
+        if (shiftPadding > 0) {
+            textFourDigits.setPadding(0, 0, shiftPadding, 0);
+        }
+    }
+
     @Override
     public void onCardTypeChange(CardType type) {
         cardImage.setImageResource(type.frontResource);

diff --git a/CreditCardEntryDemo/build.gradle b/CreditCardEntryDemo/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.3"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.3'
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 24
+        targetSdkVersion 25
         applicationId "com.devmarvel.creditcardentry"
         versionCode 1
         versionName "1.0.0"
@@ -27,5 +27,9 @@ android {
 
 dependencies {
     compile project(':CreditCardEntry')
-    compile 'com.android.support:support-v4:24.2.1'
+    compile 'com.android.support:support-compat:25.3.1'
+    compile 'com.android.support:support-core-utils:25.3.1'
+    compile 'com.android.support:support-core-ui:25.3.1'
+    compile 'com.android.support:support-media-compat:25.3.1'
+    compile 'com.android.support:support-fragment:25.3.1'
 }
diff --git a/CreditCardEntryDemo/res/layout/activity_main.xml b/CreditCardEntryDemo/res/layout/activity_main.xml
@@ -23,7 +23,8 @@
 
         <com.devmarvel.creditcardentry.library.CreditCardForm
             android:id="@+id/form_no_zip"
-            android:layout_width="wrap_content"
+        short_card_number_position
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="15dp"
             app:card_number_hint="XXXX XXXX XXXX XXXX"

diff --git a/build.gradle b/build.gradle
@@ -1,9 +1,11 @@
 buildscript {
     repositories {
+        mavenLocal()
         mavenCentral()
+        jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Apr 29 14:57:37 PDT 2015
+#Sun Nov 05 20:58:12 EET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip