Use type synonyms from monomer

RubenAstudillo · Oct 3, 2023 · a799bac · a799bac
1 parent e67d55e
commit a799bac
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 26 deletions.
diff --git a/src/RsiBreak/Widget/Clockdown.hs b/src/RsiBreak/Widget/Clockdown.hs
@@ -36,7 +36,7 @@ mainCounter = "MainCounter"
 mainCounterKey :: WidgetKey
 mainCounterKey = WidgetKey mainCounter
 
-buildUI :: WidgetEnv ClockModel ClockEvent -> ClockModel -> WidgetNode ClockModel ClockEvent
+buildUI :: UIBuilder ClockModel ClockEvent
 buildUI _wenv (ClockModel _ timer _) =
     vstack
         [ label "Rsi break!"
@@ -47,12 +47,7 @@ buildUI _wenv (ClockModel _ timer _) =
         , composite "timer" toTimerModel Timer.buildUI (Timer.handleEvent ClockUpdate) `nodeKey` mainCounter
         ] `styleBasic` [padding 10]
 
-handleEvent ::
-    WidgetEnv ClockModel ClockEvent ->
-    WidgetNode ClockModel ClockEvent ->
-    ClockModel ->
-    ClockEvent ->
-    [AppEventResponse ClockModel ClockEvent]
+handleEvent :: EventHandler ClockModel ClockEvent es ep
 handleEvent _wenv _node model (ClockUpdate td) =
     let tdText = fromString (formatTime defaultTimeLocale "%m:%02S" td)
      in [Model (model{_cmClock = tdText}), Request RenderOnce]

diff --git a/src/RsiBreak/Widget/Settings.hs b/src/RsiBreak/Widget/Settings.hs
@@ -21,23 +21,14 @@ $(makeLenses 'TimerSetting)
 data TimerSettingEvent = TSENewWorkTime Minutes | TSENewRestTime Minutes
     deriving (Eq, Show)
 
-handleEvent ::
-    ep ->
-    WidgetEnv TimerSetting TimerSettingEvent ->
-    WidgetNode TimerSetting TimerSettingEvent ->
-    TimerSetting ->
-    TimerSettingEvent ->
-    [EventResponse TimerSetting TimerSettingEvent sp ep]
+handleEvent :: ep -> EventHandler TimerSetting TimerSettingEvent sp ep
 handleEvent onChangeEvent _wenv _node model evt =
     let changeModel = case evt of
             TSENewWorkTime newm -> Model (set workInterval newm model)
             TSENewRestTime newm -> Model (set restInterval newm model)
      in [changeModel, Report onChangeEvent]
 
-buildUI ::
-    WidgetEnv TimerSetting TimerSettingEvent ->
-    TimerSetting ->
-    WidgetNode TimerSetting TimerSettingEvent
+buildUI :: UIBuilder TimerSetting TimerSettingEvent
 buildUI _wenv _model =
     vstack
         [ hstack

diff --git a/src/RsiBreak/Widget/Timer.hs b/src/RsiBreak/Widget/Timer.hs
@@ -45,13 +45,7 @@ isWorkTime :: TimerState -> Bool
 isWorkTime (TimerWorkWait _) = True
 isWorkTime _ = False
 
-handleEvent ::
-    (NominalDiffTime -> ep) ->
-    WidgetEnv TimerModel TimerEvent ->
-    WidgetNode TimerModel TimerEvent ->
-    TimerModel ->
-    TimerEvent ->
-    [EventResponse TimerModel TimerEvent sp ep]
+handleEvent :: (NominalDiffTime -> ep) -> EventHandler TimerModel TimerEvent es ep
 handleEvent toEp _wenv _node model@(TimerModel settings timer) evt =
     case evt of
         TimerStateUpdate wstate -> [Model (model{tmState = wstate})]
@@ -65,7 +59,7 @@ handleEvent toEp _wenv _node model@(TimerModel settings timer) evt =
         TimerStartRestTime ->
             [Producer (waitRest settings)]
 
-buildUI :: WidgetEnv TimerModel TimerEvent -> TimerModel -> WidgetNode TimerModel TimerEvent
+buildUI :: UIBuilder TimerModel TimerEvent
 buildUI _wenv _model =
     vstack
         [ button "Start" TimerStartWorkTime