Merge pull request #3 from elm-community/0.19

w0rm · web-flow · commit 5cc3501dbd76 · 2018-08-24T10:46:24.000+02:00
Upgrade to 0.19
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,3 @@
+elm-stuff
+elm-package.json
+.DS_Store
diff --git a/Ease.elm b/Ease.elm
@@ -1,4 +1,19 @@
-module Ease exposing (Easing, reverse, retour, inOut, flip, bezier, linear, inQuad, outQuad, inOutQuad, inCubic, outCubic, inOutCubic, inQuart, outQuart, inOutQuart, inQuint, outQuint, inOutQuint, inSine, outSine, inOutSine, inExpo, outExpo, inOutExpo, inCirc, outCirc, inOutCirc, inBack, outBack, inOutBack, inBounce, outBounce, inOutBounce, inElastic, outElastic, inOutElastic)
+module Ease exposing
+    ( Easing
+    , bezier
+    , linear
+    , inQuad, outQuad, inOutQuad
+    , inCubic, outCubic, inOutCubic
+    , inQuart, outQuart, inOutQuart
+    , inQuint, outQuint, inOutQuint
+    , inSine, outSine, inOutSine
+    , inExpo, outExpo, inOutExpo
+    , inCirc, outCirc, inOutCirc
+    , inBack, outBack, inOutBack
+    , inBounce, outBounce, inOutBounce
+    , inElastic, outElastic, inOutElastic
+    , reverse, flip, inOut, retour
+    )
 
 {-| An easing function is used in animation to make a transition between two values appear more lifelike or interesting.
 Easing functions can make sliding panels or bouncing menus appear to be physical objects.
@@ -7,34 +22,39 @@ All easing functions expect inputs to be bewteen zero and one, and will typicall
 happens at the start of the transition, easing "out" at the end, and "inOut" on both sides. The functions provided here
 are meant to match the graphical examples on [easings.net](http://easings.net/).
 
-```elm
-import Ease
-n = 10
+    import Ease
+    n = 10
 
-List.map (\i -> Ease.inQuad (i/n)) [0..n]
-> [0, 0.01, 0.04, 0.09, 0.16, 0.25, 0.36, 0.49, 0.64, 0.81, 1]
+    List.map (\i -> Ease.inQuad (toFloat i / n)) (List.range 0 n)
+
+    --> [0, 0.01, 0.04, 0.09, 0.16, 0.25, 0.36, 0.49, 0.64, 0.81, 1]
+
+    List.map (\i -> Ease.outCubic (toFloat i / n)) (List.range 0 n)
+
+    --> [0, 0.271, 0.488, 0.657, 0.784, 0.875, 0.936, 0.973, 0.992, 0.999, 1]
 
-List.map (\i -> Ease.outCubic (i/n)) [0..n]
-> [0, 0.271, 0.488, 0.657, 0.784, 0.875, 0.936, 0.973, 0.992, 0.999, 1]
-```
 
 # Easing functions
-@docs Easing,
-      bezier,
-      linear,
-      inQuad, outQuad, inOutQuad,
-      inCubic, outCubic, inOutCubic,
-      inQuart, outQuart, inOutQuart,
-      inQuint, outQuint, inOutQuint,
-      inSine, outSine, inOutSine,
-      inExpo, outExpo, inOutExpo,
-      inCirc, outCirc, inOutCirc,
-      inBack, outBack, inOutBack,
-      inBounce, outBounce, inOutBounce,
-      inElastic, outElastic, inOutElastic
+
+@docs Easing
+@docs bezier
+@docs linear
+@docs inQuad, outQuad, inOutQuad
+@docs inCubic, outCubic, inOutCubic
+@docs inQuart, outQuart, inOutQuart
+@docs inQuint, outQuint, inOutQuint
+@docs inSine, outSine, inOutSine
+@docs inExpo, outExpo, inOutExpo
+@docs inCirc, outCirc, inOutCirc
+@docs inBack, outBack, inOutBack
+@docs inBounce, outBounce, inOutBounce
+@docs inElastic, outElastic, inOutElastic
+
 
 # Combining easing functions
-@docs reverse, flip , inOut, retour
+
+@docs reverse, flip, inOut, retour
+
 -}
 
 
@@ -54,6 +74,7 @@ linear =
 {-| A cubic bezier function using 4 parameters: x and y position of first control point, and x and y position of second control point.
 
 See [here](http://greweb.me/glsl-transition/example/ "glsl-transitions") for examples or [here](http://cubic-bezier.com/ "tester") to test.
+
 -}
 bezier : Float -> Float -> Float -> Float -> Easing
 bezier x1 y1 x2 y2 time =
@@ -73,7 +94,7 @@ bezier x1 y1 x2 y2 time =
                     List.map2 (\x y -> pair lerp x y time) xs (Maybe.withDefault [] (List.tail xs))
                         |> casteljau
     in
-        casteljau [ ( 0, 0 ), ( x1, y1 ), ( x2, y2 ), ( 1, 1 ) ]
+    casteljau [ ( 0, 0 ), ( x1, y1 ), ( x2, y2 ), ( 1, 1 ) ]
 
 
 {-| -}
@@ -172,6 +193,7 @@ inExpo time =
     if time == 0.0 then
         0.0
         -- exact zero instead of 2^-10
+
     else
         2 ^ (10 * (time - 1))
 
@@ -246,14 +268,17 @@ outBounce time =
         t4 =
             time - (2.625 / 2.75)
     in
-        if time < 1 / 2.75 then
-            a * time * time
-        else if time < 2 / 2.75 then
-            a * t2 * t2 + 0.75
-        else if time < 2.5 / 2.75 then
-            a * t3 * t3 + 0.9375
-        else
-            a * t4 * t4 + 0.984375
+    if time < 1 / 2.75 then
+        a * time * time
+
+    else if time < 2 / 2.75 then
+        a * t2 * t2 + 0.75
+
+    else if time < 2.5 / 2.75 then
+        a * t3 * t3 + 0.9375
+
+    else
+        a * t4 * t4 + 0.984375
 
 
 {-| -}
@@ -267,6 +292,7 @@ inElastic : Easing
 inElastic time =
     if time == 0.0 then
         0.0
+
     else
         let
             s =
@@ -278,7 +304,7 @@ inElastic time =
             t =
                 time - 1
         in
-            -((2 ^ (10 * t)) * sin ((t - s) * (2 * pi) / p))
+        -((2 ^ (10 * t)) * sin ((t - s) * (2 * pi) / p))
 
 
 {-| -}
@@ -299,13 +325,15 @@ inOut : Easing -> Easing -> Easing
 inOut e1 e2 time =
     if time < 0.5 then
         e1 (time * 2) / 2
+
     else
         0.5 + e2 ((time - 0.5) * 2) / 2
 
 
 {-| Flip an easing function. A transition that starts fast and continues slow now starts slow and continues fast.
 
 Graphically, this flips the function around x = 0.5 and then around y = 0.5.
+
 -}
 flip : Easing -> Easing
 flip easing time =
@@ -316,6 +344,7 @@ flip easing time =
 retraces exactly the same path, backwards.
 
 Graphically, this flips the function around x = 0.5.
+
 -}
 reverse : Easing -> Easing
 reverse easing time =
@@ -329,6 +358,7 @@ retour : Easing -> Easing
 retour easing time =
     if time < 0.5 then
         easing (time * 2)
+
     else
         (time - 0.5)
             * 2
diff --git a/elm-package.json b/elm-package.json
diff --git a/elm.json b/elm.json
@@ -0,0 +1,15 @@
+{
+    "type": "package",
+    "name": "elm-community/easing-functions",
+    "summary": "Easing functions for animations.",
+    "license": "BSD-3-Clause",
+    "version": "1.0.2",
+    "exposed-modules": [
+        "Ease"
+    ],
+    "elm-version": "0.19.0 <= v < 0.20.0",
+    "dependencies": {
+        "elm/core": "1.0.0 <= v < 2.0.0"
+    },
+    "test-dependencies": {}
+}
diff --git a/test/Test.elm b/test/Test.elm
@@ -1,10 +1,8 @@
-module Test exposing (..)
+module Test exposing (main)
 
 import Ease exposing (..)
-import Collage exposing (..)
-import Element exposing (toHtml)
-import Text
-import Color exposing (gray, black)
+import Svg exposing (Svg)
+import Svg.Attributes as SvgAttributes
 
 
 width =
@@ -15,37 +13,98 @@ height =
     64
 
 
-plot : Int -> ( Easing, String ) -> Form
+plot : Int -> ( Easing, String ) -> Svg a
 plot i ( f, name ) =
-    group
-        [ rect width 1 |> filled gray
-        , rect width 1 |> filled gray |> moveY height
-        , List.map
-            (toFloat >> (\x -> ( x - width / 2, f (x / width) * height )))
-            (List.range 0 (round width))
-            |> path
-            |> traced (solid black)
-          --|> (\ls -> {ls | width = 3}),
-        , Text.fromString name |> text |> moveY (height + 8)
+    Svg.g
+        [ SvgAttributes.transform
+            ("translate("
+                ++ String.fromInt ((width + 10) * modBy 6 i)
+                ++ ","
+                ++ String.fromInt ((height + 50) * (i // 6))
+                ++ ")"
+            )
         ]
-        |> move ( (width + 10) * (i % 6) |> toFloat, (-height - 20) * (i // 6) |> toFloat )
+        [ Svg.rect
+            [ SvgAttributes.width (String.fromInt width)
+            , SvgAttributes.height (String.fromInt 1)
+            , SvgAttributes.fill "gray"
+            ]
+            []
+        , Svg.rect
+            [ SvgAttributes.width (String.fromInt width)
+            , SvgAttributes.height (String.fromInt 1)
+            , SvgAttributes.y (String.fromInt height)
+            , SvgAttributes.fill "gray"
+            ]
+            []
+        , Svg.path
+            [ List.map
+                (toFloat
+                    >> (\x ->
+                            ( x
+                            , height - f (x / width) * height
+                            )
+                       )
+                )
+                (List.range 0 (round width))
+                |> path
+                |> SvgAttributes.d
+            , SvgAttributes.stroke "black"
+            , SvgAttributes.strokeWidth "2"
+            , SvgAttributes.fill "transparent"
+            ]
+            []
+        , Svg.text_
+            [ SvgAttributes.y (String.fromInt -15)
+            , SvgAttributes.x (String.fromInt 30)
+            , SvgAttributes.style "font: 14px sans-serif;"
+            ]
+            [ Svg.text name ]
+        ]
+
+
+path : List ( Float, Float ) -> String
+path list =
+    case list of
+        ( x, y ) :: tail ->
+            "M"
+                ++ String.fromFloat x
+                ++ ","
+                ++ String.fromFloat y
+                ++ String.join ""
+                    (List.map
+                        (\( a, b ) ->
+                            "L"
+                                ++ String.fromFloat a
+                                ++ ","
+                                ++ String.fromFloat b
+                        )
+                        tail
+                    )
 
+        _ ->
+            ""
 
+
+title : Svg a
 title =
-    Text.fromString "This is a replication of easings.net for testing purposes. You can see the plots are nearly identical."
-        |> text
-        |> move ( 200, height + 30 )
+    Svg.text_
+        [ SvgAttributes.y "-60"
+        , SvgAttributes.x "80"
+        , SvgAttributes.style "font: 14px sans-serif;"
+        ]
+        [ Svg.text "This is a replication of easings.net for testing purposes. You can see the plots are nearly identical." ]
 
 
+main : Svg a
 main =
-    let
-        forms =
-            title :: List.indexedMap plot easingFunctions
-
-        grouped =
-            group forms |> move ( -200, 300 )
-    in
-        collage 1000 1000 [ grouped ] |> toHtml
+    Svg.svg
+        [ SvgAttributes.width "850"
+        , SvgAttributes.height "650"
+        , SvgAttributes.viewBox "-10 -60 840 590"
+        , SvgAttributes.style "display:block;margin:auto;"
+        ]
+        (title :: List.indexedMap plot easingFunctions)
 
 
 easingFunctions =
diff --git a/test/elm-package.json b/test/elm-package.json
diff --git a/test/elm.json b/test/elm.json
@@ -0,0 +1,23 @@
+{
+    "type": "application",
+    "source-directories": [
+        ".",
+        ".."
+    ],
+    "elm-version": "0.19.0",
+    "dependencies": {
+        "direct": {
+            "elm/core": "1.0.0",
+            "elm/svg": "1.0.0"
+        },
+        "indirect": {
+            "elm/json": "1.0.0",
+            "elm/html": "1.0.0",
+            "elm/virtual-dom": "1.0.0"
+        }
+    },
+    "test-dependencies": {
+        "direct": {},
+        "indirect": {}
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+elm-stuff`
	`2`	`+elm-package.json`
	`3`	`+.DS_Store`