From 31823ce9caa8c4f679373fcbdf8dafdfd1739cf8 Mon Sep 17 00:00:00 2001
From: qamarelsafadi <qamar.elsafadi98@gmail.com>
Date: Wed, 1 Oct 2025 23:33:29 +0300
Subject: [PATCH] fix: observe the current focus count into settings screen
 slider

---
 .../viewModel/SettingsViewModel.kt            | 24 ++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/viewModel/SettingsViewModel.kt b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/viewModel/SettingsViewModel.kt
index 276f3de..cc05034 100644
--- a/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/viewModel/SettingsViewModel.kt
+++ b/app/src/main/java/org/nsh07/pomodoro/ui/settingsScreen/viewModel/SettingsViewModel.kt
@@ -31,11 +31,13 @@ import kotlinx.coroutines.launch
 import org.nsh07.pomodoro.TomatoApplication
 import org.nsh07.pomodoro.data.AppPreferenceRepository
 import org.nsh07.pomodoro.data.TimerRepository
+import org.nsh07.pomodoro.ui.timerScreen.viewModel.TimerState
 
 @OptIn(FlowPreview::class, ExperimentalMaterial3Api::class)
 class SettingsViewModel(
     private val preferenceRepository: AppPreferenceRepository,
-    private val timerRepository: TimerRepository
+    private val timerRepository: TimerRepository,
+    private val _timerState: MutableStateFlow<TimerState>,
 ) : ViewModel() {
     private val _preferencesState = MutableStateFlow(PreferencesState())
     val preferencesState = _preferencesState.asStateFlow()
@@ -79,6 +81,11 @@ class SettingsViewModel(
             val blackTheme = preferenceRepository.getBooleanPreference("black_theme")
                 ?: preferenceRepository.saveBooleanPreference("black_theme", false)
 
+            // Load session length from preferences and update slider
+            val sessionLength = preferenceRepository.getIntPreference("session_length")
+                ?: timerRepository.sessionLength
+            sessionsSliderState.value = sessionLength.toFloat()
+
             _preferencesState.update { currentState ->
                 currentState.copy(
                     theme = theme,
@@ -87,6 +94,7 @@ class SettingsViewModel(
                 )
             }
         }
+        observeCurrentFocusCount()
     }
 
     private fun updateSessionLength() {
@@ -194,18 +202,28 @@ class SettingsViewModel(
         }
     }
 
+    private fun observeCurrentFocusCount() {
+        viewModelScope.launch {
+            _timerState.collect {
+                sessionsSliderState.value = it.currentFocusCount.toFloat()
+            }
+        }
+    }
+
     companion object {
         val Factory: ViewModelProvider.Factory = viewModelFactory {
             initializer {
                 val application = (this[APPLICATION_KEY] as TomatoApplication)
                 val appPreferenceRepository = application.container.appPreferenceRepository
                 val appTimerRepository = application.container.appTimerRepository
+                val timerState = application.container.timerState
 
                 SettingsViewModel(
                     preferenceRepository = appPreferenceRepository,
-                    timerRepository = appTimerRepository
+                    timerRepository = appTimerRepository,
+                    _timerState = timerState
                 )
             }
         }
     }
-}
\ No newline at end of file
+}