- feat [#14]: Error: app:mergeDebugResources with 1.3.2

Author: GeniusRUS

app/build.gradle.kts

@@ -32,7 +32,7 @@ dependencies {
     implementation("com.google.android.material:material:1.5.0")
 
     testImplementation("junit:junit:4.13.2")
-    testImplementation("org.mockito:mockito-core:4.3.1")
+    testImplementation("org.mockito:mockito-core:4.4.0")
     testImplementation("androidx.test:core:1.4.0")
     androidTestImplementation("androidx.test.ext:junit:1.1.3")
     androidTestImplementation("androidx.test:runner:1.4.0")

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

@@ -18,10 +18,10 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        app:lineColor="@color/warm_grey"
+        app:progressLineColor="@color/warm_grey"
         app:progressColor="@color/colorAccent"
         app:progressSteps="9"
-        app:singleDisplayedTime="5.0" />
+        app:progressSingleDisplayedTime="5.0" />
 
     <LinearLayout
         android:id="@+id/ll_start_pause"

gradle.properties

@@ -24,7 +24,7 @@ android.nonTransitiveRClass=true
 
 GROUP=io.github.geniusrus
 POM_ARTIFACT_ID=multiprogressbar
-VERSION_NAME=1.3.2
+VERSION_NAME=1.4.0
 
 POM_NAME=MultiProgressBar
 POM_DESCRIPTION=Android library for multiple displays of progress like Instagram Stories

multiprogressbar/src/main/java/com/genius/multiprogressbar/MultiProgressBar.kt

@@ -107,15 +107,15 @@ class MultiProgressBar @JvmOverloads constructor(
 
     init {
         val typedArray = context.obtainStyledAttributes(attributeSet, R.styleable.MultiProgressBar)
-        lineColor = typedArray.getColor(R.styleable.MultiProgressBar_lineColor, Color.GRAY)
+        lineColor = typedArray.getColor(R.styleable.MultiProgressBar_progressLineColor, Color.GRAY)
         progressColor = typedArray.getColor(R.styleable.MultiProgressBar_progressColor, Color.WHITE)
         progressPadding = typedArray.getDimension(R.styleable.MultiProgressBar_progressPadding, MIN_PADDING.toPx)
         countOfProgressSteps = typedArray.getInt(R.styleable.MultiProgressBar_progressSteps, 1)
         progressWidth = typedArray.getDimension(R.styleable.MultiProgressBar_progressWidth, DEFAULT_WIDTH.toPx)
         progressPercents = typedArray.getInt(R.styleable.MultiProgressBar_progressPercents, 100)
-        isNeedRestoreProgressAfterRecreate = typedArray.getBoolean(R.styleable.MultiProgressBar_isNeedRestoreProgress, true)
-        singleDisplayedTime = typedArray.getFloat(R.styleable.MultiProgressBar_singleDisplayedTime, 1F).coerceAtLeast(0.1F)
-        orientation = typedArray.getInt(R.styleable.MultiProgressBar_orientation, Orientation.TO_RIGHT)
+        isNeedRestoreProgressAfterRecreate = typedArray.getBoolean(R.styleable.MultiProgressBar_progressIsNeedRestoreProgress, true)
+        singleDisplayedTime = typedArray.getFloat(R.styleable.MultiProgressBar_progressSingleDisplayedTime, 1F).coerceAtLeast(0.1F)
+        orientation = typedArray.getInt(R.styleable.MultiProgressBar_progressOrientation, Orientation.TO_RIGHT)
         typedArray.recycle()
 
         if (isInEditMode) {

multiprogressbar/src/main/res/values/attrs.xml

@@ -2,7 +2,7 @@
 <resources>
     <declare-styleable name="MultiProgressBar">
         <!-- Color of progress background line. By default is Color.GRAY -->
-        <attr name="lineColor" format="color"/>
+        <attr name="progressLineColor" format="color"/>
         <!-- Color of progress foreground line. By default is Color.WHITE -->
         <attr name="progressColor" format="color"/>
         <!-- Count of progress steps. By default is 1 step -->
@@ -13,11 +13,11 @@
         <attr name="progressWidth" format="dimension"/>
         <attr name="progressPercents" format="integer"/>
         <!-- Restoring progress after view recreate. By default is true -->
-        <attr name="isNeedRestoreProgress" format="boolean"/>
+        <attr name="progressIsNeedRestoreProgress" format="boolean"/>
         <!-- Time to display single cell of progress. By default is 1 second -->
-        <attr name="singleDisplayedTime" format="float"/>
+        <attr name="progressSingleDisplayedTime" format="float"/>
         <!-- Orientation of progress. By default is to_right -->
-        <attr name="orientation">
+        <attr name="progressOrientation">
             <enum name="to_top" value="0" />
             <enum name="to_right" value="1" />
             <enum name="to_bottom" value="2" />