Skip to content

Commit

Permalink
Remove redundant imports and fix typos (#275)
Browse files Browse the repository at this point in the history
* remove redundant imports

* fix dodgy imports and exports

* fix LANGUAGE

* import combinator instances to SizeReq

* fix typos

* fix resizeFactor typos

* fix converter typos

* fix typos in handleSystemEvents and defaultWindowSize descriptions

* fix typo in SetOverlay description
  • Loading branch information
Deltaspace0 authored May 17, 2023
1 parent ed81c98 commit 67f747a
Show file tree
Hide file tree
Showing 67 changed files with 97 additions and 206 deletions.
4 changes: 0 additions & 4 deletions dev-test-app/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,9 @@
module Main where

import Control.Lens
import Data.Maybe
import Data.Text (Text)
import Monomer
import TextShow

import qualified Monomer.Lens as L

newtype AppModel = AppModel {
_clickCount :: Int
} deriving (Eq, Show)
Expand Down
2 changes: 1 addition & 1 deletion monomer.cabal
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
cabal-version: 1.12

-- This file has been generated from package.yaml by hpack version 0.34.4.
-- This file has been generated from package.yaml by hpack version 0.35.1.
--
-- see: https://github.com/sol/hpack

Expand Down
2 changes: 1 addition & 1 deletion src/Monomer/Common/Lens.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Lenses for the Common types.

module Monomer.Common.Lens where

import Control.Lens.TH (abbreviatedFields, makeLensesWith, makePrisms)
import Control.Lens.TH (abbreviatedFields, makeLensesWith)

import Monomer.Common.BasicTypes

Expand Down
5 changes: 2 additions & 3 deletions src/Monomer/Core/SizeReq.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Helper functions creating, validating and merging size requirements.
{-# LANGUAGE Strict #-}

module Monomer.Core.SizeReq (
SizeReqUpdater(..),
SizeReqUpdater,
clearExtra,
clearExtraW,
clearExtraH,
Expand Down Expand Up @@ -41,9 +41,8 @@ import Data.Default
import Data.Maybe

import Monomer.Common
import Monomer.Core.StyleTypes
import Monomer.Core.Style
import Monomer.Core.StyleUtil
import Monomer.Core.Util
import Monomer.Helper

import qualified Monomer.Core.Lens as L
Expand Down
1 change: 0 additions & 1 deletion src/Monomer/Core/StyleTypes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import GHC.Generics

import Monomer.Common
import Monomer.Graphics.Types
import Monomer.Graphics.Util

{-|
Represents a size requirement for a specific axis. Mainly used by stack and box,
Expand Down
1 change: 0 additions & 1 deletion src/Monomer/Core/ThemeTypes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ import qualified Data.Map.Strict as M
import Monomer.Core.StyleTypes
import Monomer.Graphics.ColorTable
import Monomer.Graphics.Types
import Monomer.Graphics.Util

-- | Theme configuration for each state, plus clear/base color.
data Theme = Theme {
Expand Down
2 changes: 1 addition & 1 deletion src/Monomer/Core/Themes/BaseTheme.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ module Monomer.Core.Themes.BaseTheme (
baseTheme
) where

import Control.Lens ((&), (^.), (.~), (?~), non)
import Control.Lens ((&), (.~), (?~), non)
import Data.Default

import Monomer.Core.Combinators
Expand Down
4 changes: 2 additions & 2 deletions src/Monomer/Core/Themes/SampleThemes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module Monomer.Core.Themes.SampleThemes (
darkThemeColors
) where

import Control.Lens ((&), (^.), (.~), (?~), non)
import Control.Lens ((&), (.~))

import Monomer.Core.ThemeTypes
import Monomer.Core.Themes.BaseTheme
Expand Down Expand Up @@ -284,4 +284,4 @@ gray07 = rgbHex "#9AA5B1"
gray08 = rgbHex "#CBD2D9"
gray09 = rgbHex "#E4E7EB"
gray10 = rgbHex "#F5F7FA"
-}
-}
5 changes: 1 addition & 4 deletions src/Monomer/Core/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,15 @@ Helper functions for Core types.

module Monomer.Core.Util where

import Control.Lens ((&), (^.), (^?), (.~), (?~), _Just)
import Control.Lens ((^.), (^?), _Just)
import Data.Maybe
import Data.Text (Text)
import Data.Typeable (cast)
import Data.Sequence (Seq(..))

import qualified Data.Map.Strict as Map
import qualified Data.Sequence as Seq
import qualified Data.Text as T

import Monomer.Common
import Monomer.Core.Style
import Monomer.Core.WidgetTypes
import Monomer.Helper

Expand Down
5 changes: 2 additions & 3 deletions src/Monomer/Core/WidgetTypes.hs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Basic types and definitions for Widgets.
{-# LANGUAGE DeriveGeneric #-}
{-# LANGUAGE DerivingStrategies #-}
{-# LANGUAGE ExistentialQuantification #-}
{-# Language GeneralizedNewtypeDeriving #-}
{-# LANGUAGE GeneralizedNewtypeDeriving #-}
{-# LANGUAGE RankNTypes #-}
{-# LANGUAGE Strict #-}

Expand Down Expand Up @@ -182,8 +182,7 @@ data WidgetRequest s e
| StopTextInput
-- | Sets a widget as the base target of future events. This is used by the
-- dropdown component to handle list events; this list, acting as an
-- overlay, is displayed on top of all other widgets. Tooltip uses it too.
-- every other widget).
-- overlay, is displayed on top of all other widgets. Popup uses it too.
| SetOverlay WidgetId Path
-- | Removes the existing overlay.
| ResetOverlay WidgetId
Expand Down
4 changes: 1 addition & 3 deletions src/Monomer/Event/Core.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@ module Monomer.Event.Core (
) where

import Control.Applicative ((<|>))
import Data.Maybe (catMaybes, fromMaybe)
import Data.Maybe (catMaybes)
import Data.Text (Text)

import qualified Data.Map.Strict as M
import qualified SDL

import Monomer.Common
import Monomer.Event.Keyboard
import Monomer.Event.Types

{-|
Expand Down
1 change: 0 additions & 1 deletion src/Monomer/Event/Lens.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ module Monomer.Event.Lens where

import Control.Lens.TH (abbreviatedFields, makeLensesWith)

import Monomer.Common.Lens
import Monomer.Event.Types

makeLensesWith abbreviatedFields ''InputStatus
Expand Down
6 changes: 0 additions & 6 deletions src/Monomer/Event/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,6 @@ module Monomer.Event.Util (
checkKeyboard
) where

import Data.Maybe (fromMaybe)

import qualified Data.Map as M

import Monomer.Event.Core
import Monomer.Event.Keyboard
import Monomer.Event.Types

-- | Checks if Windows/Cmd key is pressed.
Expand Down
1 change: 0 additions & 1 deletion src/Monomer/Graphics/FontManager.hs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import Control.Monad (foldM, when)
import Control.Lens ((^.))

import Data.Default
import Data.Sequence (Seq)
import Data.Text (Text)
import System.IO.Unsafe

Expand Down
13 changes: 4 additions & 9 deletions src/Monomer/Graphics/NanoVGRenderer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,22 @@ Renderer based on the nanovg library.

module Monomer.Graphics.NanoVGRenderer (makeRenderer) where

import Control.Lens ((&), (^.), (.~))
import Control.Monad (foldM, forM_, unless, when)
import Control.Lens ((^.))
import Control.Monad (foldM, forM_, when)
import Data.Default
import Data.Functor ((<&>))
import Data.IORef
import Data.List (foldl')
import Data.Maybe
import Data.Sequence (Seq(..), (<|), (|>))
import Data.Set (Set(..))
import Data.Sequence (Seq(..), (|>))
import Data.Set (Set)
import Data.Text (Text)
import Data.Text.Foreign (withCStringLen)
import Foreign.C.Types (CFloat)
import Foreign.Ptr
import System.IO.Unsafe

import qualified Data.ByteString as BS
import qualified Data.Map as M
import qualified Data.Sequence as Seq
import qualified Data.Set as Set
import qualified Data.Text as T
import qualified Data.Vector as V
import qualified NanoVG as VG
import qualified NanoVG.Internal.Image as VGI

Expand Down
2 changes: 1 addition & 1 deletion src/Monomer/Graphics/Text.hs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import Control.Lens ((&), (^.), (^?), (+~), ix, non)
import Data.Default
import Data.List (foldl')
import Data.Maybe
import Data.Sequence (Seq(..), (<|), (|>))
import Data.Sequence (Seq(..), (<|))
import Data.Text (Text)

import qualified Data.Sequence as Seq
Expand Down
8 changes: 3 additions & 5 deletions src/Monomer/Main/Core.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,23 @@ Core glue for running an application.
{-# LANGUAGE Strict #-}

module Monomer.Main.Core (
AppEventResponse(..),
AppEventHandler(..),
AppUIBuilder(..),
AppEventResponse,
AppEventHandler,
AppUIBuilder,
startApp
) where

import Control.Concurrent
import Control.Concurrent.STM.TChan (TChan, newTChanIO, readTChan, writeTChan)
import Control.Exception
import Control.Lens ((&), (^.), (.=), (.~), _2, use)
import Control.Monad (unless, void, when)
import Control.Monad.Extra
import Control.Monad.State
import Control.Monad.STM (atomically)
import Data.Default
import Data.Either (isLeft)
import Data.Maybe (fromMaybe, fromJust, isJust)
import Data.Map (Map)
import Data.List (foldl')
import Data.Text (Text)
import Data.Time
import Data.Time.Clock.POSIX (utcTimeToPOSIXSeconds)
Expand Down
10 changes: 5 additions & 5 deletions src/Monomer/Main/Handlers.hs
Original file line number Diff line number Diff line change
Expand Up @@ -27,18 +27,18 @@ module Monomer.Main.Handlers (

import Control.Concurrent.Async (async)
import Control.Lens
((&), (^.), (^?), (.~), (?~), (%~), (.=), (?=), (%=), (%%~), _Just, _1, _2, ix, at, use)
((&), (^.), (.~), (?~), (%~), (.=), (?=), (%=), (%%~), _Just, _1, at, use)
import Control.Monad.STM (atomically)
import Control.Concurrent.STM.TChan (TChan, newTChanIO, readTChan, writeTChan)
import Control.Applicative ((<|>))
import Control.Monad
import Control.Monad.IO.Class
import Data.Default
import Data.Foldable (fold, toList)
import Data.Foldable (toList)
import Data.Maybe
import Data.Sequence (Seq(..), (|>))
import Data.Text (Text)
import Data.Typeable (Typeable, typeOf)
import Data.Typeable (Typeable)
import SDL (($=))

import qualified Data.Map as Map
Expand Down Expand Up @@ -66,7 +66,7 @@ for unit testing purposes.
type HandlerStep s e = (WidgetEnv s e, WidgetNode s e, Seq (WidgetRequest s e))

{-|
Processes a list of SystemEvents dispatching each of the to the corresponding
Processes a list of SystemEvents dispatching each to the corresponding
widget based on the current root. At each step the root may change, new events
may be generated (which will be processed interleaved with the list of events)
and this is handled before returning the latest "HandlerStep".
Expand All @@ -76,7 +76,7 @@ handleSystemEvents
=> WidgetEnv s e -- ^ The initial widget environment.
-> WidgetNode s e -- ^ The initial widget root.
-> [SystemEvent] -- ^ The starting list of events.
-> m (HandlerStep s e) -- ^ The resulting "HandlerStep."
-> m (HandlerStep s e) -- ^ The resulting "HandlerStep".
handleSystemEvents wenv widgetRoot baseEvents = nextStep where
mainBtn = wenv ^. L.mainButton
reduceEvt curStep evt = do
Expand Down
4 changes: 1 addition & 3 deletions src/Monomer/Main/Platform.hs
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,10 @@ module Monomer.Main.Platform (
) where

import Control.Exception (finally)
import Control.Monad (void)
import Control.Monad.Extra (whenJust)
import Control.Monad.State
import Data.Maybe
import Data.Text (Text)
import Data.Word
import Foreign (alloca, peek)
import Foreign.C (peekCString, withCString)
import Foreign.C.Types
Expand All @@ -52,7 +50,7 @@ import Monomer.Main.Types
foreign import ccall unsafe "initGlew" glewInit :: IO CInt
foreign import ccall unsafe "initDpiAwareness" initDpiAwareness :: IO CInt

-- | Default window size if not is specified.
-- | Default window size if not specified.
defaultWindowSize :: (Int, Int)
defaultWindowSize = (800, 600)

Expand Down
1 change: 0 additions & 1 deletion src/Monomer/Main/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import Data.Typeable (Typeable)
import Data.Sequence (Seq)
import GHC.Generics

import qualified Data.Map as M
import qualified SDL
import qualified SDL.Raw.Types as SDLR

Expand Down
3 changes: 0 additions & 3 deletions src/Monomer/Main/UserUtil.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,17 +13,14 @@ change and clipboard requests.

module Monomer.Main.UserUtil where

import Control.Applicative ((<|>))
import Control.Lens
import Data.Default
import Data.Maybe
import Data.Text (Text)

import Monomer.Widgets.Composite
import Monomer.Widgets.Singles.Spacer

import qualified Monomer.Core.Lens as L
import qualified Monomer.Main.Lens as L

{-# DEPRECATED setFocusOnKey "Use SetFocusOnKey instead (wenv argument should be removed)." #-}
{-|
Expand Down
8 changes: 1 addition & 7 deletions src/Monomer/Main/Util.hs
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,9 @@ Helper functions for the Main module.

module Monomer.Main.Util where

import Control.Applicative ((<|>))
import Control.Concurrent.STM.TChan
import Control.Lens ((&), (^.), (.=), (%=), ix, at, non, use, _1)
import Control.Monad.Extra
import Control.Monad.State
import Control.Lens ((^.), (.=), at, non, use)
import Data.Default
import Data.Maybe

import qualified Data.Sequence as Seq
import qualified Data.Map as Map
Expand All @@ -29,9 +25,7 @@ import qualified SDL
import Monomer.Core
import Monomer.Event
import Monomer.Helper (headMay)
import Monomer.Main.Platform
import Monomer.Main.Types
import Monomer.Widgets.Util.Widget

import qualified Monomer.Core.Lens as L
import qualified Monomer.Main.Lens as L
Expand Down
2 changes: 1 addition & 1 deletion src/Monomer/Main/WidgetTask.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module Monomer.Main.WidgetTask (handleWidgetTasks) where
import Control.Concurrent.Async (poll)
import Control.Concurrent.STM.TChan (tryReadTChan)
import Control.Exception.Base
import Control.Lens ((&), (^.), (.=), use)
import Control.Lens ((^.), (.=), use)
import Control.Monad.Extra
import Control.Monad.IO.Class
import Control.Monad.STM (atomically)
Expand Down
3 changes: 1 addition & 2 deletions src/Monomer/Widgets/Animation/Fade.hs
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,10 @@ module Monomer.Widgets.Animation.Fade (
) where

import Control.Applicative ((<|>))
import Control.Lens ((&), (^.), (.~), (%~), at)
import Control.Lens ((&), (^.), (.~))
import Control.Monad (when)
import Data.Default
import Data.Maybe
import Data.Text (Text)
import Data.Typeable (cast)
import GHC.Generics

Expand Down
4 changes: 2 additions & 2 deletions src/Monomer/Widgets/Animation/Slide.hs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ module Monomer.Widgets.Animation.Slide (
) where

import Control.Applicative ((<|>))
import Control.Lens ((&), (^.), (.~), (%~), at)
import Control.Lens ((&), (^.), (.~))
import Control.Monad (when)
import Data.Default
import Data.Maybe
Expand Down Expand Up @@ -156,7 +156,7 @@ animSlideOut
-> WidgetNode s e -- ^ The created animation container.
animSlideOut managed = animSlideOut_ def managed

-- | Animates a widget to the the provided direction from visible to not
-- | Animates a widget to the provided direction from visible to not
-- visible (defaults to left). Accepts config.
animSlideOut_
:: WidgetEvent e
Expand Down
Loading

0 comments on commit 67f747a

Please sign in to comment.