[gnome-break-timer] Use TimeUnit constants consistently for clarity

[Dylan McCall <dylanmccall src gnome org>]

commit f7934c41765ed8820dfd24c164a0d2b080f40ed2
Author: Dylan McCall <dylan dylanmccall ca>
Date:   Mon Nov 23 14:56:50 2020 -0800

    Use TimeUnit constants consistently for clarity

 src/common/TimeUnit.vala                              |  1 +
 src/daemon/Application.vala                           |  2 +-
 src/daemon/activity/MutterActivityMonitorBackend.vala |  2 +-
 src/daemon/util/PausableTimeout.vala                  |  2 +-
 src/settings/widgets/CircleCounter.vala               | 16 +++++++++-------
 5 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/src/common/TimeUnit.vala b/src/common/TimeUnit.vala
index 88a95f5..95899ba 100644
--- a/src/common/TimeUnit.vala
+++ b/src/common/TimeUnit.vala
@@ -20,6 +20,7 @@ namespace BreakTimer.Common {
 public abstract class TimeUnit {
     public const int MILLISECONDS_IN_SECONDS = 1000;
     public const int MICROSECONDS_IN_SECONDS = 1000 * 1000;
+    public const int MICROSECONDS_IN_MILLISECONDS = 1000;
 
     public static bool _do_override_time = false;
     public static int64 _override_real_time = 0;
diff --git a/src/daemon/Application.vala b/src/daemon/Application.vala
index e17f21c..f254319 100644
--- a/src/daemon/Application.vala
+++ b/src/daemon/Application.vala
@@ -25,7 +25,7 @@ public class Application : Gtk.Application {
     const int DATA_VERSION = 0;
 
     // Keep running for one minute after the last break is disabled
-    private const int ACTIVITY_TIMEOUT_MS = 60000;
+    private const int ACTIVITY_TIMEOUT_MS = 60 * TimeUnit.MILLISECONDS_IN_SECONDS;
 
     private BreakManager break_manager;
     private SessionStatus session_status;
diff --git a/src/daemon/activity/MutterActivityMonitorBackend.vala 
b/src/daemon/activity/MutterActivityMonitorBackend.vala
index a3e8c74..c0045c4 100644
--- a/src/daemon/activity/MutterActivityMonitorBackend.vala
+++ b/src/daemon/activity/MutterActivityMonitorBackend.vala
@@ -31,7 +31,7 @@ public class MutterActivityMonitorBackend : ActivityMonitorBackend, GLib.Initabl
     private int64 last_idle_time_update_time_ms;
     private bool user_is_active;
 
-    private static uint64 IDLE_WATCH_INTERVAL_MS = 1000;
+    private const uint IDLE_WATCH_INTERVAL_MS = 1 * TimeUnit.MILLISECONDS_IN_SECONDS;
 
     public MutterActivityMonitorBackend () {
         this.user_is_active = false;
diff --git a/src/daemon/util/PausableTimeout.vala b/src/daemon/util/PausableTimeout.vala
index d05bb30..476f856 100644
--- a/src/daemon/util/PausableTimeout.vala
+++ b/src/daemon/util/PausableTimeout.vala
@@ -56,7 +56,7 @@ public class PausableTimeout : GLib.Object {
         int64 time_delta = now - this.last_time;
         this.last_time = now;
 
-        int delta_millisecs = (int) (time_delta / 1000);
+        int delta_millisecs = (int) (time_delta / TimeUnit.MILLISECONDS_IN_SECONDS);
         this.timeout_cb (this, delta_millisecs);
 
         return GLib.Source.CONTINUE;
diff --git a/src/settings/widgets/CircleCounter.vala b/src/settings/widgets/CircleCounter.vala
index c4745a6..5a851b5 100644
--- a/src/settings/widgets/CircleCounter.vala
+++ b/src/settings/widgets/CircleCounter.vala
@@ -15,6 +15,8 @@
  * along with GNOME Break Timer.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+using BreakTimer.Common;
+
 namespace BreakTimer.Settings.Widgets {
 
 /**
@@ -26,14 +28,14 @@ public class CircleCounter : Gtk.Widget {
     protected const double LINE_WIDTH = 5.0;
     protected const int DEFAULT_RADIUS = 48;
 
-    /* 10 seconds in microseconds */
-    private const int64 FULL_ANIM_TIME = (int64) (10000000 / (Math.PI * 2));
+    /* 500 ms in microseconds */
+    private const int64 MAX_ANIM_DURATION = 500 * TimeUnit.MICROSECONDS_IN_MILLISECONDS;
 
     /* 10 ms in microseconds */
-    private const int64 MIN_ANIM_DURATION = 10000;
+    private const int64 MIN_ANIM_DURATION = 10 * TimeUnit.MICROSECONDS_IN_MILLISECONDS;
 
-    /* 500 ms in microseconds */
-    private const int64 MAX_ANIM_DURATION = 500000;
+    /* 10 seconds per rotation in microseconds */
+    private const int64 FULL_ANIM_SPEED = (int64) ((10 * TimeUnit.MICROSECONDS_IN_SECONDS) / (Math.PI * 2));
 
     private const double SNAP_INCREMENT = (Math.PI * 2) / 60.0;
     private const double BASE_ANGLE = 1.5 * Math.PI;
@@ -90,8 +92,8 @@ public class CircleCounter : Gtk.Widget {
 
         // Animate at a consistent speed regardless of the distance covered.
         double change = (progress_angle - this.draw_angle).abs ();
-        int64 duration = int64.min(
-            (int64) (change * FULL_ANIM_TIME),
+        int64 duration = int64.min (
+            (int64) (change * FULL_ANIM_SPEED),
             MAX_ANIM_DURATION
         );