From 55afa8c2a4cc0454e79af0759e4f1f6480b61182 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Troja=C5=84ski?=
 <80624809+enviGit@users.noreply.github.com>
Date: Tue, 28 Feb 2023 19:28:42 +0100
Subject: [PATCH] Start function for resuming timer fixed

---
 PomodoroTimer/MainWindow.xaml       |   2 +-
 PomodoroTimer/MainWindow.xaml.cs    |   2 ++
 PomodoroTimer/Models/Timer.cs       |  30 +++++++++++++++++++---------
 PomodoroTimer/PomodoroTimer.csproj  |   7 +++----
 PomodoroTimer/Resources/appIcon.ico | Bin 0 -> 16958 bytes
 5 files changed, 27 insertions(+), 14 deletions(-)
 create mode 100644 PomodoroTimer/Resources/appIcon.ico

diff --git a/PomodoroTimer/MainWindow.xaml b/PomodoroTimer/MainWindow.xaml
index 6913b88..450f023 100644
--- a/PomodoroTimer/MainWindow.xaml
+++ b/PomodoroTimer/MainWindow.xaml
@@ -10,7 +10,7 @@
     <Grid>
         <Image gif:ImageBehavior.AnimatedSource="Resources/bg.gif"/>
 
-        <TextBlock x:Name="TimeRemainingLabel" Text="" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="48" Margin="0,0,0,125"/>
+        <TextBlock x:Name="TimeRemainingLabel" Text="" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="48" Margin="0,0,0,125" Background="#3F000000"/>
 
         <ProgressBar x:Name="ProgressBar" Value="0" Minimum="0" Maximum="1" HorizontalAlignment="Stretch" VerticalAlignment="Bottom" Margin="10" Visibility="Collapsed"/>
         
diff --git a/PomodoroTimer/MainWindow.xaml.cs b/PomodoroTimer/MainWindow.xaml.cs
index d030c24..96914e0 100644
--- a/PomodoroTimer/MainWindow.xaml.cs
+++ b/PomodoroTimer/MainWindow.xaml.cs
@@ -2,6 +2,8 @@
 using System;
 using System.Windows;
 
+#nullable disable
+
 namespace PomodoroTimer
 {
     public partial class MainWindow : Window
diff --git a/PomodoroTimer/Models/Timer.cs b/PomodoroTimer/Models/Timer.cs
index 3744689..fcdc276 100644
--- a/PomodoroTimer/Models/Timer.cs
+++ b/PomodoroTimer/Models/Timer.cs
@@ -57,17 +57,28 @@ public void Start()
                 return;
 
             IsRunning = true;
-            IsPaused = false;
 
-            if (_timer == null)
+            if (_timer != null)
             {
-                _timer = new System.Timers.Timer(1000);
-                _timer.Elapsed += OnTimerElapsed;
+                _timer.Stop();
+                _timer.Dispose();
             }
 
-            if (IsPaused)
+            _timer = new System.Timers.Timer(1000);
+            _timer.Elapsed += OnTimerElapsed;
+
+            if (!IsPaused)
+            {
+                TimeRemaining = Duration;
+            }
+            else if (IsPaused)
             {
-                _timeRemaining = _remainingTimeOnPause;
+                if (_remainingTimeOnPause.TotalMilliseconds > 0)
+                    TimeRemaining = _remainingTimeOnPause;
+                else
+                    TimeRemaining = Duration;
+
+                _remainingTimeOnPause = TimeSpan.Zero;
             }
 
             _timer.Start();
@@ -78,11 +89,12 @@ public void Pause()
                 return;
 
             IsPaused = true;
+            _remainingTimeOnPause = TimeRemaining;
 
             if (_timer != null)
                 _timer.Stop();
 
-            _remainingTimeOnPause = TimeRemaining;
+            IsRunning = false;
         }
         public void Reset()
         {
@@ -105,7 +117,7 @@ private void OnTimerElapsed(object sender, ElapsedEventArgs e)
                 IsPaused = false;
             }
 
-            Tick?.Invoke(this, EventArgs.Empty);
+            OnTick();
         }
         private void OnTick()
         {
@@ -113,4 +125,4 @@ private void OnTick()
                 Tick(this, EventArgs.Empty);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/PomodoroTimer/PomodoroTimer.csproj b/PomodoroTimer/PomodoroTimer.csproj
index 173d2cb..bbca90e 100644
--- a/PomodoroTimer/PomodoroTimer.csproj
+++ b/PomodoroTimer/PomodoroTimer.csproj
@@ -5,6 +5,7 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
+    <ApplicationIcon>Resources\appIcon.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
@@ -17,13 +18,11 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
+    <Content Include="Resources\appIcon.ico" />
   </ItemGroup>
 
   <ItemGroup>
-    <Reference Include="Lighty.Controls">
-      <HintPath>C:\Users\Envi\.nuget\packages\lighty.controls\1.0.3\lib\net45\Lighty.Controls.dll</HintPath>
-    </Reference>
+    <PackageReference Include="WpfAnimatedGif" Version="2.0.2" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/PomodoroTimer/Resources/appIcon.ico b/PomodoroTimer/Resources/appIcon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..bb76bc309d6141a9ea6f0c8a2fa83b849155979b
GIT binary patch
literal 16958
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

literal 0
HcmV?d00001