Skip to content

Commit

Permalink
UPDATED GRADLE VERSION
Browse files Browse the repository at this point in the history
  • Loading branch information
TutorialsAndroid committed Aug 4, 2020
1 parent a243a85 commit cba0a7d
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 27 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.6.3'
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
}
}
Expand Down
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 @@
#Sat Jan 20 01:13:22 IRST 2018
#Tue Aug 04 19:36:08 IST 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
4 changes: 2 additions & 2 deletions library/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ android {
defaultConfig {
minSdkVersion 15
targetSdkVersion 29
versionCode 7
versionName "5.0.19"
versionCode 8
versionName "6.0.19"
}
buildTypes {
release {
Expand Down
3 changes: 1 addition & 2 deletions library/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
<manifest package="com.developer.progressx">

<application />
</manifest>
</manifest>
21 changes: 3 additions & 18 deletions library/src/main/java/com/developer/progressx/ProgressWheel.java
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,10 @@
import android.util.TypedValue;
import android.view.View;

/**
* @author tkdco , TutorialsAndroid
*/
public class ProgressWheel extends View {

private final int barLength = 16;
/**
* *********
* DEFAULTS *
* **********
*/

//Sizes (with defaults in DP)
private int circleRadius = 28;
private int barWidth = 4;
Expand All @@ -37,6 +31,7 @@ public class ProgressWheel extends View {
private float barExtraLength = 0;
private boolean barGrowingFromFront = true;
private long pausedTimeWithoutGrowing = 0;

//Colors (with defaults)
private int barColor = 0xAA000000;
private int rimColor = 0x00FFFFFF;
Expand Down Expand Up @@ -65,9 +60,6 @@ public class ProgressWheel extends View {

private boolean shouldAnimate;

/**
* The constructor for the ProgressWheel
*/
public ProgressWheel(Context context, AttributeSet attrs) {
super(context, attrs);

Expand All @@ -76,9 +68,6 @@ public ProgressWheel(Context context, AttributeSet attrs) {
setAnimationEnabled();
}

/**
* The constructor for the ProgressWheel
*/
public ProgressWheel(Context context) {
super(context);
setAnimationEnabled();
Expand All @@ -99,10 +88,6 @@ public ProgressWheel(Context context) {
shouldAnimate = animationValue != 0;
}

//----------------------------------
//Setting up stuff
//----------------------------------

@Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec);

Expand Down
4 changes: 2 additions & 2 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "com.developer.progressx.custom"
minSdkVersion 15
targetSdkVersion 29
versionCode 7
versionName "5.0.19"
versionCode 8
versionName "6.0.19"
}
buildTypes {
release {
Expand Down

0 comments on commit cba0a7d

Please sign in to comment.