From 2f99951c5250f1b4eac8f67c3306e3a0d49444a5 Mon Sep 17 00:00:00 2001
From: thirstycoda <thedavemchugh@googlemail.com>
Date: Sun, 6 Aug 2023 16:46:53 +0100
Subject: [PATCH 1/2] Added selectedDotDrawable customisation

---
 README.md                                     |  3 ++-
 .../res/drawable/baseline_play_arrow_24.xml   |  5 ++++
 demo/src/main/res/layout/activity_main.xml    |  3 ++-
 .../ScrollingPagerIndicator.java              | 27 ++++++++++++-------
 .../src/main/res/values/attrs.xml             |  1 +
 5 files changed, 28 insertions(+), 11 deletions(-)
 create mode 100644 demo/src/main/res/drawable/baseline_play_arrow_24.xml

diff --git a/README.md b/README.md
index 4c30cc6..943bbca 100644
--- a/README.md
+++ b/README.md
@@ -122,7 +122,8 @@ indicator.attachToPager(pager, new ViewPagerAttacher());
 | spi_dotMinimumSize      | The minimum dot size for the corner dots. This size is lower or equal to ```spi_dotSize``` and greater or equal to the internal calculation for the corner dots.                                                                              | Internal calculation based on ```spi_dotSize```, ```spi_dotSelectedSize``` and ```spi_dotSpacing``` |
 | spi_orientation         | Visible orientation of the dots                                                                                                                                                                                                               | LinearLayoutManager.HORIZONTAL                                                                      |
 | spi_firstDotDrawable    | Custom drawable of the first dot, color is tinted and size is changed like standard dots. If first dot is also the last one then this value is taken into account.                                                                            | `null`                                                                                              |
-| spi_lastDotDrawable     | Custom drawable of the last dot, color is tinted and size is changed like standard dots.                                                                                                                                                 | `null`                                                                                              |
+| spi_lastDotDrawable     | Custom drawable of the last dot, color is tinted and size is changed like standard dots.                                                                                                                                                      | `null`                                                                                              |
+| spi_selectedDotDrawable | Custom drawable of the selected dot, color is tinted and size is changed like standard dots.                                                                                                                                                  | `null`                                                                                              |
 
 ## TODO
 1. Some extreme customizations may work incorrect.
diff --git a/demo/src/main/res/drawable/baseline_play_arrow_24.xml b/demo/src/main/res/drawable/baseline_play_arrow_24.xml
new file mode 100644
index 0000000..e3fd2e9
--- /dev/null
+++ b/demo/src/main/res/drawable/baseline_play_arrow_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/demo/src/main/res/layout/activity_main.xml b/demo/src/main/res/layout/activity_main.xml
index 21fb6cb..f0ab6cb 100644
--- a/demo/src/main/res/layout/activity_main.xml
+++ b/demo/src/main/res/layout/activity_main.xml
@@ -58,7 +58,8 @@
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toBottomOf="@id/pager_title2"
             app:spi_dotColor="@color/dotNormal"
-            app:spi_dotSelectedColor="@color/dotHighlight" />
+            app:spi_dotSelectedColor="@color/dotHighlight"
+            app:spi_selectedDotDrawable="@drawable/baseline_play_arrow_24"/>
 
         <androidx.viewpager2.widget.ViewPager2
             android:id="@+id/pager2"
diff --git a/scrollingpagerindicator/src/main/java/ru/tinkoff/scrollingpagerindicator/ScrollingPagerIndicator.java b/scrollingpagerindicator/src/main/java/ru/tinkoff/scrollingpagerindicator/ScrollingPagerIndicator.java
index 226f18e..8c3d551 100644
--- a/scrollingpagerindicator/src/main/java/ru/tinkoff/scrollingpagerindicator/ScrollingPagerIndicator.java
+++ b/scrollingpagerindicator/src/main/java/ru/tinkoff/scrollingpagerindicator/ScrollingPagerIndicator.java
@@ -62,6 +62,10 @@ public class ScrollingPagerIndicator extends View {
     @Nullable
     private final Drawable lastDotDrawable;
 
+    @Nullable
+    private final Drawable selectedDotDrawable;
+
+
     private boolean looped;
 
     private Runnable attachRunnable;
@@ -99,6 +103,7 @@ public ScrollingPagerIndicator(Context context, @Nullable AttributeSet attrs, in
 
         firstDotDrawable = attributes.getDrawable(R.styleable.ScrollingPagerIndicator_spi_firstDotDrawable);
         lastDotDrawable = attributes.getDrawable(R.styleable.ScrollingPagerIndicator_spi_lastDotDrawable);
+        selectedDotDrawable = attributes.getDrawable(R.styleable.ScrollingPagerIndicator_spi_selectedDotDrawable);
         attributes.recycle();
 
         paint = new Paint();
@@ -561,7 +566,9 @@ protected void onDraw(Canvas canvas) {
 
                 paint.setColor(calculateDotColor(scale));
                 final Drawable dotDrawable;
-                if (i == firstVisibleDotPos) {
+                if (scale == 1f) {
+                    dotDrawable = selectedDotDrawable;
+                } else if (i == firstVisibleDotPos) {
                     dotDrawable = firstDotDrawable;
                 } else if (i == lastVisibleDotPos) {
                     dotDrawable = lastDotDrawable;
@@ -569,16 +576,18 @@ protected void onDraw(Canvas canvas) {
                     dotDrawable = null;
                 }
                 if (dotDrawable != null) {
+                    int size = dotDrawable == selectedDotDrawable ? dotSelectedSize : dotSelectedSize / 2;
+
                     if (orientation == LinearLayoutManager.HORIZONTAL) {
-                        dotDrawable.setBounds((int) (dot - visibleFramePosition - dotSelectedSize / 2),
-                                getMeasuredHeight() / 2 - dotSelectedSize / 2,
-                                (int) (dot - visibleFramePosition + dotSelectedSize / 2),
-                                getMeasuredHeight() / 2 + dotSelectedSize / 2);
+                        dotDrawable.setBounds((int) (dot - visibleFramePosition - size),
+                                getMeasuredHeight() / 2 - size,
+                                (int) (dot - visibleFramePosition + size),
+                                getMeasuredHeight() / 2 + size);
                     } else {
-                        dotDrawable.setBounds(getMeasuredWidth() / 2 - dotSelectedSize / 2,
-                                (int) (dot - visibleFramePosition - dotSelectedSize / 2),
-                                getMeasuredWidth() / 2 + dotSelectedSize / 2,
-                                (int) (dot - visibleFramePosition + dotSelectedSize / 2));
+                        dotDrawable.setBounds(getMeasuredWidth() / 2 - size,
+                                (int) (dot - visibleFramePosition - size),
+                                getMeasuredWidth() / 2 + size,
+                                (int) (dot - visibleFramePosition + size));
                     }
                     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
                         dotDrawable.setTint(paint.getColor());
diff --git a/scrollingpagerindicator/src/main/res/values/attrs.xml b/scrollingpagerindicator/src/main/res/values/attrs.xml
index 38e55cb..ebcd339 100644
--- a/scrollingpagerindicator/src/main/res/values/attrs.xml
+++ b/scrollingpagerindicator/src/main/res/values/attrs.xml
@@ -19,5 +19,6 @@
         </attr>
         <attr name="spi_firstDotDrawable" format="reference" />
         <attr name="spi_lastDotDrawable" format="reference" />
+        <attr name="spi_selectedDotDrawable" format="reference" />
     </declare-styleable>
 </resources>

From e33bbd49be5dc0f516487271a6fac2c7c543ae00 Mon Sep 17 00:00:00 2001
From: thirstycoda <thedavemchugh@googlemail.com>
Date: Mon, 21 Aug 2023 15:24:40 +0100
Subject: [PATCH 2/2] Added setSelectedDotDrawable

---
 .../scrollingpagerindicator/ScrollingPagerIndicator.java  | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/scrollingpagerindicator/src/main/java/ru/tinkoff/scrollingpagerindicator/ScrollingPagerIndicator.java b/scrollingpagerindicator/src/main/java/ru/tinkoff/scrollingpagerindicator/ScrollingPagerIndicator.java
index 8c3d551..70a5e4a 100644
--- a/scrollingpagerindicator/src/main/java/ru/tinkoff/scrollingpagerindicator/ScrollingPagerIndicator.java
+++ b/scrollingpagerindicator/src/main/java/ru/tinkoff/scrollingpagerindicator/ScrollingPagerIndicator.java
@@ -13,6 +13,7 @@
 import android.widget.LinearLayout;
 
 import androidx.annotation.ColorInt;
+import androidx.annotation.DrawableRes;
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
@@ -63,7 +64,7 @@ public class ScrollingPagerIndicator extends View {
     private final Drawable lastDotDrawable;
 
     @Nullable
-    private final Drawable selectedDotDrawable;
+    private Drawable selectedDotDrawable;
 
 
     private boolean looped;
@@ -164,6 +165,11 @@ public void setSelectedDotColor(@ColorInt int color) {
         invalidate();
     }
 
+    public void setSelectedDotDrawable(Drawable drawable) {
+        this.selectedDotDrawable = drawable;
+        invalidate();
+    }
+
     /**
      * Maximum number of dots which will be visible at the same time.
      * If pager has more pages than visible_dot_count, indicator will scroll to show extra dots.