From 19be391143f0a82c712e4ab4976a38f408cb8b44 Mon Sep 17 00:00:00 2001 From: Vladimir Jovanovic Date: Sat, 6 Jan 2018 14:57:10 +0100 Subject: [PATCH] Fixed bug where SizeMultiplier property was not working when set from xml --- CHANGELOG.md | 5 +++++ README.md | 2 +- build.gradle | 4 ++-- lemniscate/build.gradle | 4 ++-- .../com/vlad1m1r/lemniscate/base/BaseCurveProgressView.kt | 2 ++ 5 files changed, 12 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c36eab0..7f6bdb3 100644 --- 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 index cf635fd..14ef592 100644 --- 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 index 856ff97..5018c3d 100644 --- 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 index 98419cd..4f5b561 100644 --- 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 index 30ff6e3..e36278a 100644 --- 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()