Added option to reset timers after idling

Author: Reavert

VisualStudioDiscordRPC.Shared/DiscordRpcController.cs

@@ -7,6 +7,7 @@
 using VisualStudioDiscordRPC.Shared.Nests;
 using VisualStudioDiscordRPC.Shared.Nests.Base;
 using VisualStudioDiscordRPC.Shared.Observers;
+using VisualStudioDiscordRPC.Shared.Plugs.TimerPlugs;
 
 namespace VisualStudioDiscordRPC.Shared
 {
@@ -25,6 +26,7 @@ public class DiscordRpcController
         private readonly LocalizationService _localizationService;
         private readonly SettingsService _settingsService;
         private readonly VsObserver _vsObserver;
+        private readonly PlugService _plugService;
 
         private readonly RichPresence _sharedRichPresence;
         private readonly object _richPresenceSync = new object();
@@ -103,6 +105,7 @@ public DiscordRpcController(int updateMillisecondsTimeout)
         {
             _settingsService = ServiceRepository.Default.GetService<SettingsService>();
             _vsObserver = ServiceRepository.Default.GetService<VsObserver>();
+            _plugService = ServiceRepository.Default.GetService<PlugService>();
 
             var applicationId = _settingsService.Read<string>(SettingsKeys.ApplicationID);
 
@@ -223,6 +226,8 @@ private void OnTextEditorLineChanged(EnvDTE.TextPoint startPoint, EnvDTE.TextPoi
         {
             if (_enabled && _isIdling)
                 SetDirty();
+            else
+                _lastDirtyTime = DateTime.Now;
         }
 
         public void RefreshAll()
@@ -237,12 +242,17 @@ public void RefreshAll()
 
         private void SetDirty()
         {
+            bool wasIdling = _isIdling;
+
             lock (_dirtyFlagSync)
             {
                 _isDirty = true;
                 _isIdling = false;
                 _lastDirtyTime = DateTime.Now;
             }
+
+            if (wasIdling)
+                OnEndIdling();
         }
 
         private void SendRichPresenceData()
@@ -304,6 +314,19 @@ private void OnRpcUpdate()
         private void OnIdle()
         {
             _discordRpcClient.SetPresence(IdlingRichPresence);
+
+        }
+
+        private void OnEndIdling()
+        {
+            bool resetTimersAfterIdling = _settingsService.Read<bool>(SettingsKeys.ResetTimersAfterIdling);
+            if (!resetTimersAfterIdling)
+                return;
+            
+            var timerPlugs = _plugService.GetPlugsOfType<BaseTimerPlug>();
+
+            foreach (var timerPlug in timerPlugs)
+                timerPlug.SyncTimestamp();
         }
     }
 }

VisualStudioDiscordRPC.Shared/Plugs/TimerPlugs/BaseTimerPlug.cs

@@ -11,7 +11,7 @@ protected BaseTimerPlug()
             SyncTimestamp();
         }
 
-        protected void SyncTimestamp()
+        public void SyncTimestamp()
         {
             _changeTimestamp = Timestamps.Now;
             Update();

VisualStudioDiscordRPC.Shared/SettingsKeys.cs

@@ -21,5 +21,6 @@ public static class SettingsKeys
         public const string SecretSolutions = "SecretSolutions";
         public const string DetectIdling = "DetectIdling";
         public const string IdleTime = "IdleTime";
+        public const string ResetTimersAfterIdling = "ResetTimersAfterIdling";
     }
 }

VisualStudioDiscordRPC.Shared/ViewModels/SettingsViewModel.cs

@@ -42,6 +42,16 @@ public bool DetectIdlingEnabled
             }
         }
 
+        public bool ResetTimersAfterIdling
+        {
+            get => _settingsService.Read<bool>(SettingsKeys.ResetTimersAfterIdling);
+            set
+            {
+                _settingsService.Set(SettingsKeys.ResetTimersAfterIdling, value);
+                OnPropertyChanged(nameof(ResetTimersAfterIdling));
+            }
+        }
+
         public string IdleTime
         {
             get => _settingsService.Read(SettingsKeys.IdleTime, SettingsDefaults.DefaultIdleTime).ToString();

VisualStudioDiscordRPC.Shared/Views/SettingsWindow.xaml

@@ -116,7 +116,11 @@
                           IsChecked="{Binding DetectIdlingEnabled}">
                     <TextBlock Text="Detect idling"/>
                 </CheckBox>
-
+                <CheckBox Margin="5"
+                          IsEnabled="{Binding DetectIdlingEnabled}"
+                          IsChecked="{Binding ResetTimersAfterIdling}">
+                    <TextBlock Text="Reset timers after idling"/>
+                </CheckBox>
                 <TextBlock Text="Idle time (minutes):"/>
                 <TextBox Name="IdleTimeTextBox"
                          IsEnabled="{Binding DetectIdlingEnabled}"