refactor

1 files changed, 50 insertions, 42 deletions

diff --git a/countdown.hs b/countdown.hs
index b976e73..ffe7af0 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -112,48 +112,56 @@ pluralizeVerb _ = ""
 
 drawUI :: St -> [Widget ()]
 drawUI st = [a]
-    where
-        t = utcToZonedTime zone $ st ^. stCurrentTime
-        currentYear = yearNumber t
-        dayNum = dayNumOfYear t
-        numDays = daysInYear t
-        yearLength = fromIntegral numDays * nominalDay
-        -- yearLength = (zonedTimeToLocalTime $ yearEnd t) `diffLocalTime` (zonedTimeToLocalTime $ yearStart t)
-        yearElapsed = (zonedTimeToLocalTime t) `diffLocalTime` (zonedTimeToLocalTime $ yearStart t)
-
-        daysLeft = numDays - dayNum
-        secondsLeft = toSeconds $ yearLength - yearElapsed
-        a = -- (str $ "Last event: " <> (show $ st^.stLastBrickEvent))
-            -- <=>
-          (hCenter (borderWithLabel (str "Current time") $
-                    (str (formatTime defaultTimeLocale "%A, %B %e%n%Y-%m-%d %r" t))))
-
-          <=>
-          (borderWithLabel (str "Progress through year") $
-            (str "\n")
-            <=>
-            (borderWithLabel (str $ printf "%d" currentYear)
-              (str $ printf "%d day%s remain\n%s second%s remain%s"
-                                              daysLeft
-                                              (pluralize daysLeft)
-                                              (commas secondsLeft)
-                                              (pluralize secondsLeft)
-                                              (pluralizeVerb secondsLeft)))
-            <=>
-            (borderWithLabel (str progressLabel) $
-                updateAttrMap
-                (A.mapAttrName yDoneAttr P.progressCompleteAttr .
-                  A.mapAttrName yToDoAttr P.progressIncompleteAttr) $
-                progressBar Nothing (realToFrac $ yearElapsed // yearLength))
-            <=>
-            (hCenter $ str $ printf "\nDay #%d of %d\nSecond #%s of %s"
-                          dayNum
-                          numDays
-                          (commas $ toSeconds yearElapsed)
-                          (commas $ toSeconds yearLength)))
-        toSeconds dt = nominalDiffTimeToSeconds dt `div'` 1 :: Int
-        x // y = fromRational $ toRational x / toRational y :: Double
-        progressLabel = printf "%.6F%%" (100 * (yearElapsed // yearLength))
+  where
+    a = (str $ "Last event: " <> (show $ st^.stLastBrickEvent))
+        <=>
+        (str "\n")
+        <=>
+        (countdownWidget $ utcToZonedTime zone $ st ^. stCurrentTime)
+
+countdownWidget :: ZonedTime -> Widget n
+countdownWidget t =
+  (hCenter (borderWithLabel (str "Current time") $
+            (str (formatTime defaultTimeLocale "%A, %B %e%n%Y-%m-%d %r" t))))
+
+  <=>
+  (borderWithLabel (str "Progress through year") $
+    (str "\n")
+    <=>
+    (borderWithLabel (str $ printf "%d" currentYear)
+      (str $ printf "%d day%s remain\n%s second%s remain%s"
+                                      daysLeft
+                                      (pluralize daysLeft)
+                                      (commas secondsLeft)
+                                      (pluralize secondsLeft)
+                                      (pluralizeVerb secondsLeft)))
+    <=>
+    (borderWithLabel (str progressLabel) $
+        updateAttrMap
+        (A.mapAttrName yDoneAttr P.progressCompleteAttr .
+          A.mapAttrName yToDoAttr P.progressIncompleteAttr) $
+        progressBar Nothing (realToFrac $ yearElapsed // yearLength))
+    <=>
+    (hCenter $ str $ printf "\nDay #%d of %d in %d\nSecond #%s of %s in %d"
+                  dayNum
+                  numDays
+                  currentYear
+                  (commas $ toSeconds yearElapsed)
+                  (commas $ toSeconds yearLength)
+                  currentYear))
+  where
+    currentYear    = yearNumber t
+    dayNum         = dayNumOfYear t
+    numDays        = daysInYear t
+    yearLength     = fromIntegral numDays * nominalDay
+    -- yearLength  = (zonedTimeToLocalTime $ yearEnd t) `diffLocalTime` (zonedTimeToLocalTime $ yearStart t)
+    yearElapsed    = (zonedTimeToLocalTime t) `diffLocalTime` (zonedTimeToLocalTime $ yearStart t)
+
+    daysLeft       = numDays - dayNum
+    secondsLeft    = toSeconds $ yearLength - yearElapsed
+    toSeconds dt   = nominalDiffTimeToSeconds dt `div'` 1 :: Int
+    x // y         = fromRational $ toRational x / toRational y :: Double
+    progressLabel  = printf "%.6F%%" (100 * (yearElapsed // yearLength))
 
 commas :: Integral i => i -> Text
 commas = prettyI (Just ',') . fromIntegral