diff --git a/src/Kino/UI.hs b/src/Kino/UI.hs index 45fe851..77ef99d 100644 --- a/src/Kino/UI.hs +++ b/src/Kino/UI.hs @@ -62,9 +62,7 @@ runApp = defaultMain app initialState -- | The starting event which grabs the inital listing startEvent :: AppS -> EventM Ident AppS -startEvent s = do - -- todo move unwrapping our response structure into a function - pure =<< liftIO (setMovies s) +startEvent = liftIO . setMovies -- | The drawing function which defers to the proper function -- from UI.Widgets diff --git a/src/Kino/UI/Widgets.hs b/src/Kino/UI/Widgets.hs index 807b31a..0b8d864 100644 --- a/src/Kino/UI/Widgets.hs +++ b/src/Kino/UI/Widgets.hs @@ -30,14 +30,12 @@ select = withAttr (attrName "selected") -- movie to the widget second widget. Used by movieWidgets widgetCons :: AppS -> JSONMovie -> Widget Ident -> Widget Ident widgetCons s m w = - embed $ if Just m == (s ^. appDetails) + (<=> w) $ if Just m == (s ^. appDetails) then select . visible $ if s ^. appExpanded then expandedWidget m else movieWidget m else movieWidget m - where - embed = (<=> w) -- | Returns a big list of all movies movieWidgets :: AppS -> Widget Ident