Cleanup

src/Dodge/Menu/Loading.hs

@@ -1,18 +1,20 @@
-module Dodge.Menu.Loading where
+module Dodge.Menu.Loading (
+    loadingScreen,
+) where
 
-import Dodge.ListDisplayParams
-import Dodge.Default.SelectionList
 import Dodge.Data.Universe
+import Dodge.ListDisplayParams
 
 loadingScreen :: String -> ScreenLayer
-loadingScreen str = OptionScreen
-    { _scTitle = str
-    , _scOptions = []
-    , _scOffset = 0
-    , _scPositionedMenuOption = NoEscapeMenuOption
-    , _scOptionFlag = LoadingScreen
-    , _scSelectionList = defaultSelectionList
-    , _scAvailableLines = 0
-    , _scListDisplayParams = optionListDisplayParams
-    , _scDisplayTime = 0
-    }
+loadingScreen str =
+    OptionScreen
+        { _scTitle = str
+        , _scOptions = []
+        , _scOffset = 0
+        , _scPositionedMenuOption = NoEscapeMenuOption
+        , _scOptionFlag = LoadingScreen
+        , _scSelectionList = []
+        , _scAvailableLines = 0
+        , _scListDisplayParams = optionListDisplayParams
+        , _scDisplayTime = 0
+        }

src/Dodge/Menu/Option.hs

@@ -1,17 +1,21 @@
-module Dodge.Menu.Option where
+module Dodge.Menu.Option (
+    initializeOptionMenu,
+    refreshOptionsSelectionList,
+    initializeOptionMenuBO,
+) where
 
-import Dodge.ListDisplayParams
 import Control.Applicative
 import Data.Maybe
 import Dodge.Data.SelectionList
 import Dodge.Data.Universe
-import Dodge.Default.SelectionList
+import Dodge.ListDisplayParams
 import Dodge.SelectionList
 import LensHelp
 import Padding
 import Picture.Base
 
-initializeOptionMenu :: String -> [MenuOption] -> EscapeMenuOption -> Universe -> ScreenLayer
+initializeOptionMenu ::
+    String -> [MenuOption] -> EscapeMenuOption -> Universe -> ScreenLayer
 initializeOptionMenu title ops pmo u =
     OptionScreen
         { _scTitle = title
@@ -19,14 +23,15 @@ initializeOptionMenu title ops pmo u =
         , _scOffset = 0
         , _scPositionedMenuOption = pmo
         , _scOptionFlag = NormalOptions
-        , _scSelectionList = makeOptionsSelectionList 10 (Just 0) u ops pmo
+        , _scSelectionList = optionsToSelections 10 u ops pmo
         , _scAvailableLines = getAvailableListLines optionListDisplayParams (u ^. uvConfig)
         , _scListDisplayParams = optionListDisplayParams
         , _scDisplayTime = 0
         }
 
 -- BO = Bottom Option
-initializeOptionMenuBO :: String -> [MenuOption] -> String -> (Universe -> Universe) -> Universe -> ScreenLayer
+initializeOptionMenuBO ::
+    String -> [MenuOption] -> String -> (Universe -> Universe) -> Universe -> ScreenLayer
 initializeOptionMenuBO title ops str eff = initializeOptionMenu title ops pmo
   where
     pmo = BottomEscapeMenuOption $ (Toggle eff . const . MODString) str
@@ -40,22 +45,9 @@ refreshOptionsSelectionList u = u & uvScreenLayers . ix 0 %~ f
             , _scPositionedMenuOption = pmo
             , _scAvailableLines = maxlines
             } ->
-                sl & scSelectionList . slItems .~ optionsToSelections maxlines u mops pmo
+                sl & scSelectionList .~ optionsToSelections maxlines u mops pmo
         _ -> sl
 
-makeOptionsSelectionList ::
-    Int ->
-    Maybe Int ->
-    Universe ->
-    [MenuOption] ->
-    EscapeMenuOption ->
-    SelectionList (Universe -> Universe, Universe -> Universe)
-makeOptionsSelectionList maxlines mselpos u mos pmo =
-    defaultSelectionList
-        { _slItems = optionsToSelections maxlines u mos pmo
---        , _slSelPos = mselpos
-        }
-
 optionsToSelections ::
     Int ->
     Universe ->
@@ -72,8 +64,10 @@ optionsToSelections maxlines u allops pmo = case pmo of
         | maxlines >= length allops = allops
         | otherwise = take (maxlines - 2) (drop offset allops ++ repeat dummyMenuOption) ++ [cycleOptionsOption]
     maxOptionLength = 3 + maximum (0 : map (optionValueOffset u) ops)
-    cycleOptionsOption = Toggle cycleOptions 
-        (const (MODString ("MORE OPTIONS " ++ show n ++ "/" ++ show m)))
+    cycleOptionsOption =
+        Toggle
+            cycleOptions
+            (const (MODString ("MORE OPTIONS " ++ show n ++ "/" ++ show m)))
     l = length allops
     m = div (l - 1) (max 1 (maxlines - 2)) + 1
     n = div (offset + 1) (max 1 (maxlines - 2)) + 1
@@ -92,16 +86,16 @@ cycleOptions u = fromMaybe u $ do
         | l + curoff >= n = 0
         | otherwise = l + curoff
 
-colStrToSelItem :: (Color, String) -> SelectionItem (Universe -> Universe)
-colStrToSelItem (col, str) =
-    SelectionItem
-        { _siPictures = [str]
-        , _siHeight = 1
-        , _siIsSelectable = True
-        , _siColor = col
-        , _siOffX = 0
-        , _siPayload = id
-        }
+--colStrToSelItem :: (Color, String) -> SelectionItem (Universe -> Universe)
+--colStrToSelItem (col, str) =
+--    SelectionItem
+--        { _siPictures = [str]
+--        , _siHeight = 1
+--        , _siIsSelectable = True
+--        , _siColor = col
+--        , _siOffX = 0
+--        , _siPayload = id
+--        }
 
 optionValueOffset :: Universe -> MenuOption -> Int
 optionValueOffset u mo = case _moString mo u of
@@ -135,12 +129,12 @@ menuOptionToSelectionItem w padAmount mo =
         MODStringOption s t -> rightPad padAmount '.' s ++ t
         x -> _modString x
 
-menuOptionToString :: Universe -> Int -> MenuOption -> (Color, String)
-menuOptionToString w padAmount mo = (thecol, optionText)
-  where
-    thecol = case _moString mo w of
-        MODBlockedString{} -> greyN 0.5
-        _ -> white
-    optionText = case _moString mo w of
-        MODStringOption s t -> rightPad padAmount '.' s ++ t
-        x -> _modString x
+--menuOptionToString :: Universe -> Int -> MenuOption -> (Color, String)
+--menuOptionToString w padAmount mo = (thecol, optionText)
+--  where
+--    thecol = case _moString mo w of
+--        MODBlockedString{} -> greyN 0.5
+--        _ -> white
+--    optionText = case _moString mo w of
+--        MODStringOption s t -> rightPad padAmount '.' s ++ t
+--        x -> _modString x