From 839a078b14db1435563c094b4dd1e94694820614 Mon Sep 17 00:00:00 2001 From: Benobab Date: Mon, 14 May 2018 20:37:48 +0200 Subject: [PATCH 1/5] [CONF] - Added gitignore! --- .gitignore | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e7dc26c --- /dev/null +++ b/.gitignore @@ -0,0 +1,12 @@ +*.iml +.gradle +/local.properties +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +.DS_Store +/build +/captures +.externalNativeBuild +.adea/* +app/build/* \ No newline at end of file From 82f5204effc4a2408f963af05ce04abf80c41c6f Mon Sep 17 00:00:00 2001 From: Benobab Date: Mon, 14 May 2018 20:40:16 +0200 Subject: [PATCH 2/5] [CONF] - Update gitignore --- .gitignore | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e7dc26c..8d249d2 100644 --- a/.gitignore +++ b/.gitignore @@ -9,4 +9,13 @@ /captures .externalNativeBuild .adea/* -app/build/* \ No newline at end of file +app/build/* +.idea/* +*.iml + +views/.idea/* +views/gradle/* +views/build/* +views/gradlew +views/gradlew.bat +views/local.properties From ebf57d4bb4ef52c9ab6762fb7289c1566d45be13 Mon Sep 17 00:00:00 2001 From: Benobab Date: Mon, 14 May 2018 21:03:28 +0200 Subject: [PATCH 3/5] [EVOL] - Updated Gradle dependencies + Changed extends to AppCompat components --- app/build.gradle | 22 +++++++++---------- build.gradle | 4 +++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- views/build.gradle | 14 ++++++------ .../cooltechworks/views/ScratchImageView.java | 10 +++++---- .../cooltechworks/views/ScratchTextView.java | 16 ++++++-------- 6 files changed, 36 insertions(+), 34 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 273aa5f..d3b2d71 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { applicationId "com.cooltechworks.scratchview.demo" - minSdkVersion 9 - targetSdkVersion 23 + minSdkVersion 14 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -20,11 +20,11 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.2.1' - compile project(':views') - compile 'com.android.support:appcompat-v7:23.2.1' - compile 'com.android.support:cardview-v7:23.2.1' - compile 'com.android.support:design:23.2.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation project(':views') + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:cardview-v7:27.1.1' + implementation 'com.android.support:design:27.1.1' } diff --git a/build.gradle b/build.gradle index e0b366a..44bac8f 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.5.0' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f23df6e..74e9a0e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Oct 21 11:34:03 PDT 2015 +#Mon May 14 20:40:28 CEST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/views/build.gradle b/views/build.gradle index 02dd186..90db632 100644 --- a/views/build.gradle +++ b/views/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 - buildToolsVersion "23.0.2" + compileSdkVersion 27 + buildToolsVersion "27.0.3" defaultConfig { - minSdkVersion 9 - targetSdkVersion 23 + minSdkVersion 14 + targetSdkVersion 27 versionCode 1 versionName "1.0" } @@ -19,7 +19,7 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - testCompile 'junit:junit:4.12' - compile 'com.android.support:appcompat-v7:23.2.1' + implementation fileTree(dir: 'libs', include: ['*.jar']) + testImplementation 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:27.1.1' } diff --git a/views/src/main/java/com/cooltechworks/views/ScratchImageView.java b/views/src/main/java/com/cooltechworks/views/ScratchImageView.java index fe1ae05..27f7d3e 100644 --- a/views/src/main/java/com/cooltechworks/views/ScratchImageView.java +++ b/views/src/main/java/com/cooltechworks/views/ScratchImageView.java @@ -32,10 +32,10 @@ import android.graphics.drawable.Drawable; import android.os.AsyncTask; import android.support.v4.content.ContextCompat; +import android.support.v7.widget.AppCompatImageView; import android.util.AttributeSet; import android.util.Log; import android.view.MotionEvent; -import android.widget.ImageView; import com.cooltechworks.utils.BitmapUtils; @@ -43,12 +43,12 @@ /** * Created by Harish on 25/03/16. */ -public class ScratchImageView extends ImageView { +public class ScratchImageView extends AppCompatImageView { public interface IRevealListener { - public void onRevealed(ScratchImageView iv); - public void onRevealPercentChangedListener(ScratchImageView siv, float percent); + void onRevealed(ScratchImageView iv); + void onRevealPercentChangedListener(ScratchImageView siv, float percent); } public static final float STROKE_WIDTH = 12f; @@ -379,6 +379,8 @@ public void onPostExecute(Float percentRevealed) { } } + + public int[] getImageBounds() { int paddingLeft = getPaddingLeft(); diff --git a/views/src/main/java/com/cooltechworks/views/ScratchTextView.java b/views/src/main/java/com/cooltechworks/views/ScratchTextView.java index 27f7769..4a41c4c 100644 --- a/views/src/main/java/com/cooltechworks/views/ScratchTextView.java +++ b/views/src/main/java/com/cooltechworks/views/ScratchTextView.java @@ -31,23 +31,23 @@ import android.graphics.drawable.BitmapDrawable; import android.os.AsyncTask; import android.support.v4.content.ContextCompat; +import android.support.v7.widget.AppCompatTextView; import android.text.TextPaint; import android.util.AttributeSet; import android.view.Gravity; import android.view.MotionEvent; -import android.widget.TextView; import com.cooltechworks.utils.BitmapUtils; /** * Created by Harish on 25/03/16. */ -public class ScratchTextView extends TextView { +public class ScratchTextView extends AppCompatTextView { public interface IRevealListener { - public void onRevealed(ScratchTextView tv); - public void onRevealPercentChangedListener(ScratchTextView stv, float percent); + void onRevealed(ScratchTextView tv); + void onRevealPercentChangedListener(ScratchTextView stv, float percent); } public static final float STROKE_WIDTH = 12f; @@ -415,13 +415,11 @@ private int[] getTextBounds(float scale) { int gravity = getGravity(); - - //todo Gravity.START - if((gravity & Gravity.LEFT) == Gravity.LEFT) { + if((gravity & Gravity.START) == Gravity.START) { left = paddingLeft; } - //todo Gravity.END - else if((gravity & Gravity.RIGHT) == Gravity.RIGHT) { + + else if((gravity & Gravity.END) == Gravity.END) { left = (vwidth - paddingRight) - width; } else if((gravity & Gravity.CENTER_HORIZONTAL) == Gravity.CENTER_HORIZONTAL) { From d8ca6553276a1ccb4e93b7f95ae65899c7e799cf Mon Sep 17 00:00:00 2001 From: Benobab Date: Wed, 3 Oct 2018 15:48:34 +0200 Subject: [PATCH 4/5] [EVOL] - Release with gold and removed padding in the percentage calculation --- ScratchView.iml | 2 +- app/app.iml | 100 +++++++++++++----- .../demo/DemoClothingActivity.java | 2 + build.gradle | 4 +- gradlew | 0 views/build.gradle | 6 +- .../cooltechworks/views/ScratchImageView.java | 2 +- .../cooltechworks/views/ScratchTextView.java | 15 ++- views/src/main/res/drawable/gold.png | Bin 0 -> 9937 bytes views/views.iml | 80 ++++++++++---- 10 files changed, 149 insertions(+), 62 deletions(-) mode change 100644 => 100755 gradlew create mode 100644 views/src/main/res/drawable/gold.png diff --git a/ScratchView.iml b/ScratchView.iml index 37cbb99..c638c0e 100644 --- a/ScratchView.iml +++ b/ScratchView.iml @@ -1,5 +1,5 @@ - + diff --git a/app/app.iml b/app/app.iml index 79b4a59..0f0fe4b 100644 --- a/app/app.iml +++ b/app/app.iml @@ -1,5 +1,5 @@ - + @@ -9,13 +9,9 @@ - + - + + + + - + + + + + + + + + + + + + + + - + - + + + + + + + + + + + - - - - - - - - + + + + + + + + - + + + + + + - + - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/cooltechworks/scratchview/demo/DemoClothingActivity.java b/app/src/main/java/com/cooltechworks/scratchview/demo/DemoClothingActivity.java index 4f0f2f5..9c908af 100644 --- a/app/src/main/java/com/cooltechworks/scratchview/demo/DemoClothingActivity.java +++ b/app/src/main/java/com/cooltechworks/scratchview/demo/DemoClothingActivity.java @@ -18,6 +18,7 @@ import android.os.Bundle; import android.support.v7.app.AppCompatActivity; +import android.util.Log; import android.view.View; import android.widget.TextView; @@ -49,6 +50,7 @@ public void onRevealed(ScratchTextView tv) { @Override public void onRevealPercentChangedListener(ScratchTextView stv, float percent) { // on percent reveal. + Log.i("Percentage", String.valueOf(percent)); } }); } diff --git a/build.gradle b/build.gradle index 44bac8f..cb8e282 100644 --- a/build.gradle +++ b/build.gradle @@ -7,9 +7,7 @@ buildscript { } dependencies { classpath 'com.android.tools.build:gradle:3.1.2' - - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } diff --git a/gradlew b/gradlew old mode 100644 new mode 100755 diff --git a/views/build.gradle b/views/build.gradle index 90db632..8c2804a 100644 --- a/views/build.gradle +++ b/views/build.gradle @@ -1,5 +1,9 @@ apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' + +group='com.github.benobab' + android { compileSdkVersion 27 buildToolsVersion "27.0.3" @@ -22,4 +26,4 @@ dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) testImplementation 'junit:junit:4.12' implementation 'com.android.support:appcompat-v7:27.1.1' -} +} \ No newline at end of file diff --git a/views/src/main/java/com/cooltechworks/views/ScratchImageView.java b/views/src/main/java/com/cooltechworks/views/ScratchImageView.java index 27f7d3e..26f34df 100644 --- a/views/src/main/java/com/cooltechworks/views/ScratchImageView.java +++ b/views/src/main/java/com/cooltechworks/views/ScratchImageView.java @@ -158,7 +158,7 @@ private void init() { mErasePath = new Path(); mBitmapPaint = new Paint(Paint.DITHER_FLAG); - Bitmap scratchBitmap = BitmapFactory.decodeResource(getResources(), R.drawable.ic_scratch_pattern); + Bitmap scratchBitmap = BitmapFactory.decodeResource(getResources(), R.drawable.gold); mDrawable = new BitmapDrawable(getResources(), scratchBitmap); mDrawable.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT); diff --git a/views/src/main/java/com/cooltechworks/views/ScratchTextView.java b/views/src/main/java/com/cooltechworks/views/ScratchTextView.java index 4a41c4c..9a4d7cc 100644 --- a/views/src/main/java/com/cooltechworks/views/ScratchTextView.java +++ b/views/src/main/java/com/cooltechworks/views/ScratchTextView.java @@ -162,7 +162,7 @@ private void init() { mBitmapPaint = new Paint(Paint.DITHER_FLAG); - Bitmap scratchBitmap = BitmapFactory.decodeResource(getResources(), R.drawable.ic_scratch_pattern); + Bitmap scratchBitmap = BitmapFactory.decodeResource(getResources(), R.drawable.gold); mDrawable = new BitmapDrawable(getResources(), scratchBitmap); mDrawable.setTileModeXY(Shader.TileMode.REPEAT, Shader.TileMode.REPEAT); @@ -198,6 +198,9 @@ protected void onDraw(Canvas canvas) { } private void touch_start(float x, float y) { + + checkRevealed(); + mErasePath.reset(); mErasePath.moveTo(x, y); mX = x; @@ -207,6 +210,8 @@ private void touch_start(float x, float y) { private void touch_move(float x, float y) { + checkRevealed(); + float dx = Math.abs(x - mX); float dy = Math.abs(y - mY); if (dx >= TOUCH_TOLERANCE || dy >= TOUCH_TOLERANCE) { @@ -371,10 +376,10 @@ private int[] getTextBounds() { private int[] getTextBounds(float scale) { - int paddingLeft = getPaddingLeft(); - int paddingTop = getPaddingTop(); - int paddingRight = getPaddingRight(); - int paddingBottom = getPaddingBottom(); + int paddingLeft = 0; //getPaddingLeft(); + int paddingTop = 0; //getPaddingTop(); + int paddingRight = 0; //getPaddingRight(); + int paddingBottom = 0; //getPaddingBottom(); int vwidth = getWidth(); int vheight = getHeight(); diff --git a/views/src/main/res/drawable/gold.png b/views/src/main/res/drawable/gold.png new file mode 100644 index 0000000000000000000000000000000000000000..0a20a98114e0e9b3ceeacafcec50da60d1164017 GIT binary patch literal 9937 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�uh~Q#J4h0|`{fR;iRTe;*}Sn+8-$sr^aN&yVbX*t$AtuV zbEKv+3o`b}wm$KTSUoZ81;@XQ-;g+LN1jwaUf<9#Tt*cOPj(~n{cak{pkhf&7pl{} z@;Q5K#~ga77ogFeZ|RBmb|VzN`qS2k!;s;>)QWe&$JeV_O>KTp)5BDUsOM{iP&2(( zX`NN&uYUP?5q0-{3dTBur~eoAP+XtGrpXq6kx%`}-EHr9?b%-mp_U&2wo z4cl5{f_vi*al`})p*_#NJj{3IZ!O37m?nF$;SE`h8Bw3d0QZ20riAE@ra{*~33fj3 zoNP#YB}b934yKwsVhq{(0L#}4%Md-5B-s?0oTJqNoVAs!YiuSR{fX{m2s-LP81#i0 zVv7S=?{$oc0ci%LZ0m1Ct`0pr==QXZDxwn5yPd1%>SvpbXi-VzdSVVw<^G(pWbCic z0R~@R>6l`!4*XX5EWaFPw$=2YOhygn^>H;@Nv&^dHY z!S1!t=>kf02dMjLVSJqDAbwdn`GDQLmpd&i*>jq372`G`+EbvoeFpq2pLFHWZEo6aq?x7cPI>a?}pT_81S~`@Iya(`x#G-zP~l%!m>7Lh37MKne-9+J|_^u z6-Yy6*}c;iM@G+1LTC_MGfg!~c0wXhC;&$wTz27Dcs;4HO znIN^UD5^45KU-sEcTKJTB!{yIl3I(wZI?*BSW13zI#)@9ZlM|Rt67pM(hp^JE(aHn z3SY&g3smNlR86tX$WkH1MjCdf#bJdl1K8Fq&E{p|SB}a#_t>>_b5lPs`qEV0L4qdg z7=+D|GOIXTlIkjCFK%LW=LLCo4mU9AP4Z+9ce~H9?*-wC3T%y(eos;#WKAxlFfIh0 StpE9WCNHfbRV!f<@_zs=NEtE! literal 0 HcmV?d00001 diff --git a/views/views.iml b/views/views.iml index c106ff9..c2aef6e 100644 --- a/views/views.iml +++ b/views/views.iml @@ -1,5 +1,5 @@ - + @@ -9,13 +9,9 @@ - + - + + + + - + + + + + + + + + + + + + + + - + + + + + + + + - - - - - + + + - + + + + + + + + - + - - - - - + + + + + + + + + + + + + + + + \ No newline at end of file From 11f7bf63bac68b82aa1d207a28fd2fe79527e5e1 Mon Sep 17 00:00:00 2001 From: Benobab Date: Thu, 4 Oct 2018 10:52:10 +0200 Subject: [PATCH 5/5] [EVOL] - Changed way of revealing view (only text, no padding taken in account) --- app/app.iml | 2 -- .../java/com/cooltechworks/views/ScratchTextView.java | 8 ++++---- views/views.iml | 1 - 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/app.iml b/app/app.iml index 0f0fe4b..298e0b9 100644 --- a/app/app.iml +++ b/app/app.iml @@ -87,7 +87,6 @@ - @@ -98,7 +97,6 @@ - diff --git a/views/src/main/java/com/cooltechworks/views/ScratchTextView.java b/views/src/main/java/com/cooltechworks/views/ScratchTextView.java index 9a4d7cc..e26cef0 100644 --- a/views/src/main/java/com/cooltechworks/views/ScratchTextView.java +++ b/views/src/main/java/com/cooltechworks/views/ScratchTextView.java @@ -376,10 +376,10 @@ private int[] getTextBounds() { private int[] getTextBounds(float scale) { - int paddingLeft = 0; //getPaddingLeft(); - int paddingTop = 0; //getPaddingTop(); - int paddingRight = 0; //getPaddingRight(); - int paddingBottom = 0; //getPaddingBottom(); + int paddingLeft = getPaddingLeft(); + int paddingTop = getPaddingTop(); + int paddingRight = getPaddingRight(); + int paddingBottom = getPaddingBottom(); int vwidth = getWidth(); int vheight = getHeight(); diff --git a/views/views.iml b/views/views.iml index c2aef6e..71f23e1 100644 --- a/views/views.iml +++ b/views/views.iml @@ -92,7 +92,6 @@ -