warning cleanup2

Author: minimapletinytools

src/Potato/Reflex/Vty/Helpers.hs

@@ -31,7 +31,6 @@ module Potato.Reflex.Vty.Helpers (
 import           Relude
 
 import           Potato.Reflex.Vty.Widget
-import Reflex.Potato.Helpers (simultaneous)
 
 import           Control.Monad.Fix
 import           Control.Monad.NodeId
@@ -84,7 +83,7 @@ debugStream evs = do
   t <- holdDyn "" $ mergeWith (\a b -> a <> "\n" <> b) evs
   richText richTextConfig_simpleForeColorAttr (current t)
 
-debugStreamBeh :: (MonadHold t m, HasDisplayRegion t m, HasImageWriter t m, HasTheme t m) => [Behavior t Text] -> m ()
+debugStreamBeh :: (HasDisplayRegion t m, HasImageWriter t m, HasTheme t m) => [Behavior t Text] -> m ()
 debugStreamBeh behs = text $ foldr (liftA2 (\t1 t2 -> t1 <> " " <> t2)) "" behs
 
 countEv :: (Reflex t, MonadHold t m, MonadFix m) => Event t a -> m (Dynamic t Int)
@@ -135,18 +134,20 @@ dragAttachOnStart btn beh = mdo
 -}
 
 
+-- TODO DELETE UNUSED
 drag2AttachOnStart
   :: forall t m a. (Reflex t, MonadFix m, MonadHold t m, HasInput t m)
   => V.Button
   -> Behavior t a
   -> m (Event t (a, Drag2))
 drag2AttachOnStart btn beh = do
+  -- TODO pretty sure this should be btn?
   dragEv <- drag2 V.BLeft
   let
     foldfn d ma = do
       anew <- case ma of
         Nothing                                   -> sample beh
-        Just (a, _) | _drag2_state d == DragStart -> sample beh
+        Just (_, _) | _drag2_state d == DragStart -> sample beh
         Just (a, _)                               -> return a
       return $ Just (anew, d)
   dragBeh <- foldDynM foldfn Nothing dragEv

src/Potato/Reflex/Vty/Widget.hs

@@ -43,7 +43,6 @@ import           Reflex.Vty.Widget.Input.Mouse
 
 
 import Control.Monad.Fix
-import           Control.Monad.NodeId
 import           Control.Monad.Reader
 import           System.Clock
 
@@ -101,7 +100,7 @@ data DoubleClickConfig = DoubleClickConfig  {
     , _dobuleClickConfig_button      :: V.Button
   }
 
-doubleClick :: (Reflex t, MonadHold t m, MonadFix m, PerformEvent t m, MonadIO (Performable m), HasInput t m) => DoubleClickConfig -> m (Event t ())
+doubleClick :: (MonadHold t m, MonadFix m, PerformEvent t m, MonadIO (Performable m), HasInput t m) => DoubleClickConfig -> m (Event t ())
 doubleClick DoubleClickConfig {..} = do
   singleClickEv <- singleClickNoDragOffSimple _dobuleClickConfig_button
   singleClickTimeEv <- performEvent $ ffor singleClickEv $ \_ -> do
@@ -113,7 +112,7 @@ doubleClick DoubleClickConfig {..} = do
       then Just () 
       else Nothing
 
-doubleClickSimple :: (Reflex t, MonadHold t m, MonadFix m, PerformEvent t m, MonadIO (Performable m), HasInput t m) => m (Event t ())
+doubleClickSimple :: (MonadHold t m, MonadFix m, PerformEvent t m, MonadIO (Performable m), HasInput t m) => m (Event t ())
 doubleClickSimple = doubleClick DoubleClickConfig {
     --_doubleClickConfig_spaceTolerance = (0,0)
     _doubleClickConfig_timeTolerance = 300
@@ -127,7 +126,7 @@ integralFractionalDivide n d = fromIntegral n / fromIntegral d
 -- | A split of the available space into two parts with a draggable separator.
 -- Starts with half the space allocated to each, and the first pane has focus.
 -- Clicking in a pane switches focus.
-splitHDrag :: (Reflex t, MonadFix m, MonadHold t m, HasDisplayRegion t m, HasInput t m, HasImageWriter t m, HasFocusReader t m)
+splitHDrag :: (MonadFix m, MonadHold t m, HasDisplayRegion t m, HasInput t m, HasImageWriter t m, HasFocusReader t m)
   => Int -- ^ initial width of left panel
   -> m ()
   -> m a

src/Potato/Reflex/Vty/Widget/Popup.hs

@@ -9,7 +9,6 @@ module Potato.Reflex.Vty.Widget.Popup (
 import           Relude
 
 import           Potato.Reflex.Vty.Helpers
-import           Potato.Reflex.Vty.Widget
 
 import qualified Graphics.Vty.Input.Events as V
 import           Reflex

src/Potato/Reflex/Vty/Widget/ScrollBar.hs

@@ -13,14 +13,8 @@ import           Potato.Reflex.Vty.Widget
 
 import qualified Graphics.Vty as V
 import           Reflex
-import           Reflex.Network
-import           Reflex.Potato.Helpers
 import           Reflex.Vty
 
-
-import           Data.Default
-import qualified Data.Sequence as Seq
-import Data.Fixed (div')
 import Data.These
 import Data.Align (align)
 
@@ -54,18 +48,15 @@ onlyIfSimultaneous eva evb = fforMaybe (align eva evb) $ \case
 -- TODO write UTs
 -- TODO reduce constraints
 -- dynamically scaling vertical scroll bar
-vScrollBar :: forall t m a. (MonadWidget t m)
+vScrollBar :: forall t m. (MonadWidget t m)
   => Int -- ^ width
   -> Dynamic t Int -- ^ content height
   -> m (Dynamic t Int) -- ^ offset
 vScrollBar scrollBarWidth contentSizeDyn = mdo
   maxSizeDyn <- displayHeight
   let
     screen_over_content_dyn :: Dynamic t Float = liftA2 (\a b -> fromIntegral a / fromIntegral b ) maxSizeDyn contentSizeDyn
-    maxSizeDiffDyn = liftA2 (-) maxSizeDyn boxHeightDyn
-
     maxContentSizeDiffDyn = fromIntegral . max 0 <$> liftA2 (-) contentSizeDyn maxSizeDyn
-
     boxHeightDyn = fmap ceiling $ liftA2 (*) screen_over_content_dyn (fromIntegral <$> maxSizeDyn)
     boxRegionDyn = Region <$> 0 <*> offsetScreenUnitDyn <*> constDyn scrollBarWidth <*> boxHeightDyn
 

src/Reflex/Vty/Test/Monad/Host.hs

@@ -23,10 +23,8 @@ module Reflex.Vty.Test.Monad.Host (
 import           Relude                   hiding (getFirst)
 
 import           Control.Monad.Ref
-import qualified Data.Map                 as Map
 
 import qualified Graphics.Vty             as V
-import           Potato.Reflex.Vty.Widget
 import           Reflex
 import           Reflex.Host.Class
 import           Reflex.Test.Monad.Host   (MonadReflexTest (..), ReflexTestT,
@@ -36,13 +34,6 @@ import           Reflex.Test.Monad.Host   (MonadReflexTest (..), ReflexTestT,
 import           Reflex.Vty
 
 
--- for debug layout/widget stuff
-import           Control.Monad.Fix
-import           Data.Bimap               (Bimap)
-import qualified Data.Bimap               as Bimap
-import           Data.Semigroup
-
-
 
 -- | reflex-vty variant of 'ReflexTestT' which packages an 'VtyEvent' into the input and 'Behavior t [V.Image]' into the output
 -- 'uintref' and 'uout' allow user to add their own inputs and outputs
@@ -96,10 +87,10 @@ queueMouseEventInRegion :: (Reflex t, MonadSample t m, MonadRef m)
 queueMouseEventInRegion dr mouse = do
   let
     absCoords (Region l t _ _) (x,y) = (x+l, y+t)
-  region <- sample . current $ dr
+  reg <- sample . current $ dr
   case mouse of
-    Left (MouseDown b c mods) -> queueVtyEvent $ uncurry V.EvMouseDown (absCoords region c) b mods
-    Right (MouseUp b c) -> queueVtyEvent $ uncurry V.EvMouseUp (absCoords region c) b
+    Left (MouseDown b c mods) -> queueVtyEvent $ uncurry V.EvMouseDown (absCoords reg c) b mods
+    Right (MouseUp b c) -> queueVtyEvent $ uncurry V.EvMouseUp (absCoords reg c) b
 
 -- | queue mouse event in a 'DynRegion'
 -- if (local) mouse coordinates are outside of the (absolute) region, returns False and does not queue any event
@@ -108,18 +99,18 @@ queueMouseEventInRegionGated :: (Reflex t, MonadSample t m, MonadRef m)
   -> Either MouseDown MouseUp -- ^ mouse coordinates are LOCAL to the input region
   -> ReflexVtyTestT t uintref uout m Bool
 queueMouseEventInRegionGated dr mouse = do
-  region <- sample . current $ dr
+  reg <- sample . current $ dr
   let
     absCoords (Region l t _ _) (x,y) = (x+l, y+t)
     coordinates = case mouse of
       Left (MouseDown _ c _) -> c
       Right (MouseUp _ c)    -> c
     withinRegion (Region _ _ w h) (x,y) = not $ or [ x < 0, y < 0, x >= w, y >= h ]
-  if withinRegion region coordinates
+  if withinRegion reg coordinates
     then do
       case mouse of
-        Left (MouseDown b c mods) -> queueVtyEvent $ uncurry V.EvMouseDown (absCoords region c) b mods
-        Right (MouseUp b c) -> queueVtyEvent $ uncurry V.EvMouseUp (absCoords region c) b
+        Left (MouseDown b c mods) -> queueVtyEvent $ uncurry V.EvMouseDown (absCoords reg c) b mods
+        Right (MouseUp b c) -> queueVtyEvent $ uncurry V.EvMouseUp (absCoords reg c) b
       return True
     else return False