hascard 0.5.0.3 → 0.5.0.3.1

raw patch · 6 files changed

+32/−31 lines, 6 filesdep ~brickdep ~mwc-randomdep ~optparse-applicativePVP: major bump suggested

API removals or changes: PVP suggests a major version bump

Dependency ranges changed: brick, mwc-random, optparse-applicative, random-fu, tasty, vty, word-wrap

API changes (from Hackage documentation)

Files

• ChangeLog.md +3/−0
• README.md +1/−1
• hascard.cabal +24/−26
• src/Parser.hs +1/−1
• src/UI/BrickHelpers.hs +2/−2
• src/UI/Cards.hs +1/−1

@@ -1,4 +1,7 @@ # Changelog for hascard+## 0.5.0.3.1+Update versions and information+ ## 0.5.0.3 New: - Improved `hascard import` functionality: delimiters can be specified via CLI options (fixes issue #17).

@@ -1,5 +1,5 @@ # hascard-[![Build Status]()](https://github.com/Yvee1/hascard/actions/workflows/build.yml/badge.svg) [![GitHub tag](https://img.shields.io/github/tag/Yvee1/hascard.svg)](https://github.com/Yvee1/hascard/releases) [![AUR](https://img.shields.io/aur/version/hascard)](https://aur.archlinux.org/packages/hascard/) [![Hackage](https://img.shields.io/hackage/v/hascard.svg)](https://hackage.haskell.org/package/hascard)+[![Build Status](https://github.com/Yvee1/hascard/actions/workflows/build.yml/badge.svg)](https://github.com/Yvee1/hascard/actions) [![GitHub tag](https://img.shields.io/github/tag/Yvee1/hascard.svg)](https://github.com/Yvee1/hascard/releases) [![AUR](https://img.shields.io/aur/version/hascard)](https://aur.archlinux.org/packages/hascard/) [![Hackage](https://img.shields.io/hackage/v/hascard.svg)](https://hackage.haskell.org/package/hascard)   

@@ -1,13 +1,11 @@ cabal-version: 1.12 --- This file has been generated from package.yaml by hpack version 0.33.0.+-- This file has been generated from package.yaml by hpack version 0.34.4. -- -- see: https://github.com/sol/hpack------ hash: 6236002c595a937b392daea7195014259e4161b14760978c156dbcf4a7dcc106  name:           hascard-version:        0.5.0.3+version:        0.5.0.3.1 synopsis:       A TUI for reviewing notes using 'flashcards' written with markdown-like syntax. description:    Hascard is a text-based user interface for reviewing notes using flashcards. Cards are written in markdown-like syntax. Please see the README file on GitHub at <https://github.com/Yvee1/hascard#readme> for more information. category:       Application@@ -15,7 +13,7 @@ bug-reports:    https://github.com/Yvee1/hascard/issues author:         Steven van den Broek maintainer:     stevenvdb@live.nl-copyright:      2020 Steven van den Broek+copyright:      2022 Steven van den Broek license:        BSD3 license-file:   LICENSE build-type:     Simple@@ -58,27 +56,27 @@       src   build-depends:       base >=4.7 && <5-    , brick >=0.52.1 && <0.60+    , brick >=0.52.1 && <0.70.0     , containers >0.6.0 && <0.7     , directory >=1.3.3 && <1.4     , filepath >=1.4.2 && <1.5     , megaparsec >=8.0.0 && <10     , microlens >=0.4.11 && <0.5     , microlens-platform >=0.4.1 && <0.5-    , mwc-random >=0.14 && <0.15-    , optparse-applicative >=0.15.1 && <0.16+    , mwc-random >=0.14 && <0.16+    , optparse-applicative >=0.15.1 && <0.18     , ordered-containers >=0.2.2 && <0.3     , process >=1.6.5 && <1.7-    , random-fu >=0.2.7 && <0.3+    , random-fu >=0.2.7 && <0.4     , split >=0.2.3 && <0.3     , strict >=0.3.2 && <0.5-    , tasty >=1.2.1 && <1.3+    , tasty >=1.2.1 && <1.5     , tasty-hunit >=0.10.0 && <0.11     , tasty-quickcheck >=0.10.1 && <0.11     , text >=1.2.3 && <1.3     , vector >=0.12.0 && <0.13-    , vty >=5.28.2 && <5.33-    , word-wrap >=0.4.1 && <0.5+    , vty >=5.28.2 && <5.36+    , word-wrap >=0.4.1 && <0.6   default-language: Haskell2010  executable hascard@@ -90,7 +88,7 @@   ghc-options: -threaded -rtsopts -with-rtsopts=-N   build-depends:       base >=4.7 && <5-    , brick >=0.52.1 && <0.60+    , brick >=0.52.1 && <0.70.0     , containers >0.6.0 && <0.7     , directory >=1.3.3 && <1.4     , filepath >=1.4.2 && <1.5@@ -98,20 +96,20 @@     , megaparsec >=8.0.0 && <10     , microlens >=0.4.11 && <0.5     , microlens-platform >=0.4.1 && <0.5-    , mwc-random >=0.14 && <0.15-    , optparse-applicative >=0.15.1 && <0.16+    , mwc-random >=0.14 && <0.16+    , optparse-applicative >=0.15.1 && <0.18     , ordered-containers >=0.2.2 && <0.3     , process >=1.6.5 && <1.7-    , random-fu >=0.2.7 && <0.3+    , random-fu >=0.2.7 && <0.4     , split >=0.2.3 && <0.3     , strict >=0.3.2 && <0.5-    , tasty >=1.2.1 && <1.3+    , tasty >=1.2.1 && <1.5     , tasty-hunit >=0.10.0 && <0.11     , tasty-quickcheck >=0.10.1 && <0.11     , text >=1.2.3 && <1.3     , vector >=0.12.0 && <0.13-    , vty >=5.28.2 && <5.33-    , word-wrap >=0.4.1 && <0.5+    , vty >=5.28.2 && <5.36+    , word-wrap >=0.4.1 && <0.6   default-language: Haskell2010  test-suite hascard-test@@ -124,7 +122,7 @@   ghc-options: -threaded -rtsopts -with-rtsopts=-N   build-depends:       base >=4.7 && <5-    , brick >=0.52.1 && <0.60+    , brick >=0.52.1 && <0.70.0     , containers >0.6.0 && <0.7     , directory >=1.3.3 && <1.4     , filepath >=1.4.2 && <1.5@@ -132,18 +130,18 @@     , megaparsec >=8.0.0 && <10     , microlens >=0.4.11 && <0.5     , microlens-platform >=0.4.1 && <0.5-    , mwc-random >=0.14 && <0.15-    , optparse-applicative >=0.15.1 && <0.16+    , mwc-random >=0.14 && <0.16+    , optparse-applicative >=0.15.1 && <0.18     , ordered-containers >=0.2.2 && <0.3     , process >=1.6.5 && <1.7-    , random-fu >=0.2.7 && <0.3+    , random-fu >=0.2.7 && <0.4     , split >=0.2.3 && <0.3     , strict >=0.3.2 && <0.5-    , tasty >=1.2.1 && <1.3+    , tasty >=1.2.1 && <1.5     , tasty-hunit >=0.10.0 && <0.11     , tasty-quickcheck >=0.10.1 && <0.11     , text >=1.2.3 && <1.3     , vector >=0.12.0 && <0.13-    , vty >=5.28.2 && <5.33-    , word-wrap >=0.4.1 && <0.5+    , vty >=5.28.2 && <5.36+    , word-wrap >=0.4.1 && <0.6   default-language: Haskell2010

@@ -22,7 +22,7 @@ parseCards s = case parse pCards "failed when parsing cards" s of   Left parseErrorBundle -> Left $ errorBundlePretty (parseErrorBundle :: ParseErrorBundle String Void)   Right msgOrCards -> left wrap (sequence msgOrCards)-    where wrap = unlines . map unpack . wrapTextToLines (WrapSettings {preserveIndentation=False, breakLongWords=True}) 40 . pack+    where wrap = unlines . map unpack . wrapTextToLines (defaultWrapSettings {preserveIndentation=False, breakLongWords=True}) 40 . pack  pCards :: Parser [Either String Card] pCards = (pCard `sepEndBy1` seperator) <* eof

@@ -21,7 +21,7 @@ hCenteredStrWrapWithAttr attr p = Widget Greedy Fixed $ do   c <- getContext   let w = c^.availWidthL-  let result = vBox $ map (hCenter . attr . txt) $ wrapTextToLines (WrapSettings {preserveIndentation=False, breakLongWords=True}) w (pack p)+  let result = vBox $ map (hCenter . attr . txt) $ wrapTextToLines (defaultWrapSettings {preserveIndentation=False, breakLongWords=True}) w (pack p)   render result  -- Somewhat inefficient because rendering is done just to@@ -79,7 +79,7 @@                     , formFieldRenderHelper = id                     , formFieldConcat = vBox } -renderYesno :: Bool -> String -> n -> Bool -> Bool -> Widget n+renderYesno :: Ord n => Bool -> String -> n -> Bool -> Bool -> Widget n renderYesno rightAlign label n foc val =   let addAttr = if foc then withDefAttr focusedFormInputAttr else id   in clickable n $

@@ -91,7 +91,7 @@                    hCenteredStrWrap title  wrapSettings :: WrapSettings-wrapSettings = WrapSettings {preserveIndentation=False, breakLongWords=True}+wrapSettings = defaultWrapSettings {preserveIndentation=False, breakLongWords=True}  drawDescr :: String -> Widget Name drawDescr = strWrapWith wrapSettings