Merge branch 'release/0.1.1'

Author: sangcomz

README.md

@@ -1,15 +1,17 @@
+![Image](/pic/banner.png)
 # IndicatorDecorator
 Indicator decorator is an indicator that can be used in ViewPager2 and RecyclerView.
 
-## What's New in 0.1.0? :tada:
+## What's New in 0.1.1? :tada:
 - [Feature] Indicators to overlap. Use`isOverlap` (#2)
+- [Feature] Indicator background setting method added (#4)
 
 ## How to Use
 
 ### Gradle
 ```groovy
     dependencies {
-        implementation 'xyz.sangcomz:indicatordecorator:0.1.0'
+        implementation 'xyz.sangcomz:indicatordecorator:0.1.1'
     }
 ```
 ### Usage
@@ -30,6 +32,11 @@ Indicator decorator is an indicator that can be used in ViewPager2 and RecyclerV
 |     indicatorItemPadding   | Padding between indicators                |         8DP         |
 |        indicatorShape      | Indicator shape                           |    CircleIndicator  |
 |          isOverlap         | Can overlap                               |        false        |
+|       isShowBackground     |Background visibility                      |        false        |
+|        backgroundColor     | Background Color                          |        WHITE        |
+|   backgroundCornerRadius   | Background Corner Radius                  |         8DP         |
+|     backgroundSideOffset   | Background side offset                    |        16DP         |
+|backgroundTopAndBottomOffset| Background top and bottom offset          |         4DP         |
 
 #### Support Indicator Shape
 

app/src/main/java/xyz/sangcomz/indicatordecoratorsample/MainActivity.kt

@@ -55,12 +55,16 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
 
-        viewPager1.adapter = adapter1
-        viewPager1.addItemDecoration(IndicatorItemDecoration().apply {
-            indicatorShape = CircleIndicator().apply {
-                isOverlap = true
-                colorActive = ContextCompat.getColor(this@MainActivity, R.color.colorPrimaryDark)
-            }
+        recyclerView.adapter = adapter1
+        PagerSnapHelper().attachToRecyclerView(recyclerView)
+        recyclerView.addItemDecoration(IndicatorItemDecoration().apply {
+            indicatorShape = DrawableIndicator(
+                ContextCompat.getDrawable(
+                    this@MainActivity,
+                    R.drawable.ic_grade_red_24dp
+                )!!,
+                ContextCompat.getDrawable(this@MainActivity, R.drawable.ic_grade_gray_24dp)!!
+            )
         })
 
         viewPager2.adapter = adapter2
@@ -70,17 +74,12 @@ class MainActivity : AppCompatActivity() {
             }
         })
 
-        recyclerView.adapter = adapter3
-        PagerSnapHelper().attachToRecyclerView(recyclerView)
-        recyclerView.addItemDecoration(IndicatorItemDecoration().apply {
-            indicatorShape = DrawableIndicator(
-                ContextCompat.getDrawable(
-                    this@MainActivity,
-                    R.drawable.ic_grade_red_24dp
-                )!!,
-                ContextCompat.getDrawable(this@MainActivity, R.drawable.ic_grade_gray_24dp)!!
-            ).apply {
-                width = 64f
+        viewPager1.adapter = adapter3
+        viewPager1.addItemDecoration(IndicatorItemDecoration().apply {
+            indicatorShape = CircleIndicator().apply {
+                isOverlap = true
+                colorActive = ContextCompat.getColor(this@MainActivity, R.color.colorPrimaryDark)
+                isShowBackground = true
             }
         })
 

gradle/release.gradle

@@ -98,7 +98,8 @@ if (project.rootProject.file('local.properties').isFile()) {
         tagName = version
         targetCommitish = 'master'
         body = """## Release Note
-* Release!
+* [Feature] Indicators to overlap. Use`isOverlap` (#2)
+8 [Feature] Indicator background setting method added (#4)
 """
         name = version
     }

indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/IndicatorItemDecoration.kt

@@ -1,7 +1,6 @@
 package xyz.sangcomz.indicatordecorator
 
-import android.graphics.Canvas
-import android.graphics.Rect
+import android.graphics.*
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
@@ -30,6 +29,29 @@ class IndicatorItemDecoration : RecyclerView.ItemDecoration() {
      * Indicator shape
      */
     var isOverlap: Boolean = false
+
+    private val backgroundPaint = Paint()
+    /**
+     * Background visibility
+     */
+    var isShowBackground = false
+    /**
+     * Background Color
+     */
+    var backgroundColor = Color.WHITE
+    /**
+     * Background Corner Radius
+     */
+    var backgroundCornerRadius = 8.toDP()
+    /**
+     * Background side offset
+     */
+    var backgroundSideOffset = 16.toDP().toInt()
+    /**
+     * Background top And bottom offset
+     */
+    var backgroundTopAndBottomOffset = 4.toDP().toInt()
+
     /**
      * Indicator shape
      * By default it has a circle of radius 4.
@@ -55,6 +77,13 @@ class IndicatorItemDecoration : RecyclerView.ItemDecoration() {
             if (isOverlap) parent.height - indicatorShape.getIndicatorHeight() - bottomOffset
             else parent.height - (indicatorShape.getIndicatorHeight() / 2) - bottomOffset
 
+        if (isShowBackground)
+            drawBackground(
+                c,
+                indicatorTotalWidth,
+                indicatorStartX,
+                parent.height.toFloat() - bottomOffset
+            )
 
         drawInactiveIndicators(c, indicatorStartX, indicatorPosY, itemCount)
 
@@ -68,8 +97,24 @@ class IndicatorItemDecoration : RecyclerView.ItemDecoration() {
                 indicatorPosY
             )
         }
+    }
 
-
+    private fun drawBackground(
+        c: Canvas,
+        totalWidth: Float,
+        startX: Float,
+        bottomY: Float
+    ) {
+        val rectF = RectF()
+
+        backgroundPaint.color = backgroundColor
+        rectF.set(
+            startX + indicatorShape.getIndicatorWidth() / 2 - indicatorShape.drawStartPosition - backgroundSideOffset,
+            bottomY - indicatorShape.getIndicatorHeight() - indicatorShape.drawStartPosition - backgroundTopAndBottomOffset,
+            startX + totalWidth + indicatorShape.getIndicatorWidth() / 2 - indicatorShape.drawStartPosition + backgroundSideOffset,
+            bottomY - indicatorShape.drawStartPosition + backgroundTopAndBottomOffset
+        )
+        c.drawRoundRect(rectF, backgroundCornerRadius, backgroundCornerRadius, backgroundPaint)
     }
 
     private fun drawInactiveIndicators(
@@ -106,6 +151,7 @@ class IndicatorItemDecoration : RecyclerView.ItemDecoration() {
         )
     }
 
+
     override fun getItemOffsets(
         outRect: Rect,
         view: View,
@@ -114,6 +160,9 @@ class IndicatorItemDecoration : RecyclerView.ItemDecoration() {
     ) {
         super.getItemOffsets(outRect, view, parent, state)
         if (!isOverlap)
-            outRect.bottom = (topOffset + bottomOffset + indicatorShape.getIndicatorHeight()).toInt()
+            outRect.bottom = getTotalHeight().toInt()
     }
+
+    private fun getTotalHeight() = topOffset + bottomOffset + indicatorShape.getIndicatorHeight()
+
 }

indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/shape/CircleIndicator.kt

@@ -7,6 +7,8 @@ import xyz.sangcomz.indicatordecorator.ext.toDP
 
 class CircleIndicator : IndicatorShape {
     private val paint = Paint().apply { isAntiAlias = true }
+    override val drawStartPosition: Float
+        get() = radius
     var colorActive: Int = Color.CYAN
     var colorInactive: Int = Color.GRAY
     var radius: Float = 4.toDP()

indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/shape/DrawableIndicator.kt

@@ -8,13 +8,15 @@ class DrawableIndicator(
     drawableActive: Drawable,
     drawableInActive: Drawable
 ) : IndicatorShape {
-
+    override val drawStartPosition = 0f
     override var scaleFactor: Float = 1.2f
+
     var width: Float = drawableActive.intrinsicWidth.toFloat()
     var height: Float = drawableActive.intrinsicHeight.toFloat()
     var drawableActive = drawableActive
     var drawableInActive = drawableInActive
 
+
     override fun inactiveIndicatorDraw(c: Canvas, x: Float, y: Float) {
         drawableInActive.setBounds(
             x.toInt(),

indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/shape/IndicatorShape.kt

@@ -8,6 +8,11 @@ interface IndicatorShape {
      */
     var scaleFactor: Float
 
+    /**
+     * The starting coordinate that is actually drawn
+     * For example, when drawing a square, draw a circle from the x coordinate to the width and a circle the radius of both sides of the x coordinate.
+     */
+    val drawStartPosition: Float
     /**
      * To draw inactive indicator
      */

indicatordecorator/src/main/java/xyz/sangcomz/indicatordecorator/shape/SquareIndicator.kt

@@ -6,10 +6,15 @@ import android.graphics.Paint
 import xyz.sangcomz.indicatordecorator.ext.toDP
 
 class SquareIndicator : IndicatorShape {
+    override val drawStartPosition = 0f
+
     private val paint = Paint().apply { isAntiAlias = true }
+
     var colorActive: Int = Color.BLACK
     var colorInactive: Int = Color.GRAY
     var width = 8.toDP()
+
+
     override var scaleFactor = 1.2f
     override fun inactiveIndicatorDraw(c: Canvas, x: Float, y: Float) {
         paint.color = colorInactive