From ad8929217bb9dc22e9a54be591d296287be51741 Mon Sep 17 00:00:00 2001
From: Nishant Mishra <nishant.28@outlook.com>
Date: Mon, 8 Sep 2025 10:23:53 +0530
Subject: [PATCH] feat: Show current interval focus count when tapping the
 clock

#21
---
 .../java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt | 5 +++--
 .../nsh07/pomodoro/ui/timerScreen/viewModel/TimerState.kt | 4 +++-
 .../pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt   | 8 ++++++--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt
index 4f7ccec..4dbb7c8 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt
@@ -258,9 +258,10 @@ fun TimerScreen(
                                     shrinkVertically(motionScheme.defaultSpatialSpec())
                         ) {
                             Text(
-                                "1 of 4",
+                                "${timerState.currentFocusCount} of ${timerState.totalFocusCount}",
                                 fontFamily = openRundeClock,
-                                style = typography.titleLarge
+                                style = typography.titleLarge,
+                                color = colorScheme.outline
                             )
                         }
                     }
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerState.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerState.kt
index f0ead74..4a9c3d9 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerState.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerState.kt
@@ -14,7 +14,9 @@ data class TimerState(
     val timerRunning: Boolean = false,
     val nextTimerMode: TimerMode = TimerMode.SHORT_BREAK,
     val nextTimeStr: String = "5:00",
-    val showBrandTitle: Boolean = true
+    val showBrandTitle: Boolean = true,
+    val currentFocusCount: Int = 1,
+    val totalFocusCount: Int = 4
 )
 
 enum class TimerMode {
diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
index 74cc8ac..8f7d025 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/viewModel/TimerViewModel.kt
@@ -145,7 +145,9 @@ class TimerViewModel(
                     timeStr = millisecondsToStr(time.value),
                     totalTime = time.value,
                     nextTimerMode = if (timerRepository.sessionLength > 1) TimerMode.SHORT_BREAK else TimerMode.LONG_BREAK,
-                    nextTimeStr = millisecondsToStr(if (timerRepository.sessionLength > 1) timerRepository.shortBreakTime else timerRepository.longBreakTime)
+                    nextTimeStr = millisecondsToStr(if (timerRepository.sessionLength > 1) timerRepository.shortBreakTime else timerRepository.longBreakTime),
+                    currentFocusCount = 1,
+                    totalFocusCount = timerRepository.sessionLength
                 )
             }
         }
@@ -173,7 +175,9 @@ class TimerViewModel(
                             timerRepository.longBreakTime
                         ) else millisecondsToStr(
                             timerRepository.shortBreakTime
-                        )
+                        ),
+                        currentFocusCount = cycles / 2 + 1,
+                        totalFocusCount = timerRepository.sessionLength
                     )
                 }
             } else {