Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions _config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
theme: jekyll-theme-modernist
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -13,5 +14,6 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}
6 changes: 3 additions & 3 deletions elasticdownload/build.gradle
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
apply plugin: 'com.android.library'
apply plugin: 'maven'

android {
compileSdkVersion 22
Expand All @@ -15,6 +16,7 @@ android {
targetSdkVersion 22
versionCode 1
versionName "1.0"
vectorDrawables.useSupportLibrary = true
}
buildTypes {
release {
Expand All @@ -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'
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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.
*/
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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);
Expand Down
1 change: 1 addition & 0 deletions elasticdownload/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<resources>
<color name="orange_salmon">#EC5745</color>
<color name="red_wine">#A6463A</color>
<color name="white">#FFFFFF</color>
<color name="red_wood">#4B1D17</color>
<color name="green_grass">#109121</color>
</resources>
1 change: 1 addition & 0 deletions example/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ android {
targetSdkVersion 22
versionCode 1
versionName "1.0"
javaCompileOptions.annotationProcessorOptions.includeCompileClasspath = true
}
buildTypes {
release {
Expand Down
2 changes: 1 addition & 1 deletion example/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>

</RelativeLayout>
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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