output tweaking

1 files changed, 22 insertions, 7 deletions

diff --git a/countdown.hs b/countdown.hs
index a6d5a31..419a7c8 100755
--- a/countdown.hs
+++ b/countdown.hs
@@ -11,7 +11,8 @@
 {-# language FlexibleContexts #-}
 {-# language TemplateHaskell #-}
 {-# language ViewPatterns #-}
-import Rebase.Prelude hiding (toList, on, (<+>))
+{-# language OverloadedStrings #-}
+import Rebase.Prelude hiding (toList, on, (<+>), Max)
 import qualified Rebase.Prelude as Prelude
 import Control.Lens hiding ((<|))
 import Data.Foldable (toList)
@@ -21,10 +22,13 @@ import Graphics.Vty
 import Data.Time.LocalTime
 import Control.Monad.RWS
 import Data.Time.Calendar.OrdinalDate
+import qualified Data.Text as Text
 import Data.Text.Format.Numbers
 import Rebase.Data.Map.Strict (Map)
 import qualified Rebase.Data.Map.Strict as Map
 
+import Brick
+import Brick.Types
 import Data.Text (unpack)
 import Control.Lens
 import Control.Monad (void, forever)
@@ -109,11 +113,12 @@ drawUI st = [a]
 
 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 < 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
 showTime t | t < 60*10       = formatTime defaultTimeLocale "%M minutes %Ss" t
 showTime t | t < 60*60       = formatTime defaultTimeLocale "%M minutes" t
 showTime t | t == 60*60      = "1 hour"
@@ -138,10 +143,13 @@ toCosmicTime t = realToFrac ageOfUniverseInYears * (realToFrac $ t // yearLength
     yearLength = daysPerYear * nominalDay
     x // y     = fromRational $ toRational x / toRational y :: Double
 
+showCosmicTime :: NominalDiffTime -> String
+showCosmicTime n = showLarge (fromRational $ toCosmicTime n) ++ " years"
+
 conversionTableRowFromCosmicSeconds :: NominalDiffTime -> [Widget n]
 conversionTableRowFromCosmicSeconds n = [cosmicTime, realTime]
   where
-    realTime = str $ showLarge (fromRational $ toCosmicTime n) ++ " years"
+    realTime = str $ showCosmicTime n
     cosmicTime = str $ showTime n
 
 cosmicConversion' :: Widget n
@@ -221,8 +229,15 @@ countdownWidget isSimulated t =
     prevEntry = fromMaybe (str "none") $ calendarWidget <$> getLastCalendarEntry t
     nextEntry = fromMaybe (str "none") $ calendarWidget <$> getNextCalendarEntry t
 
-    calendarWidget CalendarEntry{..} = box
+    calendarWidget CalendarEntry{..} = vBox [eventCountdown, str "\n", box]
       where
+        timeUntilActive = (calBeginTime `addLocalTime` yearStart t) `diffLocalTime` t
+        eventCountdown = if timeUntilActive >= 0 then
+                          hBox [str $ "in " ++ showTime timeUntilActive,
+                                padLeft Max $ str $ "in " ++ showCosmicTime timeUntilActive]
+                        else
+                          hBox [str $ showTime (-timeUntilActive) ++ " ago",
+                                padLeft Max $ str $ showCosmicTime (-timeUntilActive) ++ " ago"]
         years = fromRational $ toCosmicTime calBeginTime
         box = borderWithLabel (txt calTitle) $ vBox [
           hCenter $ txt $ calSubtitle,
@@ -284,7 +299,7 @@ countdownWidget isSimulated t =
             -- , (str $ printf "%s thousand years ago" (commasF 3 $ cosmicYearsAgo / 1000))
             -- , (str $ printf "%s days ago" (commas $ (floor $ realToFrac cosmicYearsAgo * daysPerYear :: Integer)))
             ])
-    currentTimeBox = (hCenter (borderWithLabel (str $ printf "Current time%s" (if isSimulated then " (SIMULATED)" else "")) $
+    currentTimeBox = (hCenter (borderWithLabel (str $ printf "Current time%s" (if isSimulated then " (SIMULATED)" else "" :: String)) $
                                padLeftRight 3 $ (str (formatTime defaultTimeLocale "%A, %B %e%n%Y-%m-%d %r" t))))
     cosmicYears    = realToFrac ageOfUniverseInYears * (realToFrac $ (yearElapsed // yearLength)) :: Rational
     cosmicYearsAgo = realToFrac ageOfUniverseInYears * (realToFrac $ 1 - (yearElapsed // yearLength)) :: Rational
@@ -306,7 +321,7 @@ countdownWidget isSimulated t =
     x // y         = fromRational $ toRational x / toRational y :: Double
     progressLabel  = printf "%.6F%%" (100 * (yearElapsed // yearLength))
 
-commasF' 1 n = if (floor (n * 10) `mod` 10 :: Int) == 0 then commasF 0 n else commasF 1 n
+commasF' 1 n = if (floor (n * 10) `mod` 10 :: Int) == 0 then commasF 0 n `Text.append` "  " else commasF 1 n
 commasF' p n = commasF p n
 
 commasF', commasF :: RealFrac x => Int -> x -> Text