From e2799b1a1e318038ba32864f09eb1e4c1e146937 Mon Sep 17 00:00:00 2001 From: JobGetabu Date: Fri, 9 Nov 2018 01:50:59 +0300 Subject: [PATCH 1/6] updated the sdk to 28.0.0 (sample and lib) --- build.gradle | 2 +- passcodeview/build.gradle | 6 +++--- sample/build.gradle | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/build.gradle b/build.gradle index c421992..431c511 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.1.4' classpath 'com.novoda:bintray-release:0.7.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/passcodeview/build.gradle b/passcodeview/build.gradle index 9d62380..22c43ae 100644 --- a/passcodeview/build.gradle +++ b/passcodeview/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 2 versionName "0.1.2" vectorDrawables.useSupportLibrary = true @@ -19,7 +19,7 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:appcompat-v7:28.0.0' testImplementation 'junit:junit:4.12' } diff --git a/sample/build.gradle b/sample/build.gradle index 0bc0c86..efa23cd 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,11 +1,11 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 26 + compileSdkVersion 28 defaultConfig { applicationId "com.hanks.demo" minSdkVersion 15 - targetSdkVersion 26 + targetSdkVersion 28 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -24,8 +24,8 @@ dependencies { exclude group: 'com.android.support', module: 'support-annotations' }) implementation project(":passcodeview") - implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'com.android.support.constraint:constraint-layout:1.0.2' - implementation 'com.android.support:design:26.1.0' + implementation 'com.android.support:design:28.0.0' testImplementation 'junit:junit:4.12' } From 56d07577bab53c06e3dd7e6d888ad0ebe1050289 Mon Sep 17 00:00:00 2001 From: JobGetabu Date: Fri, 9 Nov 2018 01:52:09 +0300 Subject: [PATCH 2/6] updated gradle to 4.1 -> 4.4 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3d64e73..defb267 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-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip From 518440885f5f663277d2cbed60fd04019ee32213 Mon Sep 17 00:00:00 2001 From: JobGetabu Date: Fri, 9 Nov 2018 01:54:29 +0300 Subject: [PATCH 3/6] added back support pre Lollipop --- .../src/main/java/com/hanks/passcodeview/PasscodeView.java | 6 ++++++ passcodeview/src/main/res/layout/layout_passcode_view.xml | 2 +- sample/src/main/java/com/hanks/demo/MainActivity.java | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/passcodeview/src/main/java/com/hanks/passcodeview/PasscodeView.java b/passcodeview/src/main/java/com/hanks/passcodeview/PasscodeView.java index 3a196f1..ed307fd 100644 --- a/passcodeview/src/main/java/com/hanks/passcodeview/PasscodeView.java +++ b/passcodeview/src/main/java/com/hanks/passcodeview/PasscodeView.java @@ -9,6 +9,7 @@ import android.support.annotation.IntDef; import android.support.annotation.NonNull; import android.support.annotation.Nullable; +import android.support.v7.content.res.AppCompatResources; import android.text.TextUtils; import android.util.AttributeSet; import android.util.DisplayMetrics; @@ -18,6 +19,7 @@ import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.RelativeLayout; import android.widget.TextView; import java.lang.annotation.Retention; @@ -41,6 +43,7 @@ public class PasscodeView extends FrameLayout implements View.OnClickListener { private TextView number0, number1, number2, number3, number4, number5, number6, number7, number8, number9; private ImageView numberB, numberOK; private ImageView iv_lock, iv_ok; + private RelativeLayout relativeLayoutDraw; private View cursor; private String firstInputTip = "Enter a passcode of 4 digits"; @@ -99,6 +102,9 @@ private void init() { cursor = findViewById(R.id.cursor); iv_lock = (ImageView) findViewById(R.id.iv_lock); iv_ok = (ImageView) findViewById(R.id.iv_ok); + relativeLayoutDraw = (RelativeLayout) findViewById(R.id.rv_with_drawable); + + relativeLayoutDraw.setBackgroundDrawable(AppCompatResources.getDrawable(getContext(),R.drawable.lock_bg_white)); tv_input_tip.setText(firstInputTip); diff --git a/passcodeview/src/main/res/layout/layout_passcode_view.xml b/passcodeview/src/main/res/layout/layout_passcode_view.xml index 6daa418..3163389 100644 --- a/passcodeview/src/main/res/layout/layout_passcode_view.xml +++ b/passcodeview/src/main/res/layout/layout_passcode_view.xml @@ -68,9 +68,9 @@ android:layout_weight="1"/> Date: Fri, 9 Nov 2018 02:05:22 +0300 Subject: [PATCH 4/6] added back support pre Lollipop --- passcodeview/src/main/res/layout/layout_passcode_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/passcodeview/src/main/res/layout/layout_passcode_view.xml b/passcodeview/src/main/res/layout/layout_passcode_view.xml index 3163389..413afaa 100644 --- a/passcodeview/src/main/res/layout/layout_passcode_view.xml +++ b/passcodeview/src/main/res/layout/layout_passcode_view.xml @@ -161,4 +161,4 @@ - \ No newline at end of file + From 57815cdb862d2aa41355409ed45bb26fdddf0614 Mon Sep 17 00:00:00 2001 From: Job Getabu Date: Sun, 11 Nov 2018 15:44:18 +0300 Subject: [PATCH 5/6] updated read-me with new version --- README.md | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 83843ab..7e11260 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# PasscodeView +# PasscodeView An Passcode view view for Android. @@ -9,14 +9,25 @@ An Passcode view view for Android. -## Usage +## Usage : update from to v0.1.3 ```gradle dependencies { - compile 'com.hanks:passcodeview:0.1.2' + implementation 'com.github.JobGetabu:PasscodeView:0.1.3' } ``` +Add it in your root build.gradle at the end of repositories: + +``` +allprojects { + repositories { + ... + maven { url 'https://jitpack.io' } + } + } + ``` + ```xml Date: Sun, 11 Nov 2018 15:45:54 +0300 Subject: [PATCH 6/6] Readme update --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7e11260..29442b2 100644 --- a/README.md +++ b/README.md @@ -9,7 +9,7 @@ An Passcode view view for Android. -## Usage : update from to v0.1.3 +## Add ```gradle dependencies { @@ -28,6 +28,8 @@ allprojects { } ``` +## Usage + ```xml