more docs, use util function

src/Swarm/TUI/View/Attribute/CustomStyling.hs

@@ -3,13 +3,13 @@
 module Swarm.TUI.View.Attribute.CustomStyling where
 
 import Brick (AttrName, attrName)
-import Data.Colour.Palette.BrewerSet (Kolor)
-import Data.Colour.SRGB (RGB (..), sRGB24read, toSRGB24)
+import Data.Colour.SRGB (sRGB24read)
 import Data.Set (toList)
 import Data.Text qualified as T
 import Graphics.Vty.Attributes
 import Swarm.Game.Scenario.Style
 import Swarm.TUI.View.Attribute.Attr (worldPrefix)
+import Swarm.TUI.View.Attribute.Util
 
 toStyle :: StyleFlag -> Style
 toStyle = \case
@@ -24,10 +24,8 @@ toStyle = \case
 
 hexToAttrColor :: HexColor -> Color
 hexToAttrColor (HexColor colorText) =
-  RGBColor r g b
+  kolorToAttrColor c
  where
-  RGB r g b = toSRGB24 c
-  c :: Kolor
   c = sRGB24read $ T.unpack colorText
 
 toAttrPair :: CustomAttr -> (AttrName, Attr)

src/Swarm/TUI/View/Attribute/Util.hs

@@ -16,7 +16,7 @@ kolorToAttrColor c =
   RGB r g b = toSRGB24 c
 
 -- | Automatically selects black or white for the foreground
--- based on the darkness of the supplied background.
+-- based on the luminance of the supplied background.
 bgWithAutoForeground :: Kolor -> Attr
 bgWithAutoForeground c = fgColor `on` kolorToAttrColor c
  where

test/integration/Main.hs

@@ -343,6 +343,10 @@ testScenarioSolutions rs ui =
         Nothing -> assertFailure "No base bot!"
         Just base -> do
           let counters = base ^. activityCounts
+          -- NOTE: The values of 7 and 10 for "tangible" and "total" command counts
+          -- make sense from the test program and match the F2 screen upon winning the scenario.
+          -- However, the F2 dialog actually shows 64 for the step count. This test was
+          -- hardcoded to 62 just to make it pass.
           assertEqual "Incorrect tangible command count." 7 $ view tangibleCommandCount counters
           assertEqual "Incorrect command count." 10 $ sum . M.elems $ view commandsHistogram counters
           assertEqual "Incorrect step count." 62 $ view lifetimeStepCount counters