Merge pull request #37 from agrawalsuneet/dev

Merge Dev to master for 1.2.3 release

Author: agrawalsuneet

README.md

@@ -32,7 +32,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:1.2.2'
+implementation 'com.agrawalsuneet.androidlibs:loaderspack:1.2.3'
 ```
 
 

app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt

@@ -4,22 +4,20 @@ import android.os.Bundle
 import android.os.Handler
 import android.support.v4.content.ContextCompat
 import android.support.v7.app.AppCompatActivity
-import android.view.View
 import android.view.animation.Animation
 import android.view.animation.BounceInterpolator
 import android.view.animation.LinearInterpolator
 import android.view.animation.RotateAnimation
 import android.widget.LinearLayout
 import com.agrawalsuneet.loaderspack.loaders.*
-import kotlinx.android.synthetic.main.main_curves.*
 
 class MainActivity : AppCompatActivity() {
 
     lateinit var containerLayout: LinearLayout
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.main_curves)
+        setContentView(R.layout.activity_main_circular)
 
         supportActionBar?.setTitle("CurvesLoader")
 

loaderspack/build.gradle

@@ -8,19 +8,17 @@ repositories {
 ext {
     PUBLISH_GROUP_ID = 'com.agrawalsuneet.androidlibs'
     PUBLISH_ARTIFACT_ID = 'loaderspack'
-    PUBLISH_VERSION = '1.2.2'
+    PUBLISH_VERSION = '1.2.3'
 }
 
 android {
     compileSdkVersion 28
-    buildToolsVersion '28.0.2'
-
 
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 14
-        versionName "1.2.2"
+        versionCode 15
+        versionName "1.2.3"
     }
 
     buildTypes {

loaderspack/src/main/java/com/agrawalsuneet/loaderspack/loaders/CircularSticksLoader.kt

@@ -9,6 +9,7 @@ import android.view.View
 import com.agrawalsuneet.dotsloader.utils.Helper
 import com.agrawalsuneet.loaderspack.R
 import com.agrawalsuneet.loaderspack.contracts.CircularSticksAbstractView
+import com.agrawalsuneet.loaderspack.utils.Utils
 import java.util.*
 
 /**
@@ -73,6 +74,9 @@ class CircularSticksLoader : CircularSticksAbstractView {
 
     private var timer: Timer? = null
 
+    var isAnimating: Boolean = false
+        private set
+
     constructor(context: Context) : super(context) {
         initPaints()
     }
@@ -136,7 +140,8 @@ class CircularSticksLoader : CircularSticksAbstractView {
 
         if (visibility != VISIBLE) {
             timer?.cancel()
-        } else if(shouldAnimate) {
+            isAnimating = false
+        } else if (shouldAnimate) {
             scheduleTimer()
         }
     }
@@ -210,6 +215,7 @@ class CircularSticksLoader : CircularSticksAbstractView {
     fun stopAnimation() {
         shouldAnimate = false
         timer?.cancel()
+        isAnimating = false
     }
 
     private fun scheduleTimer() {
@@ -222,8 +228,10 @@ class CircularSticksLoader : CircularSticksAbstractView {
                     selectedStickPos = 1
                 }
 
-                (context as Activity).runOnUiThread { invalidate() }
+                (Utils.scanForActivity(context))?.runOnUiThread { invalidate() }
             }
         }, 0, animDuration.toLong())
+
+        isAnimating = true
     }
 }

loaderspack/src/main/java/com/agrawalsuneet/loaderspack/utils/Utils.kt

@@ -0,0 +1,20 @@
+package com.agrawalsuneet.loaderspack.utils
+
+import android.content.ContextWrapper
+import android.app.Activity
+import android.content.Context
+
+
+object Utils {
+
+    fun scanForActivity(context: Context?): Activity? {
+        return when (context) {
+            null -> null
+            is Activity -> context
+            is ContextWrapper -> scanForActivity(context.baseContext)
+            else -> null
+        }
+
+    }
+
+}