Merge pull request #18 from agrawalsuneet/dev

Merge Dev to master for 0.8 release
agrawalsuneet · Sep 22, 2018 · 6f3c72e · 6f3c72e
2 parents c6ebb8a + 5fae0a7
commit 6f3c72e
Show file tree

Hide file tree

Showing 23 changed files with 462 additions and 66 deletions.
diff --git a/README.md b/README.md
@@ -37,12 +37,16 @@ latest version : [ ![Download](https://api.bintray.com/packages/agrawalsuneet/an
 ![arcprogressloader](https://user-images.githubusercontent.com/12999622/45809206-3fe05800-bce5-11e8-90ef-f68e46de64cc.gif)
 
 
+### FidgetLoader
+![fidgetloader](https://user-images.githubusercontent.com/12999622/45921114-dfac0a80-becc-11e8-8a1e-8c8d78c31dd4.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.7'
+implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.8'
 ```
 
 ### ClockLoader
@@ -396,6 +400,50 @@ implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.7'
     </array>
 ```
 
+##### Through XML
+```
+<com.agrawalsuneet.loaderspack.loaders.FidgetLoader
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:fidget_animDuration="3000"
+        app:fidget_bodyColor="@color/blue_selected"
+        app:fidget_fidgetRadius="30dp"
+        app:fidget_interpolator="@android:anim/accelerate_decelerate_interpolator"
+        app:fidget_noOfRotation="10"
+        app:fidget_sideCirclesColor="@android:color/darker_gray" />
+```
+##### Through Code
+* Kotlin
+```
+         val fidgetLoader = FidgetLoader(this,
+                         20,
+                         ContextCompat.getColor(this, R.color.blue_selected),
+                         ContextCompat.getColor(this, R.color.amber))
+                         .apply {
+                             animDuration = 3000
+                             noOfRotation = 1
+                             interpolator = BounceInterpolator()
+                         }
+
+                 containerLayout.addView(fidgetLoader)
+```
+
+* Java
+```
+        FidgetLoader fidgetLoader = new FidgetLoader(this,
+                        20,
+                        ContextCompat.getColor(this, R.color.blue_selected),
+                        ContextCompat.getColor(this, R.color.amber));
+
+                fidgetLoader.setAnimDuration(3000);
+                fidgetLoader.setNoOfRotation(1);
+                fidgetLoader.setInterpolator(new BounceInterpolator());
+
+                container.addView(fidgetLoader);
+```
+
+
+### FidgetLoader
 ##### Through XML
 ```
 <com.agrawalsuneet.loaderspack.loaders.ArcProgressLoader
@@ -428,6 +476,7 @@ implementation 'com.agrawalsuneet.androidlibs:loaderspack:0.7'
                 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 [email protected] 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
@@ -3,6 +3,7 @@ package com.agrawalsuneet.loaders
 import android.os.Bundle
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
+import android.view.animation.BounceInterpolator
 import android.view.animation.LinearInterpolator
 import android.widget.LinearLayout
 import com.agrawalsuneet.loaderspack.loaders.*
@@ -13,9 +14,9 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.main_arcprogress)
+        setContentView(R.layout.main_fidget)
 
-        supportActionBar?.setTitle("ArcProgressLoader")
+        supportActionBar?.setTitle("FidgetLoader")
 
         containerLayout = findViewById(R.id.container)
 
@@ -31,6 +32,22 @@ class MainActivity : AppCompatActivity() {
         //initRingAndCircleLoader()
 
         //initArcProgressLoader()
+
+        //initFidgetLoader()
+    }
+
+    private fun initFidgetLoader() {
+        val fidgetLoader = FidgetLoader(this,
+                20,
+                ContextCompat.getColor(this, R.color.blue_selected),
+                ContextCompat.getColor(this, R.color.amber))
+                .apply {
+                    animDuration = 3000
+                    noOfRotation = 1
+                    interpolator = BounceInterpolator()
+                }
+
+        containerLayout.addView(fidgetLoader)
     }
 
     private fun initArcProgressLoader() {

diff --git a/app/src/main/java/com/agrawalsuneet/loaders/MainActivityJava.java b/app/src/main/java/com/agrawalsuneet/loaders/MainActivityJava.java
@@ -4,15 +4,10 @@
 import android.support.annotation.Nullable;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AppCompatActivity;
-import android.view.animation.LinearInterpolator;
+import android.view.animation.BounceInterpolator;
 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;
-import com.agrawalsuneet.loaderspack.loaders.MultipleRippleLoader;
-import com.agrawalsuneet.loaderspack.loaders.RingAndCircleLoader;
+import com.agrawalsuneet.loaderspack.loaders.FidgetLoader;
 
 /**
  * Created by suneet on 10/31/17.
@@ -29,7 +24,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         setContentView(R.layout.activity_main_clock);
 
 
-        //Clock Loader
+        /*//Clock Loader
         ClockLoader clockLoader = new ClockLoader(this);
         clockLoader.setOuterCircleBorderWidth(8.0f);
         clockLoader.setBigCircleRadius(150.0f);
@@ -48,17 +43,17 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         container.addView(clockLoader);
 
         //RotatingCircularSticksLoader
-        /*RotatingCircularSticksLoader loader = new RotatingCircularSticksLoader(this,
+        RotatingCircularSticksLoader loader = new RotatingCircularSticksLoader(this,
                 16, 100f, 50f,
                 ContextCompat.getColor(this, R.color.blue),
                 ContextCompat.getColor(this, android.R.color.white));
 
         loader.setAnimDuration(5000);
-        container.addView(loader);*/
+        container.addView(loader);
 
 
         //CircularSticksLoader
-        CircularSticksLoader loader = new CircularSticksLoader(this, 16,
+        *//*CircularSticksLoader loader = new CircularSticksLoader(this, 16,
                 200f, 100f,
                 ContextCompat.getColor(this, R.color.blue),
                 ContextCompat.getColor(this, R.color.red),
@@ -69,7 +64,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         loader.setSecondShadowColor(ContextCompat.getColor(this, R.color.yellow));
         loader.setAnimDuration(100);
 
-        container.addView(loader);
+        container.addView(loader);*//*
 
 
         //MultipleRippleLoader
@@ -120,7 +115,19 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
                 10.0f, 180.0f,
                 getResources().getIntArray(R.array.colors_rgb));
 
-        container.addView(arcProgressLoader);
+        container.addView(arcProgressLoader);*/
+
+
+        FidgetLoader fidgetLoader = new FidgetLoader(this,
+                20,
+                ContextCompat.getColor(this, R.color.blue_selected),
+                ContextCompat.getColor(this, R.color.amber));
+
+        fidgetLoader.setAnimDuration(3000);
+        fidgetLoader.setNoOfRotation(1);
+        fidgetLoader.setInterpolator(new BounceInterpolator());
+
+        container.addView(fidgetLoader);
     }
 
 

diff --git a/app/src/main/res/layout/activity_main_circular.xml b/app/src/main/res/layout/activity_main_circular.xml
@@ -87,9 +87,9 @@
         app:circularsticks_noOfSticks="32"
         app:circularsticks_outerCircleRadius="80dp"
         app:circularsticks_secondShadowColor="#77000000"
-        app:circularsticks_selectedStickColor="@color/black"
+        app:circularsticks_selectedStickColor="@android:color/black"
         app:circularsticks_showRunningShadow="true"
-        app:circularsticks_stickColor="@color/grey"
+        app:circularsticks_stickColor="@android:color/darker_gray"
         app:circularsticks_viewBackgroundColor="@color/white" />
 
 

diff --git a/app/src/main/res/layout/activity_main_circular_rotating.xml b/app/src/main/res/layout/activity_main_circular_rotating.xml
@@ -70,7 +70,7 @@
         app:rotatingsticks_innerCircleRadius="60dp"
         app:rotatingsticks_noOfSticks="50"
         app:rotatingsticks_outerCircleRadius="80dp"
-        app:rotatingsticks_stickColor="@color/grey"
+        app:rotatingsticks_stickColor="@android:color/darker_gray"
         app:rotatingsticks_viewBackgroundColor="@color/white" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main_clock.xml b/app/src/main/res/layout/activity_main_clock.xml
@@ -32,15 +32,15 @@
         android:layout_height="wrap_content"
         app:clock_animSpeedMultiplier="0.5"
         android:layout_margin="16dp"
-        app:clock_bigCircleColor="@color/black"
+        app:clock_bigCircleColor="@android:color/black"
         app:clock_bigCircleRadius="100dp"
-        app:clock_hourHandColor="@color/grey"
+        app:clock_hourHandColor="@android:color/darker_gray"
         app:clock_hourHandLength="50dp"
-        app:clock_innerCircleColor="@color/grey"
+        app:clock_innerCircleColor="@android:color/darker_gray"
         app:clock_innerCircleRadius="5dp"
-        app:clock_minuteHandColor="@color/grey"
+        app:clock_minuteHandColor="@android:color/darker_gray"
         app:clock_minuteHandLength="80dp"
-        app:clock_outerCircleBorderColor="@color/grey"
+        app:clock_outerCircleBorderColor="@android:color/darker_gray"
         app:clock_outerCircleBorderWidth="10dp" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main_multipleripple.xml b/app/src/main/res/layout/activity_main_multipleripple.xml
@@ -91,7 +91,7 @@
             android:layout_height="wrap_content"
             android:layout_centerInParent="true"
             app:multipleripple_animDuration="4000"
-            app:multipleripple_circleColor="@color/grey"
+            app:multipleripple_circleColor="@android:color/darker_gray"
             app:multipleripple_circleInitialRadius="36dp"
             app:multipleripple_fromAlpha="0.6"
             app:multipleripple_interpolator="@android:anim/linear_interpolator"

diff --git a/app/src/main/res/layout/main_curves.xml b/app/src/main/res/layout/main_curves.xml
@@ -71,7 +71,7 @@
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         app:curves_animDuration="1000"
-        app:curves_curveColor="@color/grey"
+        app:curves_curveColor="@android:color/darker_gray"
         app:curves_curveSweepAngle="150"
         app:curves_curveWidth="5dp"
         app:curves_distanceBetweenCurves="5dp"

diff --git a/app/src/main/res/layout/main_fidget.xml b/app/src/main/res/layout/main_fidget.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="16dp"
+        android:orientation="horizontal">
+
+        <com.agrawalsuneet.loaderspack.loaders.FidgetLoader
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            app:fidget_animDuration="5000"
+            app:fidget_bodyColor="@color/red"
+            app:fidget_fidgetRadius="18dp"
+            app:fidget_interpolator="@android:anim/linear_interpolator"
+            app:fidget_noOfRotation="5"
+            app:fidget_sideCirclesColor="@android:color/darker_gray" />
+
+        <com.agrawalsuneet.loaderspack.loaders.FidgetLoader
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            app:fidget_animDuration="5000"
+            app:fidget_bodyColor="@color/amber"
+            app:fidget_fidgetRadius="18dp"
+            app:fidget_interpolator="@android:anim/linear_interpolator"
+            app:fidget_noOfRotation="5"
+            app:fidget_sideCirclesColor="@android:color/darker_gray" />
+
+        <com.agrawalsuneet.loaderspack.loaders.FidgetLoader
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="8dp"
+            app:fidget_animDuration="5000"
+            app:fidget_bodyColor="@color/green"
+            app:fidget_fidgetRadius="18dp"
+            app:fidget_interpolator="@android:anim/linear_interpolator"
+            app:fidget_noOfRotation="5"
+            app:fidget_sideCirclesColor="@android:color/darker_gray" />
+
+    </LinearLayout>
+
+
+    <com.agrawalsuneet.loaderspack.loaders.FidgetLoader
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        app:fidget_animDuration="3000"
+        app:fidget_bodyColor="@color/blue_selected"
+        app:fidget_fidgetRadius="30dp"
+        app:fidget_interpolator="@android:anim/accelerate_decelerate_interpolator"
+        app:fidget_noOfRotation="10"
+        app:fidget_sideCirclesColor="@android:color/darker_gray" />
+
+
+    <com.agrawalsuneet.loaderspack.loaders.FidgetLoader
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="8dp"
+        app:fidget_animDuration="1000"
+        app:fidget_bodyColor="@android:color/black"
+        app:fidget_fidgetRadius="25dp"
+        app:fidget_interpolator="@android:anim/linear_interpolator"
+        app:fidget_noOfRotation="1"
+        app:fidget_sideCirclesColor="@color/darkmagenta" />
+
+
+</LinearLayout>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -13,11 +13,14 @@
     <color name="amber">#FFC200</color>
     <color name="amber_default">#77FFC200</color>
 
+    <color name="blue">#0000ff</color>
     <color name="blue_selected">#2196F3</color>
     <color name="blue_delfault">#BBDEFB</color>
 
     <color name="grey_default">#55A9A9A9</color>
 
+    <color name="darkmagenta">#8B008B</color>
+
     <array name="colors_red">
         <item>@color/red</item>
     </array>
@@ -34,7 +37,7 @@
         <item>@color/red</item>
         <item>@color/amber</item>
         <item>@color/green</item>
-        <item>@color/grey</item>
+        <item>@android:color/darker_gray</item>
     </array>
 
     <array name="colors_blue">

diff --git 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.7'
+    PUBLISH_VERSION = '0.8'
 }
 
 android {
@@ -19,8 +19,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 27
-        versionCode 7
-        versionName "0.7"
+        versionCode 8
+        versionName "0.8"
     }
 
     buildTypes {

diff --git a/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/basicviews/ArcView.kt b/loaderspack/src/main/java/com/agrawalsuneet/loaderspack/basicviews/ArcView.kt
@@ -21,7 +21,7 @@ class ArcView : View {
 
     var sweepAngle: Float = 180.0f
 
-    var arcColor: Int = resources.getColor(R.color.red)
+    var arcColor: Int = resources.getColor(android.R.color.holo_red_dark)
     var drawOnlyStroke: Boolean = true
 
     private val paint: Paint = Paint()
@@ -64,7 +64,7 @@ class ArcView : View {
         this.startAngle = typedArray.getFloat(R.styleable.ArcView_startAngle, 0.0f)
         this.sweepAngle = typedArray.getFloat(R.styleable.ArcView_sweepAngle, 180.0f)
 
-        this.arcColor = typedArray.getColor(R.styleable.ArcView_arcColor, resources.getColor(R.color.red))
+        this.arcColor = typedArray.getColor(R.styleable.ArcView_arcColor, resources.getColor(android.R.color.holo_red_dark))
 
         this.drawOnlyStroke = typedArray.getBoolean(R.styleable.ArcView_drawOnlyStroke, true)