hide cosmic conversion table by default (press c to toggle)

1 files changed, 18 insertions, 8 deletions

diff --git a/countdown.hs b/countdown.hs
index f2a41ff..70ecc99 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -73,6 +73,7 @@ data St =
        , _stDisplayTime    :: LocalTime
        , _stNextEvent      :: Maybe UTCTime
        , _stPaused :: Bool
+       , _stShowConversion :: Bool
        }
 
 makeLenses ''St
@@ -108,14 +109,18 @@ drawUI st = [a]
         -- (str $ "Last event: " <> (show $ st ^. stLastBrickEvent)),
         -- (str "\n"),
         (str "\n"),
-        (countdownWidget (isSimulatedTime st) $ st ^. stDisplayTime)
+        (countdownWidget (st ^. stShowConversion) (isSimulatedTime st) $ st ^. stDisplayTime)
       ]
 
+showTime' :: Bool -> NominalDiffTime -> String
+showTime' True 1          = printf "%-3s second" ("1" :: Text)
+showTime' True t | t < 60 = printf "%.1f seconds" (realToFrac t :: Float)
+showTime' _ t = showTime t
+
 showTime :: NominalDiffTime -> String
 showTime t | t < 1           = printf "%.3f seconds" (realToFrac t :: Float)
-showTime t | t == 1          = "1   second"
+showTime t | t == 1          = "1 second"
 -- showTime t | t < 10          = formatTime defaultTimeLocale "%2Es seconds" t -- BUG! Doesn't respect <width> parameter at all!
--- showTime t | t < 10          = printf "%.2f seconds" (realToFrac t :: Float)
 showTime t | t < 60          = printf "%.1f seconds" (realToFrac t :: Float)
 showTime t | t == 60         = formatTime defaultTimeLocale "%M minute" t
 showTime t | t < 60*2        = formatTime defaultTimeLocale "%M minute %Ss" t
@@ -129,7 +134,7 @@ showTime t | t < 60*60*24*2  = formatTime defaultTimeLocale "%d day %Hh" t
 showTime t | t == 60*60*24*7 = formatTime defaultTimeLocale "%d days" t
 showTime t | t < 60*60*24*10 = formatTime defaultTimeLocale "%d days %Hh" t
 showTime t                   = formatTime defaultTimeLocale "%d days" t
--- showTime t = formatTime defaultTimeLocale "%w weeks %D days" t
+-- showTime _ t = formatTime defaultTimeLocale "%w weeks %D days" t
 
 yearsToCosmicTime :: Integral i => i -> NominalDiffTime
 yearsToCosmicTime = (/ (realToFrac ageOfUniverseInYears)) . (* lengthOfYear) . realToFrac
@@ -189,8 +194,8 @@ showLarge n | n >= 10 * 1000               = printf "%.0f thousand" (n / 1000)
 showLarge n | n >= 10                      = unpack $ commasF 0 n
 showLarge n                                = printf "%.3f" n
 
-countdownWidget :: Bool -> LocalTime -> Widget n
-countdownWidget isSimulated t =
+countdownWidget :: Bool -> Bool -> LocalTime -> Widget n
+countdownWidget showConversion isSimulated t =
   (border $ vBox [
     (hCenter $ hBox
      [ countdownBox
@@ -216,8 +221,11 @@ countdownWidget isSimulated t =
                 else
                   borderWithLabel (txt "Next on the Cosmic Calendar") nextEntry,
                 -- vBox [ cosmicCalendarCurrent, txt "\n", cosmicCalendarNext ],
-                str "   ",
-                borderWithLabel (str "Cosmic Conversion") (hBox [cosmicConversion, cosmicConversion'])
+                if showConversion
+                then
+                  str "   " <=> borderWithLabel (str "Cosmic Conversion") (hBox [cosmicConversion, cosmicConversion'])
+                else
+                  str ""
     ])
   where
     -- TODO: We want to display "today" or "now" on the cosmic calendar;
@@ -406,6 +414,7 @@ handleEvent chan st e =
         VtyEvent (V.EvKey V.KEnd [])         -> cont $ st & stDisplayTime .~ (newYearsEveLast10 $ st ^. stClockTime)
         VtyEvent (V.EvKey V.KEnd [MShift])   -> cont $ st & stDisplayTime .~ (yearEnd $ st ^. stClockTime)
         VtyEvent (V.EvKey V.KEnd [MCtrl])    -> cont $ st & stDisplayTime .~ (newYearsEveNoon $ st ^. stClockTime)
+        VtyEvent (V.EvKey (V.KChar 'c') [])  -> cont $ st & stShowConversion %~ not
         VtyEvent (V.EvKey (V.KChar 'p') [])  -> cont $ st & stPaused %~ not
         VtyEvent (V.EvKey (V.KChar ',') [])  -> cont $ st & stDisplayTime %~ previousCalendarEntryTime
         VtyEvent (V.EvKey (V.KChar '.') [])  -> cont $ st & stDisplayTime %~ nextCalendarEntryTime
@@ -439,6 +448,7 @@ initialState t =
        , _stDisplayTime = t
        , _stNextEvent = Nothing
        , _stPaused = False
+       , _stShowConversion = False
        }
 
 daysInYear :: LocalTime -> Int