From e9801ddf20395f84c4b452315d36b05cb2c82ea7 Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Sun, 16 Sep 2018 23:01:49 +0530 Subject: [PATCH 1/7] added loader --- .idea/caches/build_file_checksums.ser | Bin 548 -> 548 bytes .idea/misc.xml | 2 +- app/build.gradle | 1 + .../com/agrawalsuneet/loaders/MainActivity.kt | 4 +- app/src/main/res/layout/main_arcprogress.xml | 59 ++++++ .../loaderspack/loaders/ArcProgressLoader.kt | 175 ++++++++++++++++++ loaderspack/src/main/res/values/colors.xml | 2 + 7 files changed, 240 insertions(+), 3 deletions(-) create mode 100644 app/src/main/res/layout/main_arcprogress.xml create mode 100644 loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index ee554e81e1da255d638c2dff05db9d478ec4215b..af5621ab22d43745ff0c0c905432a39e0f42653e 100644 GIT binary patch delta 33 rcmV++0N($k1f&Fzm;~cK-@&n*cL5RLmfnh$*P^f5Q2>xsR@!5D77Gx` delta 33 rcmV++0N($k1f&Fzm;}ED>#?z%cL5PUhtE60l}f+^mxLqX>OU`d_EHYl diff --git a/.idea/misc.xml b/.idea/misc.xml index f7fa969..d1817bf 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -24,5 +24,5 @@ - + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 4066cfb..e323154 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,5 +24,6 @@ dependencies { implementation 'com.android.support:appcompat-v7:27.1.0' implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" implementation project(':loaderspack') + //implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.6' implementation 'com.android.support.constraint:constraint-layout:1.0.2' } diff --git a/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt b/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt index f51e7ae..e467c04 100644 --- a/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt +++ b/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt @@ -13,9 +13,9 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.main_ringandcircle) + setContentView(R.layout.main_arcprogress) - supportActionBar?.setTitle("RingAndCircleLoader") + supportActionBar?.setTitle("ArcProgressLoader") containerLayout = findViewById(R.id.container) diff --git a/app/src/main/res/layout/main_arcprogress.xml b/app/src/main/res/layout/main_arcprogress.xml new file mode 100644 index 0000000..533f200 --- /dev/null +++ b/app/src/main/res/layout/main_arcprogress.xml @@ -0,0 +1,59 @@ + + + + + + + + + + \ No newline at end of file diff --git a/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt b/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt new file mode 100644 index 0000000..4adac85 --- /dev/null +++ b/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt @@ -0,0 +1,175 @@ +package com.agrawalsuneet.loaderspack.loaders + +import android.content.Context +import android.graphics.Canvas +import android.graphics.Paint +import android.graphics.RectF +import android.util.AttributeSet +import android.view.View +import com.agrawalsuneet.loaderspack.R +import com.agrawalsuneet.loaderspack.basicviews.LoaderContract + +/** + * Created by agrawalsuneet on 9/16/18. + */ + +class ArcProgressLoader : View, LoaderContract { + + + var arcRadius: Int = 200 + var arcWidth: Int = 40 + + var increamentalAngle: Float = 6.0f + + var maxArcAngle: Int = 270 + set(value) { + field = if (value > 360) (value % 360) else value + } + + + var arcColorsArray: IntArray = intArrayOf(resources.getColor(R.color.red), + resources.getColor(R.color.amber), + resources.getColor(R.color.green)) + + private val paint: Paint = Paint() + private var centerPoint: Float = 0.0f + private var acrRect = RectF() + + private val ZeroAngle: Float = 270.0f + private val ThreeSixtyAngle: Float = 630.0f + + private var startAngle: Float = ZeroAngle + private var endAngle: Float = ZeroAngle + increamentalAngle + private var colorIndex: Int = 0 + + + constructor(context: Context) : super(context) { + initValues() + } + + constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { + initAttributes(attrs) + initValues() + } + + constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) { + initAttributes(attrs) + initValues() + } + + override fun initAttributes(attrs: AttributeSet) { + + /*val typedArray = context.obtainStyledAttributes(attrs, R.styleable.SVGLoader) + + markerLength = typedArray.getDimensionPixelSize(R.styleable.SVGLoader_svgloader_markerLength, 50) + + viewportWidth = typedArray.getFloat(R.styleable.SVGLoader_svgloader_viewportWidth, 500f) + viewportHeight = typedArray.getFloat(R.styleable.SVGLoader_svgloader_viewportHeight, 500f) + + fillTime = typedArray.getInteger(R.styleable.SVGLoader_svgloader_fillTime, 1000) + timePerShape = typedArray.getInteger(R.styleable.SVGLoader_svgloader_timePerShape, 2000) + + interpolator = AnimationUtils.loadInterpolator(context, + typedArray.getResourceId(R.styleable.SVGLoader_svgloader_interpolator, + android.R.anim.decelerate_interpolator)) + + viewportWidth = viewportWidth + viewportHeight = viewportHeight + + val shapesStringArrayId = typedArray.getResourceId(R.styleable.SVGLoader_svgloader_shapesStringArray, 0) + val traceColorArrayId = typedArray.getResourceId(R.styleable.SVGLoader_svgloader_traceColorsArray, 0) + val traceResidueColorsArrayId = typedArray.getResourceId(R.styleable.SVGLoader_svgloader_residueColorsArray, 0) + val fillColorsArrayId = typedArray.getResourceId(R.styleable.SVGLoader_svgloader_fillColorsArray, 0) + + typedArray.recycle() + + if (shapesStringArrayId == 0) { + throw RuntimeException("You need to set the shapes string array first.") + } else if (fillColorsArrayId == 0) { + throw RuntimeException("You need to set the shapes color array first.") + } + + shapesStringArray = resources.getStringArray(shapesStringArrayId) + fillColorsArray = resources.getIntArray(fillColorsArrayId) + + if (shapesStringArray.size > fillColorsArray.size) { + throw RuntimeException("Not enough colors to match all shapes. " + + "Please check the size of shapes arting array and colors array") + } + + traceColorsArray = validateColorsArray(traceColorArrayId, Color.BLACK, 1.0f) + traceResidueColorsArray = validateColorsArray(traceResidueColorsArrayId, Color.GRAY, 0.3f)*/ + } + + override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { + super.onMeasure(widthMeasureSpec, heightMeasureSpec) + + val widthHeight = (2 * (arcRadius)) + arcWidth + setMeasuredDimension(widthHeight, widthHeight) + } + + private fun initValues() { + centerPoint = (arcRadius + (arcWidth / 2)).toFloat() + + acrRect = RectF().apply { + left = centerPoint - arcRadius + right = centerPoint + arcRadius + top = centerPoint - arcRadius + bottom = centerPoint + arcRadius + } + + paint.isAntiAlias = true + + paint.style = Paint.Style.STROKE + paint.strokeWidth = arcWidth.toFloat() + paint.strokeCap = Paint.Cap.ROUND + } + + + override fun onDraw(canvas: Canvas) { + super.onDraw(canvas) + + + val sweepAngle = endAngle - startAngle + + paint.color = arcColorsArray[colorIndex] + canvas.drawArc(acrRect, startAngle, sweepAngle, false, paint) + + + //both reached the end, restart with next color + if (startAngle >= ThreeSixtyAngle && endAngle >= ThreeSixtyAngle) { + startAngle = ZeroAngle + endAngle = ZeroAngle + increamentalAngle + + + if (colorIndex == arcColorsArray.lastIndex) { + colorIndex = 0 + } else { + colorIndex++ + } + paint.color = arcColorsArray[colorIndex] + + } + + //endangle didn't reach end, keep increasing + else if (endAngle < ThreeSixtyAngle) { + + endAngle += increamentalAngle + + //max arc angel reached increase start angel also + if (sweepAngle >= maxArcAngle) { + startAngle += increamentalAngle + } + } + + //end angel reached limit, increase only start angel + else { + startAngle += increamentalAngle + } + + + postInvalidateOnAnimation() + + } + +} \ No newline at end of file diff --git a/loaderspack/src/main/res/values/colors.xml b/loaderspack/src/main/res/values/colors.xml index e78b5c6..3914a3f 100644 --- a/loaderspack/src/main/res/values/colors.xml +++ b/loaderspack/src/main/res/values/colors.xml @@ -5,4 +5,6 @@ #0000ff #ff0000 + #FFC200 + #00e500 From 644acbbeb5689340b33079262329a3de657792d7 Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Thu, 20 Sep 2018 14:05:04 +0530 Subject: [PATCH 2/7] added attributes --- .../loaderspack/loaders/ArcProgressLoader.kt | 61 ++++++------------- loaderspack/src/main/res/values/attrs.xml | 10 +++ 2 files changed, 29 insertions(+), 42 deletions(-) diff --git a/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt b/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt index 4adac85..ce9fae8 100644 --- a/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt +++ b/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt @@ -15,18 +15,16 @@ import com.agrawalsuneet.loaderspack.basicviews.LoaderContract class ArcProgressLoader : View, LoaderContract { - var arcRadius: Int = 200 var arcWidth: Int = 40 - var increamentalAngle: Float = 6.0f + var incrementalAngle: Float = 6.0f - var maxArcAngle: Int = 270 + var maxArcAngle: Float = 200.0f set(value) { field = if (value > 360) (value % 360) else value } - var arcColorsArray: IntArray = intArrayOf(resources.getColor(R.color.red), resources.getColor(R.color.amber), resources.getColor(R.color.green)) @@ -39,10 +37,9 @@ class ArcProgressLoader : View, LoaderContract { private val ThreeSixtyAngle: Float = 630.0f private var startAngle: Float = ZeroAngle - private var endAngle: Float = ZeroAngle + increamentalAngle + private var endAngle: Float = ZeroAngle + incrementalAngle private var colorIndex: Int = 0 - constructor(context: Context) : super(context) { initValues() } @@ -59,46 +56,28 @@ class ArcProgressLoader : View, LoaderContract { override fun initAttributes(attrs: AttributeSet) { - /*val typedArray = context.obtainStyledAttributes(attrs, R.styleable.SVGLoader) + val typedArray = context.obtainStyledAttributes(attrs, R.styleable.ArcProgressLoader) - markerLength = typedArray.getDimensionPixelSize(R.styleable.SVGLoader_svgloader_markerLength, 50) + arcRadius = typedArray.getDimensionPixelSize(R.styleable.ArcProgressLoader_arcprogress_arcRadius, 200) - viewportWidth = typedArray.getFloat(R.styleable.SVGLoader_svgloader_viewportWidth, 500f) - viewportHeight = typedArray.getFloat(R.styleable.SVGLoader_svgloader_viewportHeight, 500f) + arcWidth = typedArray.getDimensionPixelSize(R.styleable.ArcProgressLoader_arcprogress_arcWidth, 40) - fillTime = typedArray.getInteger(R.styleable.SVGLoader_svgloader_fillTime, 1000) - timePerShape = typedArray.getInteger(R.styleable.SVGLoader_svgloader_timePerShape, 2000) + incrementalAngle = typedArray.getFloat(R.styleable.ArcProgressLoader_arcprogress_incrementalAngle, 6.0f) - interpolator = AnimationUtils.loadInterpolator(context, - typedArray.getResourceId(R.styleable.SVGLoader_svgloader_interpolator, - android.R.anim.decelerate_interpolator)) + maxArcAngle = typedArray.getFloat(R.styleable.ArcProgressLoader_arcprogress_maxArcAngle, 200.0f) - viewportWidth = viewportWidth - viewportHeight = viewportHeight - val shapesStringArrayId = typedArray.getResourceId(R.styleable.SVGLoader_svgloader_shapesStringArray, 0) - val traceColorArrayId = typedArray.getResourceId(R.styleable.SVGLoader_svgloader_traceColorsArray, 0) - val traceResidueColorsArrayId = typedArray.getResourceId(R.styleable.SVGLoader_svgloader_residueColorsArray, 0) - val fillColorsArrayId = typedArray.getResourceId(R.styleable.SVGLoader_svgloader_fillColorsArray, 0) + val colorsArrayId = typedArray.getResourceId(R.styleable.ArcProgressLoader_arcprogress_arcColorsArray, 0) typedArray.recycle() - if (shapesStringArrayId == 0) { - throw RuntimeException("You need to set the shapes string array first.") - } else if (fillColorsArrayId == 0) { - throw RuntimeException("You need to set the shapes color array first.") - } - - shapesStringArray = resources.getStringArray(shapesStringArrayId) - fillColorsArray = resources.getIntArray(fillColorsArrayId) + if (colorsArrayId != 0) { + arcColorsArray = resources.getIntArray(colorsArrayId) - if (shapesStringArray.size > fillColorsArray.size) { - throw RuntimeException("Not enough colors to match all shapes. " + - "Please check the size of shapes arting array and colors array") + if (arcColorsArray == null || arcColorsArray.size < 1) { + throw RuntimeException("ArcProgressLoader : Please provide a valid, non-empty colors array") + } } - - traceColorsArray = validateColorsArray(traceColorArrayId, Color.BLACK, 1.0f) - traceResidueColorsArray = validateColorsArray(traceResidueColorsArrayId, Color.GRAY, 0.3f)*/ } override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { @@ -139,7 +118,7 @@ class ArcProgressLoader : View, LoaderContract { //both reached the end, restart with next color if (startAngle >= ThreeSixtyAngle && endAngle >= ThreeSixtyAngle) { startAngle = ZeroAngle - endAngle = ZeroAngle + increamentalAngle + endAngle = ZeroAngle + incrementalAngle if (colorIndex == arcColorsArray.lastIndex) { @@ -154,22 +133,20 @@ class ArcProgressLoader : View, LoaderContract { //endangle didn't reach end, keep increasing else if (endAngle < ThreeSixtyAngle) { - endAngle += increamentalAngle + endAngle += incrementalAngle //max arc angel reached increase start angel also if (sweepAngle >= maxArcAngle) { - startAngle += increamentalAngle + startAngle += incrementalAngle } } //end angel reached limit, increase only start angel else { - startAngle += increamentalAngle + startAngle += incrementalAngle } - - postInvalidateOnAnimation() - + postInvalidate() } } \ No newline at end of file diff --git a/loaderspack/src/main/res/values/attrs.xml b/loaderspack/src/main/res/values/attrs.xml index 0aa9533..9f33333 100644 --- a/loaderspack/src/main/res/values/attrs.xml +++ b/loaderspack/src/main/res/values/attrs.xml @@ -112,4 +112,14 @@ + + + + + + + + + + \ No newline at end of file From cbfeb23754179656b34bc05316cda41f08c5ef5b Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Thu, 20 Sep 2018 14:18:05 +0530 Subject: [PATCH 3/7] added layout --- app/src/main/res/layout/main_arcprogress.xml | 72 ++++++++++++-------- app/src/main/res/values/colors.xml | 25 +++++++ 2 files changed, 67 insertions(+), 30 deletions(-) diff --git a/app/src/main/res/layout/main_arcprogress.xml b/app/src/main/res/layout/main_arcprogress.xml index 533f200..f912594 100644 --- a/app/src/main/res/layout/main_arcprogress.xml +++ b/app/src/main/res/layout/main_arcprogress.xml @@ -1,59 +1,71 @@ - + app:arcprogress_arcColorsArray="@array/colors_green" + app:arcprogress_arcRadius="30dp" + app:arcprogress_arcWidth="5dp" + app:arcprogress_incrementalAngle="8.0" + app:arcprogress_maxArcAngle="200.0" /> + + + android:layout_height="wrap_content" + android:layout_margin="16dp" + app:arcprogress_arcColorsArray="@array/colors_rgb" + app:arcprogress_arcRadius="60dp" + app:arcprogress_arcWidth="8dp" + app:arcprogress_incrementalAngle="7.0" + app:arcprogress_maxArcAngle="220.0" /> + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index d94c25e..f899f3d 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -17,4 +17,29 @@ #BBDEFB #55A9A9A9 + + + @color/red + + + + @color/amber + + + + @color/green + + + + @color/red + @color/amber + @color/green + @color/grey + + + + @color/blue_selected + @color/blue_delfault + + From 5596023b753964094a804a52afc4fde58cce1f4f Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Thu, 20 Sep 2018 14:29:27 +0530 Subject: [PATCH 4/7] updated readme --- README.md | 49 ++++++++++++++++++- .../com/agrawalsuneet/loaders/MainActivity.kt | 12 +++++ .../loaders/MainActivityJava.java | 9 ++++ .../loaderspack/loaders/ArcProgressLoader.kt | 11 ++++- 4 files changed, 79 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index db8b08b..9dacf07 100644 --- a/README.md +++ b/README.md @@ -33,12 +33,16 @@ latest version : [ ![Download](https://api.bintray.com/packages/agrawalsuneet/an ![curvesloader](https://user-images.githubusercontent.com/12999622/45126558-d6e8d400-b16b-11e8-89bd-973e11a8e54e.gif) +### ArcProgressLoader +![curvesloader](https://user-images.githubusercontent.com/12999622/45126558-d6e8d400-b16b-11e8-89bd-973e11a8e54e.gif) + + Check all other loaders [here](https://agrawalsuneet.github.io/agrawalsuneet/opensourcecontribution/) ## How To use include below dependency in build.gradle of application and compile it ``` -implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.5' +implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.6' ``` ### ClockLoader @@ -381,6 +385,49 @@ implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.5' ``` + +### ArcProgressLoader +``` + + @color/red + @color/amber + @color/green + @color/grey + +``` + +##### Through XML +``` + +``` +##### Through Code +* Kotlin +``` + val arcProgressLoader = ArcProgressLoader(this, + 120, 20, + 10.0f, 180.0f, + resources.getIntArray(R.array.colors_rgb)) + + containerLayout.addView(arcProgressLoader) +``` + +* Java +``` + ArcProgressLoader arcProgressLoader = new ArcProgressLoader(this, + 120, 20, + 10.0f, 180.0f, + getResources().getIntArray(R.array.colors_rgb)); + + container.addView(arcProgressLoader); +``` + Please take a 2 mins survey to make this library better [here](https://goo.gl/forms/v0SZS0oI9rvInzdB3). It won't take more than 2 mins I promise :) or feel free to drop an email at agrawalsuneet@gmail.com if face any issue or require any additional functionality in it. ``` diff --git a/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt b/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt index e467c04..eadb8e4 100644 --- a/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt +++ b/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt @@ -29,6 +29,18 @@ class MainActivity : AppCompatActivity() { //initCurvesLoader() //initRingAndCircleLoader() + + //initArcProgressLoader() + } + + private fun initArcProgressLoader() { + val arcProgressLoader = ArcProgressLoader(this, + 120, 20, + 10.0f, 180.0f, + resources.getIntArray(R.array.colors_rgb)) + + containerLayout.addView(arcProgressLoader) + } private fun initRingAndCircleLoader() { diff --git a/app/src/main/java/com/agrawalsuneet/loaders/MainActivityJava.java b/app/src/main/java/com/agrawalsuneet/loaders/MainActivityJava.java index 5d4710d..12824ae 100644 --- a/app/src/main/java/com/agrawalsuneet/loaders/MainActivityJava.java +++ b/app/src/main/java/com/agrawalsuneet/loaders/MainActivityJava.java @@ -7,6 +7,7 @@ import android.view.animation.LinearInterpolator; import android.widget.LinearLayout; +import com.agrawalsuneet.loaderspack.loaders.ArcProgressLoader; import com.agrawalsuneet.loaderspack.loaders.CircularSticksLoader; import com.agrawalsuneet.loaderspack.loaders.ClockLoader; import com.agrawalsuneet.loaderspack.loaders.CurvesLoader; @@ -112,6 +113,14 @@ protected void onCreate(@Nullable Bundle savedInstanceState) { ringAndCircleLoader.setAnimDuration(1000); container.addView(ringAndCircleLoader); + + + ArcProgressLoader arcProgressLoader = new ArcProgressLoader(this, + 120, 20, + 10.0f, 180.0f, + getResources().getIntArray(R.array.colors_rgb)); + + container.addView(arcProgressLoader); } diff --git a/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt b/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt index ce9fae8..e20ad77 100644 --- a/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt +++ b/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/ArcProgressLoader.kt @@ -40,6 +40,7 @@ class ArcProgressLoader : View, LoaderContract { private var endAngle: Float = ZeroAngle + incrementalAngle private var colorIndex: Int = 0 + constructor(context: Context) : super(context) { initValues() } @@ -54,6 +55,15 @@ class ArcProgressLoader : View, LoaderContract { initValues() } + constructor(context: Context, arcRadius: Int, arcWidth: Int, incrementalAngle: Float, maxArcAngle: Float, arcColorsArray: IntArray) : super(context) { + this.arcRadius = arcRadius + this.arcWidth = arcWidth + this.incrementalAngle = incrementalAngle + this.maxArcAngle = maxArcAngle + this.arcColorsArray = arcColorsArray + initValues() + } + override fun initAttributes(attrs: AttributeSet) { val typedArray = context.obtainStyledAttributes(attrs, R.styleable.ArcProgressLoader) @@ -66,7 +76,6 @@ class ArcProgressLoader : View, LoaderContract { maxArcAngle = typedArray.getFloat(R.styleable.ArcProgressLoader_arcprogress_maxArcAngle, 200.0f) - val colorsArrayId = typedArray.getResourceId(R.styleable.ArcProgressLoader_arcprogress_arcColorsArray, 0) typedArray.recycle() From 7fc8faac7a4a28913d9867ee56cb098fa0591975 Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Thu, 20 Sep 2018 14:39:49 +0530 Subject: [PATCH 5/7] upgraded version number --- .idea/caches/build_file_checksums.ser | Bin 548 -> 548 bytes README.md | 2 +- loaderspack/build.gradle | 6 +++--- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index af5621ab22d43745ff0c0c905432a39e0f42653e..550bf2a94ffb7f185e880d2ba2ab1d6192819b33 100644 GIT binary patch delta 47 zcmV+~0MP%W1f&Fzm<0AaL7$PFs~9v+a%Z0zs<(6i5NvN_VQiDp0Tq*U F0kA(N7UBQ^ diff --git a/README.md b/README.md index 9dacf07..bec76b5 100644 --- a/README.md +++ b/README.md @@ -42,7 +42,7 @@ Check all other loaders [here](https://agrawalsuneet.github.io/agrawalsuneet/ope ## How To use include below dependency in build.gradle of application and compile it ``` -implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.6' +implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.7' ``` ### ClockLoader diff --git a/loaderspack/build.gradle b/loaderspack/build.gradle index 84c0eda..b53f524 100644 --- a/loaderspack/build.gradle +++ b/loaderspack/build.gradle @@ -8,7 +8,7 @@ repositories { ext { PUBLISH_GROUP_ID = 'com.agrawalsuneet.androidlibs' PUBLISH_ARTIFACT_ID = 'loaderspack' - PUBLISH_VERSION = '0.6' + PUBLISH_VERSION = '0.7' } android { @@ -19,8 +19,8 @@ android { defaultConfig { minSdkVersion 16 targetSdkVersion 27 - versionCode 6 - versionName "0.6" + versionCode 7 + versionName "0.7" } buildTypes { From d5831d97f72f2220caec4d4ef7cd017e5f1b3609 Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Thu, 20 Sep 2018 14:42:06 +0530 Subject: [PATCH 6/7] resolved conflicts --- .idea/caches/build_file_checksums.ser | Bin 548 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .idea/caches/build_file_checksums.ser diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 550bf2a94ffb7f185e880d2ba2ab1d6192819b33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 548 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7|*L6wG-0J>vOQkFpX5 z36L$RMa2b)$=UizAiu**C}gN(U;}9~@hjRgu~s-`?hHmvCe?EfOBe)l@{<#DKp|I< zT2zvmT3iZO9M@Oj%&y^kILzeZUN*%)0woOU`k}=@3-pUi^HNhw^r6Py6ZPK<6bE6yWg7gK77=re0sP O{#GEvgpjaX$rS);p}~Rx From 209347bc1421d7c00b8304ecad1a0cae1989fe32 Mon Sep 17 00:00:00 2001 From: Suneet Agrawal Date: Thu, 20 Sep 2018 15:01:00 +0530 Subject: [PATCH 7/7] updated readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index df02560..31c78f6 100644 --- a/README.md +++ b/README.md @@ -34,7 +34,7 @@ latest version : [ ![Download](https://api.bintray.com/packages/agrawalsuneet/an ### ArcProgressLoader -![curvesloader](https://user-images.githubusercontent.com/12999622/45126558-d6e8d400-b16b-11e8-89bd-973e11a8e54e.gif) +![arcprogressloader](https://user-images.githubusercontent.com/12999622/45809206-3fe05800-bce5-11e8-90ef-f68e46de64cc.gif) Check all other loaders [here](https://agrawalsuneet.github.io/agrawalsuneet/opensourcecontribution/)