Store todays screen time (#126)

* store today screen time
bNobo · Apr 19, 2024 · 85c9ba1 · 85c9ba1
1 parent 5791040
commit 85c9ba1
Show file tree

Hide file tree

Showing 5 changed files with 67 additions and 1 deletion.
diff --git a/NeedABreak/App.config b/NeedABreak/App.config
@@ -44,6 +44,12 @@ DEBUG
       <setting name="Delay" serializeAs="String">
         <value>3600</value>
       </setting>
+      <setting name="TodayScreenTime" serializeAs="String">
+        <value>00:00:00</value>
+      </setting>
+      <setting name="DayStart" serializeAs="String">
+        <value />
+      </setting>
     </NeedABreak.Properties.Settings>
   </userSettings>
   <runtime>

diff --git a/NeedABreak/App.xaml.cs b/NeedABreak/App.xaml.cs
@@ -69,6 +69,16 @@ static App()
             //System.Threading.Thread.CurrentThread.CurrentUICulture = new System.Globalization.CultureInfo("en");
             //System.Threading.Thread.CurrentThread.CurrentCulture = new System.Globalization.CultureInfo("en");
             ConfigureLog4Net();
+
+#if DEBUG
+            Logger.Debug($"User settings path = {ConfigurationManager.OpenExeConfiguration(ConfigurationUserLevel.PerUserRoamingAndLocal).FilePath}"); 
+#endif
+
+            if (NeedABreak.Properties.Settings.Default.DayStart == DateTime.Today)
+            {
+                _cumulativeScreenTime = NeedABreak.Properties.Settings.Default.TodayScreenTime;
+            }
+
             _dayStart = DateTime.Today;
             _startShowingScreen = DateTime.Now;
         }
@@ -107,9 +117,19 @@ public App()
             StartTimer();
             Microsoft.Win32.SystemEvents.SessionSwitch += SystemEvents_SessionSwitch;
 
+            Exit += App_Exit;
+
             Logger.Debug("App ctor end");
         }
 
+        private void App_Exit(object sender, ExitEventArgs e)
+        {
+            // Store today screen time to restore it when app is launched
+            NeedABreak.Properties.Settings.Default.TodayScreenTime = GetTodayScreenTime();
+            NeedABreak.Properties.Settings.Default.DayStart = _dayStart;
+            NeedABreak.Properties.Settings.Default.Save();
+        }
+
         private async void UpdateToolTipTimer_Elapsed(object sender, ElapsedEventArgs e)
         {
             await Current.Dispatcher.InvokeAsync(() =>

diff --git a/NeedABreak/NeedABreak.csproj b/NeedABreak/NeedABreak.csproj
@@ -134,13 +134,24 @@
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
+    <Compile Update="Properties\Settings.Designer.cs">
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+    </Compile>
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Update="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <None Update="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
   <Target Name="MATPrerequisite" BeforeTargets="PrepareForBuild" Condition="!Exists('$(MSBuildExtensionsPath)\Microsoft\Multilingual App Toolkit\Microsoft.Multilingual.ResxResources.targets')" Label="MultilingualAppToolkit">
     <Warning Text="$(MSBuildProjectFile) is Multilingual build enabled, but the Multilingual App Toolkit is unavailable during the build. If building with Visual Studio, please check to ensure that toolkit is properly installed." />
   </Target>

diff --git a/NeedABreak/Properties/Settings.Designer.cs b/NeedABreak/Properties/Settings.Designer.cs
diff --git a/NeedABreak/Properties/Settings.settings b/NeedABreak/Properties/Settings.settings
@@ -11,5 +11,11 @@
     <Setting Name="Delay" Type="System.Int32" Scope="User">
       <Value Profile="(Default)">3600</Value>
     </Setting>
+    <Setting Name="TodayScreenTime" Type="System.TimeSpan" Scope="User">
+      <Value Profile="(Default)">00:00:00</Value>
+    </Setting>
+    <Setting Name="DayStart" Type="System.DateTime" Scope="User">
+      <Value Profile="(Default)" />
+    </Setting>
   </Settings>
 </SettingsFile>