stepus53/PomoTime
1
0
Fork 0
mirror of https://github.com/usatiuk/PomoTime.git synced 2025-10-29 00:47:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix timer being started and not stopped on notification open

Browse Source
This commit is contained in:
Stepan Usatiuk
2020-05-06 12:37:04 +03:00
parent e9576b08d4
commit d992e1ca6e
1 changed files with 24 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
PomoTime/MainPage.xaml.cs
View File

@@ -34,6 +34,7 @@ namespace PomoTime
private const int DefaultBreakMinutes = 5; private const int DefaultBreakMinutes = 5;
private const int DefaultWorkMinutes = 25; private const int DefaultWorkMinutes = 25;
private const int DefaultLongBreakMinutes = 15; private const int DefaultLongBreakMinutes = 15;
ThreadPoolTimer Timer;
private DateTime SuspendTime; private DateTime SuspendTime;
private int _work_minutes; private int _work_minutes;
@@ -68,6 +69,7 @@ namespace PomoTime
Application.Current.Resuming += OnResuming; Application.Current.Resuming += OnResuming;
this.Loaded += MainPageLoaded; this.Loaded += MainPageLoaded;
this.Unloaded += MainPageUnloaded;
ApplicationDataContainer roamingSettings = Windows.Storage.ApplicationData.Current.RoamingSettings; ApplicationDataContainer roamingSettings = Windows.Storage.ApplicationData.Current.RoamingSettings;
Windows.Storage.ApplicationDataCompositeValue minutes = (ApplicationDataCompositeValue)roamingSettings.Values["Minutes"]; Windows.Storage.ApplicationDataCompositeValue minutes = (ApplicationDataCompositeValue)roamingSettings.Values["Minutes"];
@@ -194,6 +196,11 @@ namespace PomoTime
{ {
Text = header Text = header
}, },
new AdaptiveText()
{
Text = "Open app or the notification to continue"
},
}, },
} }
@@ -335,14 +342,22 @@ namespace PomoTime
private void MainPageLoaded(object sender, RoutedEventArgs e) private void MainPageLoaded(object sender, RoutedEventArgs e)
{ {
ThreadPoolTimer timer = ThreadPoolTimer.CreatePeriodicTimer(async (t) => if (Timer == null)
{ {
await Dispatcher.RunAsync(CoreDispatcherPriority.High, Timer = ThreadPoolTimer.CreatePeriodicTimer(async (t) =>
() => {
{ await Dispatcher.RunAsync(CoreDispatcherPriority.High,
timer_Tick(); () =>
}); {
}, TimeSpan.FromSeconds(1)); timer_Tick();
});
}, TimeSpan.FromSeconds(1));
}
}
private void MainPageUnloaded(object sender, RoutedEventArgs e)
{
Timer.Cancel();
} }
protected override void OnNavigatedTo(NavigationEventArgs e) protected override void OnNavigatedTo(NavigationEventArgs e)
@@ -356,7 +371,8 @@ namespace PomoTime
{ {
SuspendTime = new DateTime((long)localSettings.Values["SuspendTime"]); SuspendTime = new DateTime((long)localSettings.Values["SuspendTime"]);
FastForwardTime(SuspendTime); FastForwardTime(SuspendTime);
} else }
else
{ {
Reset(); Reset();
} }