From 4439c9e17bd8d7c26da1a0bebb7d2a2217670f73 Mon Sep 17 00:00:00 2001
From: Arduinum628 <message.chaos628@gmail.com>
Date: Wed, 30 Jul 2025 14:39:37 +0300
Subject: [PATCH] feat: added queue timers in the timer_constructor_screen and
 timer_screen

---
 .../screens/timer_constructor_screen.py       |  6 ++--
 kawai_focus/screens/timer_screen.py           | 29 +++++++++++++++++--
 kawai_focus/tests/json/timer.json             |  3 +-
 3 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/kawai_focus/screens/timer_constructor_screen.py b/kawai_focus/screens/timer_constructor_screen.py
index d9cc454..6c02ac1 100644
--- a/kawai_focus/screens/timer_constructor_screen.py
+++ b/kawai_focus/screens/timer_constructor_screen.py
@@ -3,7 +3,7 @@ from kivy.uix.screenmanager import Screen
 from kawai_focus.custom_widgets.timer_wigets import TimeTomatoInput
 from kawai_focus.schemas import TimerModel
 from kawai_focus.database.cruds import new_timer
-from kawai_focus.utils.utils import calculate_time, custom_timer
+from kawai_focus.utils.utils import calculate_time, gen_types_timers
 from kawai_focus.screens.validators_fields import validate_title
 
 
@@ -38,7 +38,9 @@ class TimerConstructorScreen(Screen):
             time_culc = calculate_time(mm_user=timer.pomodoro_time)
             screen_timer.timer_start_time = time_culc
             screen_timer.ids.time_label.text = time_culc
-            screen_timer.timer_generator = custom_timer(mm_user=timer.pomodoro_time)
+            screen_timer.source_timer_names = gen_types_timers(count_pomodoro=timer.count_pomodoro)
+
+            self.manager.state_machine = screen_timer.source_timer_names.copy()
             self.manager.current = 'timers_screen'
 
 
diff --git a/kawai_focus/screens/timer_screen.py b/kawai_focus/screens/timer_screen.py
index 725f638..9c30360 100644
--- a/kawai_focus/screens/timer_screen.py
+++ b/kawai_focus/screens/timer_screen.py
@@ -2,7 +2,7 @@ from kivy.uix.screenmanager import Screen
 from kivy.clock import Clock
 from kivy.core.audio import SoundLoader
 
-from kawai_focus.utils.utils import data_json
+from kawai_focus.utils.utils import data_json, custom_timer, calculate_time
 
 
 class TimerScreen(Screen):
@@ -22,6 +22,22 @@ class TimerScreen(Screen):
         self.sound_stop_event = None
         self.timer = None
         self.timer_start_time = None
+        self.source_timer_names = None
+
+    def check_timer(self) -> None:
+        """Метод для выбора таймера"""
+        
+        current_timer_name = self.manager.state_machine.pop(0)
+        
+        if current_timer_name == 'pomodoro':
+            self.timer_generator = custom_timer(mm_user=self.timer.pomodoro_time)
+            self.ids.time_label.text = calculate_time(mm_user=self.timer.pomodoro_time)
+        elif current_timer_name == 'break':
+            self.timer_generator = custom_timer(mm_user=self.timer.break_time)
+            self.ids.time_label.text = calculate_time(mm_user=self.timer.break_time)
+        else:
+            self.timer_generator = custom_timer(mm_user=self.timer.break_long_time)
+            self.ids.time_label.text = calculate_time(mm_user=self.timer.break_long_time)
 
     def start_timer(self, instance) -> None:
         """Метод для запуска таймера"""
@@ -30,8 +46,11 @@ class TimerScreen(Screen):
             self.paused = False
         else:
             # Инициализация генератора таймера
+            if len(self.manager.state_machine) and self.timer_generator is None:
+                self.check_timer()
+            
             self.remaining_time = next(self.timer_generator, self.zero_time)
-        
+
         # Запуск обновления времени каждую секунду
         Clock.schedule_interval(self.update_time, 1)
 
@@ -57,6 +76,12 @@ class TimerScreen(Screen):
             Clock.unschedule(self.sound_stop_event)
             self.sound_stop_event = None
 
+        if len(self.manager.state_machine):
+            self.check_timer()
+        else:
+            self.manager.state_machine = self.source_timer_names.copy()
+            self.check_timer()
+
     def play_sound(self, dt) -> None:
         """Метод для воспроизведения звука"""
 
diff --git a/kawai_focus/tests/json/timer.json b/kawai_focus/tests/json/timer.json
index be37c13..eecf5f6 100644
--- a/kawai_focus/tests/json/timer.json
+++ b/kawai_focus/tests/json/timer.json
@@ -1,5 +1,4 @@
 {
     "sound_timer": "alarm-beep.mp3",
-    "zero_time": "00:00:00",
-    "custom_time": "00:00:12"
+    "zero_time": "00:00:00"
 }
\ No newline at end of file