git.iko.soy/elk
on master help sign in
Add type annotations to more library files.
5b62c53evancz
libraries/Graphics/Color.elm+53−25
compare with master
unifiedsplit
@@ -12,56 +12,84 @@ module Graphics.Color (rgba,rgb,hsva,hsv,
12data Color = Color Int Int Int Float
12data Color = Color Int Int Int Float
13
13
14-- Create RGB colors with an alpha component for transparency. The alpha component is specified with numbers between 0 and 1.
14-- Create RGB colors with an alpha component for transparency. The alpha component is specified with numbers between 0 and 1.
15+rgba : Int -> Int -> Int -> Float -> Color
15rgba = Color
16rgba = Color
16
17
17-- Create RGB colors from numbers between 0 and 255 inclusive.
18-- Create RGB colors from numbers between 0 and 255 inclusive.
19+rgb : Int -> Int -> Int -> Color
18rgb r g b = Color r g b 1
20rgb r g b = Color r g b 1
19
21
22+red : Color
20−red = Color 255 0 0 1
23+red = Color 255 0 0 1
24+lime : Color
21−lime = Color 0 255 0 1
25+lime = Color 0 255 0 1
26+blue : Color
22−blue = Color 0 0 255 1
27+blue = Color 0 0 255 1
23
28
29+yellow : Color
24yellow = Color 255 255 0 1
30yellow = Color 255 255 0 1
31+cyan : Color
25cyan = Color 0 255 255 1
32cyan = Color 0 255 255 1
33+magenta : Color
26magenta = Color 255 0 255 1
34magenta = Color 255 0 255 1
27
35
36+black : Color
28−black = Color 0 0 0 1
37+black = Color 0 0 0 1
38+white : Color
29−white = Color 255 255 255 1
39+white = Color 255 255 255 1
30−
40+
41+gray : Color
31−gray = Color 128 128 128 1
42+gray = Color 128 128 128 1
43+grey : Color
32−grey = Color 128 128 128 1
44+grey = Color 128 128 128 1
33−
45+
46+maroon : Color
34−maroon = Color 128 0 0 1
47+maroon = Color 128 0 0 1
48+navy : Color
35−navy = Color 0 0 128 1
49+navy = Color 0 0 128 1
50+green : Color
36−green = Color 0 128 0 1
51+green = Color 0 128 0 1
37−
52+
53+teal : Color
38−teal = Color 0 128 128 1
54+teal = Color 0 128 128 1
55+purple : Color
39−purple = Color 128 0 128 1
56+purple = Color 128 0 128 1
40−
57+
41−forestGreen = Color 34 139 34 1
58+violet : Color
42violet = Color 238 130 238 1
59violet = Color 238 130 238 1
60+forestGreen : Color
61+forestGreen = Color 34 139 34 1
43
62
44−-- Produce a “complementary color”. The two colors will accent each other.
63+-- Produce a “complementary color”.
64+-- The two colors will accent each other.
45complement : Color -> Color
65complement : Color -> Color
46
66
67+-- Create HSV colors with an alpha component for transparency.
47−-- Create HSV colors with an alpha component for transparency. The alpha component is specified with numbers between 0 and 1.
68+-- The alpha component is specified with numbers between 0 and 1.
48hsva : Int -> Float -> Float -> Float -> Color
69hsva : Int -> Float -> Float -> Float -> Color
49
70
50-- Create HSV colors. HSV stands for hue-saturation-value.
71-- Create HSV colors. HSV stands for hue-saturation-value.
51--
72--
52−-- Hue is a degree from 0 to 360 representing a color wheel: red at 0°, green at 120°, blue at 240°, and red again at 360°.
73+-- Hue is a degree from 0 to 360 representing a color wheel: red at 0°,
74+-- green at 120°, blue at 240°, and red again at 360°.
53−-- This makes it easy to cycle through colors and compute color complements, triads, tetrads, etc.
75+-- This makes it easy to cycle through colors and compute color complements,
76+-- triads, tetrads, etc.
54--
77--
55−-- Saturation is a number between 1 and 0 where lowering this number makes your color more grey. This can help you tone a color down.
78+-- Saturation is a number between 1 and 0 where lowering this number makes
79+-- your color more grey. This can help you tone a color down.
56--
80--
57−-- Value is also a number between 1 and 0. Lowering this number makes your color more black.
81+-- Value is also a number between 1 and 0. Lowering this number makes your
82+-- color more black.
58--
83--
59-- Look up the “HSV cylinder” for more information.
84-- Look up the “HSV cylinder” for more information.
60hsv : Int -> Float -> Float -> Color
85hsv : Int -> Float -> Float -> Color
61
86
62data Gradient
87data Gradient
63− = Linear [(Float,Color)] (Float,Float) (Float,Float)
88+ = Linear (Float,Float) (Float,Float) [(Float,Color)]
64− | Radial [(Float,Color)] (Float,Float) Float (Float,Float) Float
89+ | Radial (Float,Float) Float (Float,Float) Float [(Float,Color)]
65
90
91+linear : (Number,Number) -> (Number,Number) -> [(Float,Color)] -> Gradient
66linear = Linear
92linear = Linear
93+radial : (Number,Number) -> Number ->
94+ (Number,Number) -> Number -> [(Float,Color)] -> Gradient
67radial = Radial
95radial = Radial
libraries/Graphics/Element.elm+65−2
@@ -30,26 +30,42 @@ type Properties = {
30
30
31type Element = { props : Properties, element : ElementPrim }
31type Element = { props : Properties, element : ElementPrim }
32
32
33+widthOf : Element -> Int
33widthOf e = e.props.width
34widthOf e = e.props.width
35+
36+heightOf : Element -> Int
34heightOf e = e.props.height
37heightOf e = e.props.height
38+
39+sizeOf : Element -> Int
35sizeOf e = (e.props.width, e.props.height)
40sizeOf e = (e.props.width, e.props.height)
36
41
42+width : Int -> Element -> Element
37width nw e = let p = e.props
43width nw e = let p = e.props
38 props = case e.element of
44 props = case e.element of
39 Image _ w h _ -> {p| height <- h/w*nw }
45 Image _ w h _ -> {p| height <- h/w*nw }
40 RawHtml html -> {p| height <- htmlHeight nw html }
46 RawHtml html -> {p| height <- htmlHeight nw html }
41 _ -> p
47 _ -> p
42 in { element=e.element, props={props| width <- nw} }
48 in { element=e.element, props={props| width <- nw} }
49+
50+height : Int -> Element -> Element
43height nh e = let p = e.props
51height nh e = let p = e.props
44 props = case e.element of
52 props = case e.element of
45 Image _ w h _ -> {p| width <- w/h*nh }
53 Image _ w h _ -> {p| width <- w/h*nh }
46 _ -> p
54 _ -> p
47 in { element=e.element, props={p| height <- nh} }
55 in { element=e.element, props={p| height <- nh} }
56+
57+opacity : Float -> Element -> Element
48opacity o e = let p = e.props in { element=e.element, props={p| opacity <- o} }
58opacity o e = let p = e.props in { element=e.element, props={p| opacity <- o} }
59+
60+color : Color -> Element -> Element
49color c e = let p = e.props in
61color c e = let p = e.props in
50 { element=e.element, props={p| color <- Just c} }
62 { element=e.element, props={p| color <- Just c} }
63+
64+tag : String -> Element -> Element
51tag name e = let p = e.props in
65tag name e = let p = e.props in
52 { element=e.element, props={p| tag <- JS.fromString name} }
66 { element=e.element, props={p| tag <- JS.fromString name} }
67+
68+link : String -> Element -> Element
53link href e = let p = e.props in
69link href e = let p = e.props in
54 { element=e.element, props={p| href <- JS.fromString href} }
70 { element=e.element, props={p| href <- JS.fromString href} }
55
71
@@ -67,8 +83,13 @@ data ElementPrim
67
83
68data ImageStyle = Plain | Fitted | Cropped (Int,Int)
84data ImageStyle = Plain | Fitted | Cropped (Int,Int)
69
85
86+image : Int -> Int -> String -> Element
70image w h src = newElement w h (Image Plain w h (JS.fromString src))
87image w h src = newElement w h (Image Plain w h (JS.fromString src))
88+
89+fittedImage : Int -> Int -> String -> Element
71fittedImage w h src = newElement w h (Image Fitted w h (JS.fromString src))
90fittedImage w h src = newElement w h (Image Fitted w h (JS.fromString src))
91+
92+croppedImage : Int -> Int -> (Int,Int) -> String -> Element
72croppedImage w h pos src =
93croppedImage w h pos src =
73 newElement w h (Image (Cropped pos) w h (JS.fromString src))
94 newElement w h (Image (Cropped pos) w h (JS.fromString src))
74
95
@@ -76,11 +97,15 @@ data Three = P | Z | N
76data Pos = Absolute Int | Relative Float
97data Pos = Absolute Int | Relative Float
77type Position = { horizontal : Three, vertical : Three, x : Pos, y : Pos }
98type Position = { horizontal : Three, vertical : Three, x : Pos, y : Pos }
78
99
100+container : Int -> Int -> Position -> Element -> Element
79container w h pos e = newElement w h (Container pos e)
101container w h pos e = newElement w h (Container pos e)
102+
103+spacer : Int -> Int -> Element
80spacer w h = newElement w h Spacer
104spacer w h = newElement w h Spacer
81
105
82data Direction = DUp | DDown | DLeft | DRight | DIn | DOut
106data Direction = DUp | DDown | DLeft | DRight | DIn | DOut
83
107
108+flow : Direction -> [Element] -> Element
84flow dir es =
109flow dir es =
85 let ws = List.map widthOf es
110 let ws = List.map widthOf es
86 hs = List.map heightOf es
111 hs = List.map heightOf es
@@ -95,19 +120,25 @@ flow dir es =
95 DIn -> newFlow (List.maximum ws) (List.maximum hs)
120 DIn -> newFlow (List.maximum ws) (List.maximum hs)
96 DOut -> newFlow (List.maximum ws) (List.maximum hs)
121 DOut -> newFlow (List.maximum ws) (List.maximum hs)
97
122
123+above : Element -> Element -> Element
98above hi lo =
124above hi lo =
99 newElement (max (widthOf hi) (widthOf lo))
125 newElement (max (widthOf hi) (widthOf lo))
100 (heightOf hi + heightOf lo)
126 (heightOf hi + heightOf lo)
101 (Flow DDown [hi,lo])
127 (Flow DDown [hi,lo])
128+
129+below : Element -> Element -> Element
102below lo hi =
130below lo hi =
103 newElement (max (widthOf hi) (widthOf lo))
131 newElement (max (widthOf hi) (widthOf lo))
104 (heightOf hi + heightOf lo)
132 (heightOf hi + heightOf lo)
105 (Flow DDown [hi,lo])
133 (Flow DDown [hi,lo])
134+
135+beside : Element -> Element -> Element
106beside lft rht =
136beside lft rht =
107 newElement (widthOf lft + widthOf rht)
137 newElement (widthOf lft + widthOf rht)
108 (max (heightOf lft) (heightOf rht))
138 (max (heightOf lft) (heightOf rht))
109 (Flow right [lft,rht])
139 (Flow right [lft,rht])
110
140
141+layers : [Element] -> Element
111layers es =
142layers es =
112 let ws = List.map widthOf es
143 let ws = List.map widthOf es
113 hs = List.map heightOf es
144 hs = List.map heightOf es
@@ -116,31 +147,63 @@ layers es =
116
147
117-- Repetitive things --
148-- Repetitive things --
118
149
150+absolute : Pos
119absolute = Absolute
151absolute = Absolute
152+relative : Pos
120relative = Relative
153relative = Relative
121
154
155+middle : Position
122−middle = { horizontal = Z, vertical = Z, x = Relative 0.5, y = Relative 0.5 }
156+middle = { horizontal=Z, vertical=Z, x=Relative 0.5, y=Relative 0.5 }
157+topLeft : Position
123−topLeft = { horizontal = N, vertical = P, x = Absolute 0, y = Absolute 0 }
158+topLeft = { horizontal=N, vertical=P, x=Absolute 0, y=Absolute 0 }
159+topRight : Position
124topRight = { topLeft | horizontal <- P }
160topRight = { topLeft | horizontal <- P }
161+bottomLeft : Position
125bottomLeft = { topLeft | vertical <- N }
162bottomLeft = { topLeft | vertical <- N }
163+bottomRight : Position
126bottomRight = { bottomLeft | horizontal <- P }
164bottomRight = { bottomLeft | horizontal <- P }
165+midLeft : Position
127midLeft = { middle | horizontal <- N, x <- Absolute 0 }
166midLeft = { middle | horizontal <- N, x <- Absolute 0 }
167+midRight : Position
128midRight = { midLeft | horizontal <- P }
168midRight = { midLeft | horizontal <- P }
169+midTop : Position
129midTop = { middle | vertical <- P, y <- Absolute 0 }
170midTop = { middle | vertical <- P, y <- Absolute 0 }
171+midBottom : Position
130midBottom = { midTop | vertical <- N }
172midBottom = { midTop | vertical <- N }
173+
174+middleAt : Pos -> Pos -> Position
131middleAt x y = { horizontal = Z, vertical = Z, x = x, y = y }
175middleAt x y = { horizontal = Z, vertical = Z, x = x, y = y }
176+topLeftAt : Pos -> Pos -> Position
132topLeftAt x y = { horizontal = N, vertical = P, x = x, y = y }
177topLeftAt x y = { horizontal = N, vertical = P, x = x, y = y }
178+topRightAt : Pos -> Pos -> Position
133topRightAt x y = { horizontal = P, vertical = P, x = x, y = y }
179topRightAt x y = { horizontal = P, vertical = P, x = x, y = y }
180+bottomLeftAt : Pos -> Pos -> Position
134bottomLeftAt x y = { horizontal = N, vertical = N, x = x, y = y }
181bottomLeftAt x y = { horizontal = N, vertical = N, x = x, y = y }
182+bottomRightAt : Pos -> Pos -> Position
135bottomRightAt x y = { horizontal = P, vertical = N, x = x, y = y }
183bottomRightAt x y = { horizontal = P, vertical = N, x = x, y = y }
184+midLeftAt : Pos -> Pos -> Position
136midLeftAt x y = { horizontal = N, vertical = Z, x = x, y = y }
185midLeftAt x y = { horizontal = N, vertical = Z, x = x, y = y }
186+midRightAt : Pos -> Pos -> Position
137midRightAt x y = { horizontal = P, vertical = Z, x = x, y = y }
187midRightAt x y = { horizontal = P, vertical = Z, x = x, y = y }
188+midTopAt : Pos -> Pos -> Position
138midTopAt x y = { horizontal = Z, vertical = P, x = x, y = y }
189midTopAt x y = { horizontal = Z, vertical = P, x = x, y = y }
190+midBottomAt : Pos -> Pos -> Position
139midBottomAt x y = { horizontal = Z, vertical = N, x = x, y = y }
191midBottomAt x y = { horizontal = Z, vertical = N, x = x, y = y }
140
192
193+up : Direction
141up = DUp
194up = DUp
195+
196+down : Direction
142down = DDown
197down = DDown
198+
199+left : Direction
143left = DLeft
200left = DLeft
201+
202+right : Direction
144right = DRight
203right = DRight
204+
205+inward : Direction
145inward = DIn
206inward = DIn
207+
208+outward : Direction
146outward = DOut
209outward = DOut
libraries/List.elm+3−3
@@ -9,7 +9,7 @@ import Native.List as L
9(::) : a -> [a] -> [a]
9(::) : a -> [a] -> [a]
10
10
11-- Appends two lists.
11-- Appends two lists.
12−-- (++) : [a] -> [a] -> [a]
12+(++) : Appendable a -> Appendable a -> Appendable a
13
13
14-- Extract the first element of a list. List must be non-empty.
14-- Extract the first element of a list. List must be non-empty.
15head : [a] -> a
15head : [a] -> a
@@ -63,10 +63,10 @@ and : [Bool] -> Bool
63or : [Bool] -> Bool
63or : [Bool] -> Bool
64
64
65-- Flatten a list of lists.
65-- Flatten a list of lists.
66−concat : [[a]] -> [a]
66+concat : [Appendable a] -> Appendable a
67
67
68-- Map a given function onto a list and flatten the resulting lists. (concatMap f xs == concat (map f xs))
68-- Map a given function onto a list and flatten the resulting lists. (concatMap f xs == concat (map f xs))
69−concatMap : (a -> [b]) -> [a] -> [b]
69+concatMap : (a -> Appendable b) -> [a] -> Appendable b
70concatMap f = L.concat . L.map f
70concatMap f = L.concat . L.map f
71
71
72-- Get the sum of the list elements.
72-- Get the sum of the list elements.
libraries/Prelude.elm+5
@@ -12,6 +12,11 @@ degrees d = d * Math.PI / 180
12turns : Float -> Float
12turns : Float -> Float
13turns r = 2 * Math.PI * r
13turns r = 2 * Math.PI * r
14
14
15+(+) : Number -> Number -> Number
16+(-) : Number -> Number -> Number
17+(*) : Number -> Number -> Number
18+(/) : Float -> Float -> Float
19+
15-- Integer division, remainder is discarded.
20-- Integer division, remainder is discarded.
16div : Int -> Int -> Int
21div : Int -> Int -> Int
17
22