build: remove viewpagerdotsindicator module

app/build.gradle.kts

@@ -243,7 +243,6 @@ kotlin {
 
 dependencies {
     implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar"))))
-    implementation(project(":viewpagerdotsindicator"))
     implementation(project(":dhis_android_analytics"))
     implementation(project(":form"))
     implementation(project(":commons"))

app/src/main/java/org/dhis2/usescases/datasets/dataSetTable/DataSetTableActivity.kt

@@ -14,6 +14,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.outlined.HelpOutline
 import androidx.compose.material.icons.outlined.LockReset
 import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
@@ -22,6 +23,7 @@ import androidx.databinding.DataBindingUtil
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.lifecycleScope
 import androidx.lifecycle.repeatOnLifecycle
+import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
 import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetBehavior.BottomSheetCallback
 import com.google.android.material.shape.CornerFamily
@@ -44,6 +46,7 @@ import org.dhis2.commons.extensions.closeKeyboard
 import org.dhis2.commons.matomo.Labels.Companion.CLICK
 import org.dhis2.commons.sync.OnDismissListener
 import org.dhis2.commons.sync.SyncContext
+import org.dhis2.commons.ui.PagerIndicator
 import org.dhis2.databinding.ActivityDatasetTableBinding
 import org.dhis2.usescases.datasets.dataSetTable.dataSetDetail.DataSetDetailFragment.Companion.create
 import org.dhis2.usescases.datasets.dataSetTable.dataSetSection.DataSetSection
@@ -325,7 +328,24 @@ class DataSetTableActivity : ActivityGlobalAbstract(), DataSetTableContract.View
             resources.getQuantityText(R.plurals.error_message, violations.size)
         binding.BSLayout.violationsViewPager.adapter =
             ValidationResultViolationsAdapter(this, violations)
-        binding.BSLayout.dotsIndicator.setViewPager(binding.BSLayout.violationsViewPager)
+        binding.BSLayout.dotsIndicator.setContent {
+            var currentPage by remember { mutableIntStateOf(0) }
+            binding.BSLayout.violationsViewPager.registerOnPageChangeCallback(
+                object : OnPageChangeCallback() {
+                    override fun onPageSelected(position: Int) {
+                        super.onPageSelected(position)
+                        currentPage = position
+                    }
+                },
+            )
+            if (violations.isNotEmpty()) {
+                PagerIndicator(
+                    pageCount = violations.size,
+                    currentPage = currentPage,
+                    dotIndicatorColor = SurfaceColor.Error,
+                )
+            }
+        }
         behavior = BottomSheetBehavior.from(binding.BSLayout.bottomSheetLayout)
         behavior!!.addBottomSheetCallback(object : BottomSheetCallback() {
             override fun onStateChanged(bottomSheet: View, newState: Int) {

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

@@ -99,13 +99,11 @@
                 app:layout_constraintTop_toTopOf="@id/title"
                 app:srcCompat="@drawable/ic_arrow_up" />
 
-            <com.tbuonomo.viewpagerdotsindicator.WormDotsIndicator
+            <androidx.compose.ui.platform.ComposeView
                 android:id="@+id/dotsIndicator"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="48dp"
-                app:dotsColor="@color/dots_error_selected"
-                app:dotsSize="12dp"
                 app:layout_constraintEnd_toEndOf="@id/endGuideline"
                 app:layout_constraintStart_toStartOf="@id/startGuideline"
                 app:layout_constraintTop_toTopOf="parent" />

commons/src/main/java/org/dhis2/commons/ui/PagerIndicator.kt

@@ -0,0 +1,119 @@
+package org.dhis2.commons.ui
+
+import androidx.compose.animation.core.animateDpAsState
+import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyListState
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.rememberLazyListState
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import kotlin.math.max
+
+@OptIn(ExperimentalFoundationApi::class)
+@Preview(showBackground = true, backgroundColor = 0xFFFFFFFF)
+@Composable
+fun PagerIndicatorScreen() {
+    Column(
+        modifier = Modifier.fillMaxSize(),
+        horizontalAlignment = Alignment.CenterHorizontally,
+    ) {
+        val pageCount = 2
+        val pagerState = rememberPagerState(
+            pageCount = { pageCount },
+        )
+        HorizontalPager(
+            state = pagerState,
+            modifier = Modifier
+                .fillMaxSize()
+                .weight(1f),
+        ) {
+            Box(
+                modifier = Modifier
+                    .fillMaxSize(),
+                contentAlignment = Alignment.Center,
+            ) {
+                Text(text = "Page $it")
+            }
+        }
+        PagerIndicator(
+            pageCount = pageCount,
+            currentPage = pagerState.currentPage,
+        )
+    }
+}
+
+@Composable
+fun PagerIndicator(
+    indicatorScrollState: LazyListState = rememberLazyListState(),
+    pageCount: Int,
+    currentPage: Int,
+    dotIndicatorColor: Color = Color.DarkGray,
+) {
+    LaunchedEffect(key1 = currentPage) {
+        val size = indicatorScrollState.layoutInfo.visibleItemsInfo.size
+        val lastVisibleIndex =
+            indicatorScrollState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
+        val firstVisibleItemIndex = indicatorScrollState.firstVisibleItemIndex
+
+        if (currentPage > lastVisibleIndex - 1) {
+            indicatorScrollState.animateScrollToItem(currentPage - size + 2)
+        } else if (currentPage <= firstVisibleItemIndex + 1) {
+            indicatorScrollState.animateScrollToItem(max(currentPage - 1, 0))
+        }
+    }
+
+    LazyRow(
+        state = indicatorScrollState,
+        modifier = Modifier
+            .height(50.dp)
+            .width(((6 + 16) * 2 + 3 * (10 + 16)).dp), // I'm hard computing it to simplify
+        horizontalArrangement = Arrangement.Center,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        repeat(pageCount) { iteration ->
+            val color = if (currentPage == iteration) dotIndicatorColor else Color.LightGray
+            item(key = "item$iteration") {
+                val firstVisibleIndex by remember { derivedStateOf { indicatorScrollState.firstVisibleItemIndex } }
+                val lastVisibleIndex =
+                    indicatorScrollState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
+                val size by animateDpAsState(
+                    targetValue = when (iteration) {
+                        currentPage -> 10.dp
+                        in firstVisibleIndex + 1..<lastVisibleIndex -> 10.dp
+                        else -> 6.dp
+                    },
+                    label = "PagerIndicatorDotSizeAnimation",
+                )
+                Box(
+                    modifier = Modifier
+                        .padding(all = 8.dp)
+                        .background(color = color, CircleShape)
+                        .size(
+                            size,
+                        ),
+                )
+            }
+        }
+    }
+}

settings.gradle.kts

@@ -1,5 +1,5 @@
 include(
-    ":app", ":viewpagerdotsindicator",
+    ":app",
     ":dhis_android_analytics", ":form", ":commons",
     ":dhis2_android_maps", ":compose-table", ":ui-components",
     ":stock-usecase"