From 8b1c09ea5d6ba717976293fc4362905f1aee3a4c Mon Sep 17 00:00:00 2001 From: Arthur Melo Date: Fri, 27 Apr 2018 04:31:58 -0300 Subject: [PATCH 1/3] updated build gradle to work with android studio 3.1.2 --- build.gradle | 4 +++- elasticdownload/build.gradle | 6 +++--- .../main/java/is/arontibo/library/ElasticDownloadView.java | 1 + example/build.gradle | 1 + gradle/wrapper/gradle-wrapper.properties | 4 ++-- 5 files changed, 10 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 9684ef5..428b0f8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,9 +1,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:1.0.1' + classpath 'com.android.tools.build:gradle:3.0.0' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -13,5 +14,6 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/elasticdownload/build.gradle b/elasticdownload/build.gradle index dfa7952..c6497c6 100644 --- a/elasticdownload/build.gradle +++ b/elasticdownload/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'maven' android { compileSdkVersion 22 @@ -15,6 +16,7 @@ android { targetSdkVersion 22 versionCode 1 versionName "1.0" + vectorDrawables.useSupportLibrary = true } buildTypes { release { @@ -24,10 +26,8 @@ android { } } -apply from: 'https://raw.github.com/chrisbanes/gradle-mvn-push/master/gradle-mvn-push.gradle' - dependencies { compile fileTree(dir: 'libs', include: ['*.jar']) compile 'com.android.support:appcompat-v7:22.1.1' compile 'com.nineoldandroids:library:2.4.0' -} +} \ No newline at end of file diff --git a/elasticdownload/src/main/java/is/arontibo/library/ElasticDownloadView.java b/elasticdownload/src/main/java/is/arontibo/library/ElasticDownloadView.java index bf280bb..f90fca7 100644 --- a/elasticdownload/src/main/java/is/arontibo/library/ElasticDownloadView.java +++ b/elasticdownload/src/main/java/is/arontibo/library/ElasticDownloadView.java @@ -2,6 +2,7 @@ import android.content.Context; import android.content.res.TypedArray; +import android.graphics.Color; import android.os.Build; import android.os.Parcelable; import android.util.AttributeSet; diff --git a/example/build.gradle b/example/build.gradle index 22ce6a3..396bc0a 100644 --- a/example/build.gradle +++ b/example/build.gradle @@ -10,6 +10,7 @@ android { targetSdkVersion 22 versionCode 1 versionName "1.0" + javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true } buildTypes { release { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 0c71e76..d559f03 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Apr 10 15:27:10 PDT 2013 +#Fri Apr 27 01:06:57 BRT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip From 1c901cea0308d4c4069f4d2f35501b970d35ea8b Mon Sep 17 00:00:00 2001 From: Arthur Melo Date: Fri, 27 Apr 2018 04:32:53 -0300 Subject: [PATCH 2/3] changing colors of background string and flag --- .../is/arontibo/library/ProgressDownloadView.java | 14 +++++++------- elasticdownload/src/main/res/values/colors.xml | 1 + example/src/main/res/layout/activity_main.xml | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/elasticdownload/src/main/java/is/arontibo/library/ProgressDownloadView.java b/elasticdownload/src/main/java/is/arontibo/library/ProgressDownloadView.java index b9b0141..079d825 100644 --- a/elasticdownload/src/main/java/is/arontibo/library/ProgressDownloadView.java +++ b/elasticdownload/src/main/java/is/arontibo/library/ProgressDownloadView.java @@ -1,9 +1,5 @@ package is.arontibo.library; -import com.nineoldandroids.animation.Animator; -import com.nineoldandroids.animation.AnimatorSet; -import com.nineoldandroids.animation.ObjectAnimator; - import android.content.Context; import android.graphics.Canvas; import android.graphics.Color; @@ -19,6 +15,10 @@ import android.view.animation.DecelerateInterpolator; import android.view.animation.OvershootInterpolator; +import com.nineoldandroids.animation.Animator; +import com.nineoldandroids.animation.AnimatorSet; +import com.nineoldandroids.animation.ObjectAnimator; + /** * Created by thibaultguegan on 15/02/15. */ @@ -64,12 +64,12 @@ public ProgressDownloadView(Context context, AttributeSet attrs) { mPaintWhite = new Paint(Paint.ANTI_ALIAS_FLAG); mPaintWhite.setStyle(Paint.Style.STROKE); mPaintWhite.setStrokeWidth(5 * mDensity); - mPaintWhite.setColor(Color.WHITE); + mPaintWhite.setColor(Color.GREEN); mPaintWhite.setStrokeCap(Paint.Cap.ROUND); //mPaintWhite.setPathEffect(new CornerPathEffect(5*mDensity)); mPaintBubble = new Paint(Paint.ANTI_ALIAS_FLAG); - mPaintBubble.setColor(Color.WHITE); + mPaintBubble.setColor(Color.GREEN); mPaintBubble.setStyle(Paint.Style.FILL); mPaintText = new Paint(Paint.ANTI_ALIAS_FLAG); @@ -124,7 +124,7 @@ protected void onDraw(Canvas canvas) { break; case STATE_SUCCESS: canvas.save(); - mPaintText.setColor(getResources().getColor(R.color.green_grass)); + mPaintText.setColor(getResources().getColor(R.color.white)); textX = Math.max(getPaddingLeft() - (int) (mBubbleWidth / 3.2f), mProgress * mWidth / 100 - (int) (mBubbleWidth / 3.2f)); Matrix flipMatrix = new Matrix(); flipMatrix.setScale(mFlipFactor, 1, bubbleAnchorX, bubbleAnchorY); diff --git a/elasticdownload/src/main/res/values/colors.xml b/elasticdownload/src/main/res/values/colors.xml index b4893b8..44e42b2 100644 --- a/elasticdownload/src/main/res/values/colors.xml +++ b/elasticdownload/src/main/res/values/colors.xml @@ -2,6 +2,7 @@ #EC5745 #A6463A + #FFFFFF #4B1D17 #109121 \ No newline at end of file diff --git a/example/src/main/res/layout/activity_main.xml b/example/src/main/res/layout/activity_main.xml index 5ffd4c4..a21a4ad 100644 --- a/example/src/main/res/layout/activity_main.xml +++ b/example/src/main/res/layout/activity_main.xml @@ -9,7 +9,7 @@ android:id="@+id/elastic_download_view" android:layout_width="wrap_content" android:layout_height="wrap_content" - elastic:backgroundColor="#00796B" + elastic:backgroundColor="#ffffff" android:layout_centerInParent="true"/> From ae4257761529e7910541a77fc34e236a258436ff Mon Sep 17 00:00:00 2001 From: Arthur Oliveira de Melo Date: Fri, 27 Apr 2018 04:45:34 -0300 Subject: [PATCH 3/3] Set theme jekyll-theme-modernist --- _config.yml | 1 + 1 file changed, 1 insertion(+) create mode 100644 _config.yml diff --git a/_config.yml b/_config.yml new file mode 100644 index 0000000..cc35c1d --- /dev/null +++ b/_config.yml @@ -0,0 +1 @@ +theme: jekyll-theme-modernist \ No newline at end of file