Fixed bug where SizeMultiplier property was not working when set from…

… xml
VladimirWrites · Jan 6, 2018 · 19be391 · 19be391
1 parent 897f923
commit 19be391
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 Change Log
 ==========
+Version 1.4.1 *(2018-01-06)*
+----------------------------
+
+* Fixed bug where SizeMultiplier property was not working when set from `xml`.  [#4](https://github.com/vlad1m1r990/Lemniscate/issues/4)
+
 Version 1.4.0 *(2017-11-09)*
 ----------------------------
 

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Add to your module's build.gradle:
 and to your app build.gradle:
 
     dependencies {
-            compile 'com.github.vlad1m1r990:Lemniscate:1.4.0'
+            compile 'com.github.vlad1m1r990:Lemniscate:1.4.1'
     }
 
 Usage

diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.1.51'
+    ext.kotlin_version = '1.2.10'
     repositories {
         jcenter()
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.0'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/lemniscate/build.gradle b/lemniscate/build.gradle
@@ -8,8 +8,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 140
-        versionName "1.4.0"
+        versionCode 141
+        versionName "1.4.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt b/lemniscate/src/main/java/com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt
@@ -69,6 +69,8 @@ abstract class BaseCurveProgressView : View, IBaseCurveProgressView{
             curveSettings.precision = curveAttributes.getInteger(R.styleable.BaseCurveProgressView_precision, 200)
 
             animationSettings.duration = curveAttributes.getInteger(R.styleable.BaseCurveProgressView_duration, 1000)
+
+            viewSize.sizeMultiplier = curveAttributes.getFloat(R.styleable.BaseCurveProgressView_sizeMultiplier, 1f)
         } finally {
             curveAttributes.recycle()
             colorAccentAttributes.recycle()