Skip to content

Commit 7b83f5c

Browse files
authored
Merge pull request #1 from emreesen27/1.0.2
1.0.2 done.
2 parents ba52fd2 + 9cb7b5a commit 7b83f5c

File tree

6 files changed

+164
-87
lines changed

6 files changed

+164
-87
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,16 +23,15 @@
2323
android:layout_width="wrap_content"
2424
android:layout_height="wrap_content"
2525
app:innerAnimInterpolator="linear"
26-
app:innerLoaderAnimDuration="500"
26+
app:innerLoaderAnimDuration="1500"
2727
app:innerLoaderColor="@color/purple_700"
2828
app:innerLoaderLength="180"
2929
app:layout_constraintStart_toEndOf="@+id/pb1"
3030
app:layout_constraintTop_toTopOf="@id/pb1"
31-
app:outerAnimInterpolator="linear"
3231
app:outerLoaderAnimDuration="2000"
3332
app:outerLoaderColor="@color/blue"
34-
app:outerLoaderLength="300"
35-
app:outerLoaderStrokeWidth="20" />
33+
app:outerLoaderLength="360"
34+
app:outerLoaderStrokeWidth="5dp" />
3635

3736
<com.sn.lib.NestedProgress
3837
android:id="@+id/pb3"
@@ -41,14 +40,15 @@
4140
app:innerAnimInterpolator="overshoot"
4241
app:innerLoaderAnimDuration="2000"
4342
app:innerLoaderColor="@color/red"
44-
app:innerLoaderLength="320"
43+
app:innerLoaderLength="360"
44+
app:innerLoaderStrokeWidth="1.5dp"
4545
app:layout_constraintStart_toEndOf="@+id/pb2"
4646
app:layout_constraintTop_toTopOf="@id/pb2"
4747
app:outerAnimInterpolator="anticipateOvershoot"
4848
app:outerLoaderAnimDuration="1000"
4949
app:outerLoaderColor="@color/red_soft"
5050
app:outerLoaderLength="200"
51-
app:outerLoaderStrokeWidth="25" />
51+
app:outerLoaderStrokeWidth="10dp" />
5252

5353

5454
</androidx.constraintlayout.widget.ConstraintLayout>

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,21 @@ object Constants {
66
val COLOR_BLUE = Color.parseColor("#2666CF")
77
val COLOR_LIGHT_BLUE = Color.parseColor("#D3DEDC")
88

9-
const val SIZE_FACTOR = 1.0F
109
const val CIRCLE_RADIUS = 360
11-
const val INNER_LOADER_POS = 60
12-
const val OUTER_LOADER_POS = 80
1310
const val ANIM_DURATION = 1000
1411
const val INNER_ANIM_INTERPOLATOR = 6
1512
const val OUTER_ANIM_INTERPOLATOR = 5
1613
const val INNER_LOADER_LENGTH = 260F
1714
const val OUTER_LOADER_LENGTH = 320F
18-
const val INNER_STROKE_WIDTH = 12F
19-
const val OUTER_STROKE_WIDTH = 14F
15+
const val INNER_STROKE_WIDTH = 4F
16+
const val OUTER_STROKE_WIDTH = 4.5F
17+
const val MID_POINT = 2F
18+
const val START_POINT = 0F
19+
const val DESIRED_WH = 70F
20+
const val MAX_TOTAL_STROKE = 21F
21+
const val MIN_STOKE = 0F
22+
const val MAX_STROKE = 10F
23+
const val MIN_B_CIRCLES = 0F
24+
const val MAX_B_CIRCLES = 10F
25+
const val SPACE_BETWEEN_CIRCLES = 3F
2026
}

0 commit comments

Comments
 (0)