From 54cf5cc1e21aab87a908574cf9f9fc08617f0b29 Mon Sep 17 00:00:00 2001 From: Aditya Ladwa Date: Mon, 7 Aug 2017 21:20:53 +0530 Subject: [PATCH 1/3] Added Setter for digits --- .idea/gradle.xml | 19 +++++ .idea/markdown-navigator.xml | 72 +++++++++++++++++++ .idea/runConfigurations.xml | 12 ++++ .idea/vcs.xml | 7 ++ build.gradle | 2 +- gradle.properties | 6 +- gradle/wrapper/gradle-wrapper.properties | 4 +- .../java/me/philio/pinentry/PinEntryView.java | 3 + 8 files changed, 119 insertions(+), 6 deletions(-) create mode 100644 .idea/gradle.xml create mode 100644 .idea/markdown-navigator.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..7de7aac --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/markdown-navigator.xml b/.idea/markdown-navigator.xml new file mode 100644 index 0000000..d819570 --- /dev/null +++ b/.idea/markdown-navigator.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..8306744 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 77ea57e..d8f38ad 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.1.0-rc1' + classpath 'com.android.tools.build:gradle:3.0.0-alpha9' } } diff --git a/gradle.properties b/gradle.properties index c6cdcb5..fa8fb02 100644 --- a/gradle.properties +++ b/gradle.properties @@ -32,6 +32,6 @@ POM_DEVELOPER_ID=philio POM_DEVELOPER_NAME=Phil Bayfield ANDROID_BUILD_MIN_SDK_VERSION=7 -ANDROID_BUILD_TARGET_SDK_VERSION=23 -ANDROID_BUILD_TOOLS_VERSION=23.0.2 -ANDROID_BUILD_SDK_VERSION=23 \ No newline at end of file +ANDROID_BUILD_TARGET_SDK_VERSION=26 +ANDROID_BUILD_TOOLS_VERSION=26.0.0 +ANDROID_BUILD_SDK_VERSION=26 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e2c2898..00f011e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Apr 25 23:18:24 BST 2016 +#Mon Aug 07 21:18:58 IST 2017 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.13-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip diff --git a/pinentry/src/main/java/me/philio/pinentry/PinEntryView.java b/pinentry/src/main/java/me/philio/pinentry/PinEntryView.java index 8ff5e1d..0665f69 100644 --- a/pinentry/src/main/java/me/philio/pinentry/PinEntryView.java +++ b/pinentry/src/main/java/me/philio/pinentry/PinEntryView.java @@ -317,6 +317,9 @@ public int getDigits() { return digits; } + public void setDigits(int digits) { + this.digits = digits; + } public int getInputType() { return inputType; } From 706de5789b98be7ca1eb75f08880e2245d6a5711 Mon Sep 17 00:00:00 2001 From: Aditya Ladwa Date: Tue, 8 Aug 2017 10:24:21 +0530 Subject: [PATCH 2/3] Added Setter for digits --- demo/demo.iml | 116 ++++++++++++++++++ .../me/philio/pinentry/demo/MainActivity.java | 9 +- pinentry/pinentry.iml | 106 ++++++++++++++++ .../java/me/philio/pinentry/PinEntryView.java | 6 +- 4 files changed, 231 insertions(+), 6 deletions(-) create mode 100644 demo/demo.iml create mode 100644 pinentry/pinentry.iml diff --git a/demo/demo.iml b/demo/demo.iml new file mode 100644 index 0000000..11c0161 --- /dev/null +++ b/demo/demo.iml @@ -0,0 +1,116 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/demo/src/main/java/me/philio/pinentry/demo/MainActivity.java b/demo/src/main/java/me/philio/pinentry/demo/MainActivity.java index f0d53a6..a9e6531 100644 --- a/demo/src/main/java/me/philio/pinentry/demo/MainActivity.java +++ b/demo/src/main/java/me/philio/pinentry/demo/MainActivity.java @@ -1,12 +1,12 @@ package me.philio.pinentry.demo; import android.os.Bundle; -import android.support.v7.app.ActionBarActivity; -import android.widget.Toast; +import android.support.v7.app.AppCompatActivity; +import android.util.Log; import me.philio.pinentry.PinEntryView; -public class MainActivity extends ActionBarActivity { +public class MainActivity extends AppCompatActivity { private PinEntryView pinEntryView; @@ -15,10 +15,11 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); pinEntryView = (PinEntryView) findViewById(R.id.pin_entry_simple); + pinEntryView.setDigits(3); pinEntryView.setOnPinEnteredListener(new PinEntryView.OnPinEnteredListener() { @Override public void onPinEntered(String pin) { - Toast.makeText(MainActivity.this, "Pin entered: " + pin, Toast.LENGTH_LONG).show(); + Log.d("PIN",pin); } }); } diff --git a/pinentry/pinentry.iml b/pinentry/pinentry.iml new file mode 100644 index 0000000..e1d7191 --- /dev/null +++ b/pinentry/pinentry.iml @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pinentry/src/main/java/me/philio/pinentry/PinEntryView.java b/pinentry/src/main/java/me/philio/pinentry/PinEntryView.java index 0665f69..b697a1f 100644 --- a/pinentry/src/main/java/me/philio/pinentry/PinEntryView.java +++ b/pinentry/src/main/java/me/philio/pinentry/PinEntryView.java @@ -55,7 +55,7 @@ public class PinEntryView extends ViewGroup { /** * Number of digits */ - private int digits; + private int digits = 4; /** * Input type @@ -119,7 +119,7 @@ public PinEntryView(Context context, AttributeSet attrs, int defStyle) { // Get style information TypedArray array = getContext().obtainStyledAttributes(attrs, R.styleable.PinEntryView); - digits = array.getInt(R.styleable.PinEntryView_numDigits, 4); + digits = array.getInt(R.styleable.PinEntryView_numDigits, digits); inputType = array.getInt(R.styleable.PinEntryView_pinInputType, InputType.TYPE_CLASS_NUMBER); accentType = array.getInt(R.styleable.PinEntryView_accentType, ACCENT_NONE); @@ -319,6 +319,8 @@ public int getDigits() { public void setDigits(int digits) { this.digits = digits; + this.removeAllViews(); + addViews(); } public int getInputType() { return inputType; From 721cc152b8dff11580f9f3a83ee14949c3ceab4c Mon Sep 17 00:00:00 2001 From: Aditya Ladwa Date: Tue, 8 Aug 2017 10:49:16 +0530 Subject: [PATCH 3/3] Fixed Builds --- build.gradle | 2 +- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- pinentry/pinentry.iml | 2 ++ 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index d8f38ad..e52ed0a 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.0-alpha9' + classpath 'com.android.tools.build:gradle:2.3.3' } } diff --git a/gradle.properties b/gradle.properties index fa8fb02..9372a3b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -33,5 +33,5 @@ POM_DEVELOPER_NAME=Phil Bayfield ANDROID_BUILD_MIN_SDK_VERSION=7 ANDROID_BUILD_TARGET_SDK_VERSION=26 -ANDROID_BUILD_TOOLS_VERSION=26.0.0 +ANDROID_BUILD_TOOLS_VERSION=26.0.1 ANDROID_BUILD_SDK_VERSION=26 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 00f011e..7ff18ac 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-rc-1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/pinentry/pinentry.iml b/pinentry/pinentry.iml index e1d7191..7b72090 100644 --- a/pinentry/pinentry.iml +++ b/pinentry/pinentry.iml @@ -86,6 +86,7 @@ + @@ -93,6 +94,7 @@ +