Skip to content

Commit 433bee3

Browse files
committed
1.0.2 code refactoring.
1 parent c67b824 commit 433bee3

File tree

4 files changed

+9
-3
lines changed

4 files changed

+9
-3
lines changed

app/src/main/res/layout/activity_main.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616
app:layout_constraintTop_toTopOf="parent"
1717
app:outerAnimInterpolator="linear"
1818
app:outerLoaderAnimDuration="1500"
19-
app:outerLoaderStrokeWidth="5dp" />
19+
app:outerLoaderStrokeWidth="1dp"
20+
app:spaceBetweenCircles="1dp"/>
2021

2122

2223
</androidx.constraintlayout.widget.ConstraintLayout>

lib/src/main/java/com/sn/lib/Constants.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,7 @@ object Constants {
2020
const val MAX_TOTAL_STROKE = 21F
2121
const val MIN_STOKE = 0F
2222
const val MAX_STROKE = 10F
23+
const val MIN_B_CIRCLES = 0F
24+
const val MAX_B_CIRCLES = 10F
2325
const val SPACE_BETWEEN_CIRCLES = 3F
2426
}

lib/src/main/java/com/sn/lib/NestedProgress.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@ import com.sn.lib.Constants.DESIRED_WH
1818
import com.sn.lib.Constants.INNER_ANIM_INTERPOLATOR
1919
import com.sn.lib.Constants.INNER_LOADER_LENGTH
2020
import com.sn.lib.Constants.INNER_STROKE_WIDTH
21+
import com.sn.lib.Constants.MAX_B_CIRCLES
2122
import com.sn.lib.Constants.MAX_STROKE
2223
import com.sn.lib.Constants.MAX_TOTAL_STROKE
2324
import com.sn.lib.Constants.MID_POINT
25+
import com.sn.lib.Constants.MIN_B_CIRCLES
2426
import com.sn.lib.Constants.MIN_STOKE
2527
import com.sn.lib.Constants.OUTER_ANIM_INTERPOLATOR
2628
import com.sn.lib.Constants.OUTER_LOADER_LENGTH
@@ -116,9 +118,9 @@ class NestedProgress @JvmOverloads constructor(
116118
var spaceBetweenCircles = SPACE_BETWEEN_CIRCLES.dp
117119
set(value) {
118120
field =
119-
if (value > MAX_STROKE.dp || value < MIN_STOKE.dp) throw IllegalArgumentException(
121+
if (value > MAX_B_CIRCLES.dp || value < MIN_B_CIRCLES.dp) throw IllegalArgumentException(
120122
resources.getString(
121-
R.string.stroke_range_error
123+
R.string.space_between_range_error
122124
)
123125
) else value
124126
}

lib/src/main/res/values/string.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="stroke_range_error">Stroke can take values range 1 and 10</string>
4+
<string name="space_between_range_error">Space between circles can take values range 1 and 10</string>
45
</resources>

0 commit comments

Comments
 (0)