Merge pull request #35 from agrawalsuneet/dev

Merge Dev to master fir 1.4.1 release
agrawalsuneet · Jun 9, 2019 · b391301 · b391301
2 parents 3cd22ca + e6acab0
commit b391301
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 6 deletions.
diff --git a/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt b/app/src/main/java/com/agrawalsuneet/loaders/MainActivity.kt
@@ -14,7 +14,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.main_bounce)
+        setContentView(R.layout.main_lineardotsloader)
 
         supportActionBar?.title = "BounceLoader"
 

diff --git a/dotsloader/build.gradle b/dotsloader/build.gradle
@@ -16,7 +16,7 @@ buildscript {
 ext {
     PUBLISH_GROUP_ID = 'com.agrawalsuneet.androidlibs'
     PUBLISH_ARTIFACT_ID = 'dotsloader'
-    PUBLISH_VERSION = '1.4'
+    PUBLISH_VERSION = '1.4.1'
 }
 
 configurations {
@@ -29,8 +29,8 @@ android {
     defaultConfig {
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 14
-        versionName "1.4"
+        versionCode 15
+        versionName "1.4.1"
     }
     buildTypes {
         release {

diff --git a/dotsloader/src/main/java/com/agrawalsuneet/dotsloader/loaders/CircularDotsLoader.kt b/dotsloader/src/main/java/com/agrawalsuneet/dotsloader/loaders/CircularDotsLoader.kt
@@ -7,6 +7,7 @@ import android.util.AttributeSet
 import android.view.View
 import com.agrawalsuneet.dotsloader.R
 import com.agrawalsuneet.dotsloader.contracts.CircularAbstractView
+import com.agrawalsuneet.dotsloader.utils.Utils
 import java.util.*
 
 /**
@@ -68,7 +69,7 @@ class CircularDotsLoader : CircularAbstractView {
                     selectedDotPos = 1
                 }
 
-                (context as Activity).runOnUiThread { invalidate() }
+                (Utils.scanForActivity(context))?.runOnUiThread { invalidate() }
             }
         }, 0, animDur.toLong())
     }

diff --git a/dotsloader/src/main/java/com/agrawalsuneet/dotsloader/loaders/LinearDotsLoader.kt b/dotsloader/src/main/java/com/agrawalsuneet/dotsloader/loaders/LinearDotsLoader.kt
@@ -7,6 +7,7 @@ import android.util.AttributeSet
 import android.view.View
 import com.agrawalsuneet.dotsloader.R
 import com.agrawalsuneet.dotsloader.contracts.DotsLoaderBaseView
+import com.agrawalsuneet.dotsloader.utils.Utils
 import java.util.*
 
 /**
@@ -119,7 +120,7 @@ class LinearDotsLoader : DotsLoaderBaseView {
                     }
                 }
 
-                (context as Activity).runOnUiThread { invalidate() }
+                (Utils.scanForActivity(context))?.runOnUiThread { invalidate() }
             }
         }, 0, animDur.toLong())
     }

diff --git a/dotsloader/src/main/java/com/agrawalsuneet/dotsloader/utils/Utils.kt b/dotsloader/src/main/java/com/agrawalsuneet/dotsloader/utils/Utils.kt
@@ -0,0 +1,20 @@
+package com.agrawalsuneet.dotsloader.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
+        }
+
+    }
+
+}