7.0.0

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+#### 7.0.0
+
+Added back the `Types` module.
+
+
 #### 6.1.0
 
 - Forgot to update README

README.md

@@ -4,11 +4,12 @@ This package includes all the [Material icons](https://material.io/tools/icons/)
 
 ```elm
 import Color
-import Material.Icons as Filled exposing (offline_bolt)
-import Material.Icons.Outlined as Outlined exposing (offline_bolt)
+import Material.Icons as Filled
+import Material.Icons.Outlined as Outlined
+import Material.Icons.Types exposing (Coloring(..))
 
-Filled.offline_bolt 16 (Filled.Color <| Color.rgb 96 181 204)
-Outlined.offline_bolt 16 Outlined.Inherit
+Filled.offline_bolt 16 (Color <| Color.rgb 96 181 204)
+Outlined.offline_bolt 16 Inherit
 ```
 
 ### Preview

elm.json

@@ -3,12 +3,13 @@
     "name": "icidasset/elm-material-icons",
     "summary": "Material Icons Library",
     "license": "BSD-3-Clause",
-    "version": "6.1.0",
+    "version": "7.0.0",
     "exposed-modules": [
         "Material.Icons",
         "Material.Icons.Outlined",
         "Material.Icons.Round",
-        "Material.Icons.TwoTone"
+        "Material.Icons.TwoTone",
+        "Material.Icons.Types"
     ],
     "elm-version": "0.19.0 <= v < 0.20.0",
     "dependencies": {

gen/generate.rb

@@ -139,7 +139,7 @@ def icon_url(family_normal, icon)
 FileUtils.mkdir_p OUT_DIR
 
 # Download source of truth
-# %x`curl -o #{escape(SOT_DIR)}/icons.json https://fonts.google.com/metadata/icons`
+%x`curl -o #{escape(SOT_DIR)}/icons.json https://fonts.google.com/metadata/icons`
 
 
 
@@ -189,11 +189,9 @@ def generate(family)
   end.join(", ")
 
   append_to_file out_path, <<~HERE
-  module #{module_name} exposing (Coloring(..), Icon, #{exposed})
+  module #{module_name} exposing (#{exposed})
 
   {-|
-
-  @docs Coloring, Icon
   HERE
 
   # Docs
@@ -224,48 +222,10 @@ module #{module_name} exposing (Coloring(..), Icon, #{exposed})
   append_to_file out_path, <<~HERE
   -}
 
-  import Color exposing (Color)
   import Material.Icons.Internal exposing (..)
+  import Material.Icons.Types exposing (..)
   import Svg exposing (Svg, g, line, polygon, polyline, rect, text, use, svg)
   import Svg.Attributes as A exposing (baseProfile, clipRule, cx, cy, d, enableBackground, fill, fillOpacity, fillRule, id, overflow, points, r, x1, x2, xlinkHref, y1, y2)
-
-
-  {-| Should I use a [`Color`](https://package.elm-lang.org/packages/avh4/elm-color/latest/), or do I `Inherit` from the CSS color?
-  -}
-  type Coloring
-      = Color Color
-      | Inherit
-
-
-  {-| Type alias for our icons.
-  -}
-  type alias Icon msg =
-      Int -> Coloring -> Svg msg
-
-
-  {-| Internal helper for building icons.
-  -}
-  icon : List (Svg.Attribute msg) -> List (Svg msg) -> Icon msg
-  icon attributes nodes size coloring =
-      let
-          sizeAsString =
-              String.fromInt size
-      in
-      svg
-          ((++)
-              attributes
-              [ A.height sizeAsString, A.width sizeAsString ]
-          )
-          [ g
-              [ case coloring of
-                  Color color ->
-                      fill (Color.toCssString color)
-
-                  Inherit ->
-                      fill "currentColor"
-              ]
-              nodes
-          ]
   HERE
 
   # Process each icon
@@ -274,8 +234,8 @@ module #{module_name} exposing (Coloring(..), Icon, #{exposed})
 
     puts "Processing #{family}/#{icon_fn_name}"
 
-    # download_icon(family, icon)
-    # confirm_icon(family, icon)
+    download_icon(family, icon)
+    confirm_icon(family, icon)
 
     svg             = icon_svg(family, icon)
     elm_icon_code   = %x`./node_modules/.bin/html-elm "#{escape_quotes(svg)}"`
@@ -321,12 +281,14 @@ module #{module_name} exposing (Coloring(..), Icon, #{exposed})
 # ====
 
 %x`mv #{escape(ROOT)}/src/Material/Icons/Internal.elm #{escape(ROOT)}/src/Internal.elm`
+%x`mv #{escape(ROOT)}/src/Material/Icons/Types.elm #{escape(ROOT)}/src/Types.elm`
 
 %x`rm -rf #{escape(ROOT)}/src/Material`
 %x`mv -f #{escape(OUT_DIR)}/* #{escape(ROOT)}/src`
 %x`rm -rf #{escape(OUT_DIR)}`
 
 %x`mv #{escape(ROOT)}/src/Internal.elm #{escape(ROOT)}/src/Material/Icons/Internal.elm`
+%x`mv #{escape(ROOT)}/src/Types.elm #{escape(ROOT)}/src/Material/Icons/Types.elm`
 
 
 

src/Material/Icons/Internal.elm

@@ -1,9 +1,36 @@
 module Material.Icons.Internal exposing (..)
 
+import Color
+import Material.Icons.Types exposing (..)
 import Svg exposing (Svg, g, svg)
 import Svg.Attributes as A exposing (fill, height, width)
 
 
+{-| Internal helper for building icons.
+-}
+icon : List (Svg.Attribute msg) -> List (Svg msg) -> Icon msg
+icon attributes nodes size coloring =
+    let
+        sizeAsString =
+            String.fromInt size
+    in
+    svg
+        ((++)
+            attributes
+            [ height sizeAsString, width sizeAsString ]
+        )
+        [ g
+            [ case coloring of
+                Color color ->
+                    fill (Color.toCssString color)
+
+                Inherit ->
+                    fill "currentColor"
+            ]
+            nodes
+        ]
+
+
 
 -- Helper functions
 

src/Material/Icons/Types.elm

@@ -0,0 +1,27 @@
+module Material.Icons.Types exposing (Coloring(..), Icon)
+
+{-|
+
+@docs Coloring, Icon
+
+-}
+
+import Color exposing (Color)
+import Svg exposing (Svg)
+
+
+
+-- Types
+
+
+{-| Should I use a [`Color`](https://package.elm-lang.org/packages/avh4/elm-color/latest/), or do I `Inherit` from the CSS color?
+-}
+type Coloring
+    = Color Color
+    | Inherit
+
+
+{-| Type alias for our icons.
+-}
+type alias Icon msg =
+    Int -> Coloring -> Svg msg