diff --git a/SCRUM-Timer/Assets/ringtone001.wav b/SCRUM-Timer/Assets/ringtone001.wav new file mode 100644 index 0000000..a21b710 Binary files /dev/null and b/SCRUM-Timer/Assets/ringtone001.wav differ diff --git a/SCRUM-Timer/CountdownTimer.cs b/SCRUM-Timer/CountdownTimer.cs index ce9d56e..c2d3aa3 100644 --- a/SCRUM-Timer/CountdownTimer.cs +++ b/SCRUM-Timer/CountdownTimer.cs @@ -1,6 +1,7 @@ using System; using System.Threading; + namespace SCRUM_Timer; public class CountdownTimer @@ -9,8 +10,10 @@ public class CountdownTimer public bool isRunning; private Thread timerThread; + public event EventHandler? TimeChanged; - + public event EventHandler? CountdownEndReached; + public CountdownTimer() { ActualTime = new TimeSpan(0, 5, 0); @@ -35,9 +38,17 @@ public class CountdownTimer private void TimerTick() { - TimeSpan tickTime = new TimeSpan(0,0,1); + TimeSpan tickTime = new TimeSpan(0, 0, 1); while (isRunning) { + if (ActualTime == TimeSpan.Zero) //If 00:00:00 reached + { + isRunning = false; + CountdownEndReached?.Invoke(this, null); + Console.WriteLine("Timer is stopped"); + break; + } + ActualTime = ActualTime.Subtract(tickTime); TimeChanged?.Invoke(this, ActualTime); Console.WriteLine(ActualTime); @@ -58,4 +69,9 @@ public class CountdownTimer Console.WriteLine($"Changed Time To: {time}"); TimeChanged?.Invoke(this, ActualTime); } + + private void PlaySound() + { + + } } \ No newline at end of file diff --git a/SCRUM-Timer/Views/MainWindow.axaml.cs b/SCRUM-Timer/Views/MainWindow.axaml.cs index a11b7e8..8756e64 100644 --- a/SCRUM-Timer/Views/MainWindow.axaml.cs +++ b/SCRUM-Timer/Views/MainWindow.axaml.cs @@ -19,7 +19,7 @@ public partial class MainWindow : Window Dispatcher.UIThread.Post(() => { TimeText.Text = ts.ToString(@"hh\:mm\:ss"); }); }; - // Startwert anzeigen + // Show time TimeText.Text = countdownTimer.ActualTime.ToString(@"hh\:mm\:ss"); } diff --git a/SCRUM-Timer/bin/Debug/net9.0/SCRUM-Timer.dll b/SCRUM-Timer/bin/Debug/net9.0/SCRUM-Timer.dll index a5a60ac..1655680 100644 Binary files a/SCRUM-Timer/bin/Debug/net9.0/SCRUM-Timer.dll and b/SCRUM-Timer/bin/Debug/net9.0/SCRUM-Timer.dll differ diff --git a/SCRUM-Timer/bin/Debug/net9.0/SCRUM-Timer.pdb b/SCRUM-Timer/bin/Debug/net9.0/SCRUM-Timer.pdb index 2e6f2d3..017af49 100644 Binary files a/SCRUM-Timer/bin/Debug/net9.0/SCRUM-Timer.pdb and b/SCRUM-Timer/bin/Debug/net9.0/SCRUM-Timer.pdb differ diff --git a/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.AssemblyInfo.cs b/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.AssemblyInfo.cs index c9ace8b..a140b87 100644 --- a/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.AssemblyInfo.cs +++ b/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.AssemblyInfo.cs @@ -13,7 +13,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyCompanyAttribute("SCRUM-Timer")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+c75571d37f7336dfb52fed9dc6d68bf9b9f45b5b")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+61d34a07322c12eda04f3d0b42138bdbcbfecb60")] [assembly: System.Reflection.AssemblyProductAttribute("SCRUM-Timer")] [assembly: System.Reflection.AssemblyTitleAttribute("SCRUM-Timer")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.AssemblyInfoInputs.cache b/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.AssemblyInfoInputs.cache index c886e7b..f6ba7cc 100644 --- a/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.AssemblyInfoInputs.cache +++ b/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.AssemblyInfoInputs.cache @@ -1 +1 @@ -9c6fe80198f5371ea3d3b92476d3d3b511441274fad1a2af08f329e71215972b +ab040ed544ed55e89cafba8bf0618c74dc63a5fcd550dd04c456f26224f4ed78 diff --git a/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.dll b/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.dll index a5a60ac..1655680 100644 Binary files a/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.dll and b/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.dll differ diff --git a/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.pdb b/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.pdb index 2e6f2d3..017af49 100644 Binary files a/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.pdb and b/SCRUM-Timer/obj/Debug/net9.0/SCRUM-Timer.pdb differ diff --git a/SCRUM-Timer/obj/Debug/net9.0/ref/SCRUM-Timer.dll b/SCRUM-Timer/obj/Debug/net9.0/ref/SCRUM-Timer.dll index c90cad6..558e24c 100644 Binary files a/SCRUM-Timer/obj/Debug/net9.0/ref/SCRUM-Timer.dll and b/SCRUM-Timer/obj/Debug/net9.0/ref/SCRUM-Timer.dll differ diff --git a/SCRUM-Timer/obj/Debug/net9.0/refint/SCRUM-Timer.dll b/SCRUM-Timer/obj/Debug/net9.0/refint/SCRUM-Timer.dll index c90cad6..558e24c 100644 Binary files a/SCRUM-Timer/obj/Debug/net9.0/refint/SCRUM-Timer.dll and b/SCRUM-Timer/obj/Debug/net9.0/refint/SCRUM-Timer.dll differ