add support for theme libraries

Author: vacarsu

lib/scenic/component/button.ex

@@ -131,7 +131,7 @@ defmodule Scenic.Component.Button do
 
   alias Scenic.Graph
   alias Scenic.Scene
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
   alias Scenic.Assets.Static
 
   import Scenic.Primitives, only: [{:rrect, 3}, {:text, 3}, {:update_opts, 2}]
@@ -164,12 +164,12 @@ defmodule Scenic.Component.Button do
     # theme is passed in as an inherited style
     theme =
       case opts[:theme] do
-        nil -> Theme.preset(:primary)
-        :dark -> Theme.preset(:primary)
-        :light -> Theme.preset(:primary)
+        nil -> Themes.preset({:scenic, :primary})
+        {:scenic, :dark} -> Themes.preset({:scenic, :primary})
+        {:scenic, :light} -> Themes.preset({:scenic, :primary})
         theme -> theme
       end
-      |> Theme.normalize()
+      |> Themes.normalize()
 
     # font related info
     font = Keyword.get(styles, :font, @default_font)
@@ -278,11 +278,11 @@ defmodule Scenic.Component.Button do
     )
   end
 
-  defp do_special_theme_outline(graph, :dark, border) do
+  defp do_special_theme_outline(graph, {:scenic, :dark}, border) do
     Graph.modify(graph, :btn, &update_opts(&1, stroke: {1, border}))
   end
 
-  defp do_special_theme_outline(graph, :light, border) do
+  defp do_special_theme_outline(graph, {:scenic, :light}, border) do
     Graph.modify(graph, :btn, &update_opts(&1, stroke: {1, border}))
   end
 

lib/scenic/component/input/caret.ex

@@ -47,7 +47,7 @@ defmodule Scenic.Component.Input.Caret do
     ]
 
   alias Scenic.Graph
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
 
   @width 2
   @inset_v 4
@@ -86,7 +86,7 @@ defmodule Scenic.Component.Input.Caret do
       case opts[:color] do
         nil ->
           opts[:theme]
-          |> Theme.normalize()
+          |> Themes.normalize()
           |> Map.get(:highlight)
 
         c ->

lib/scenic/component/input/checkbox.ex

@@ -54,7 +54,7 @@ defmodule Scenic.Component.Input.Checkbox do
   alias Scenic.Graph
   alias Scenic.Scene
   alias Scenic.Primitive
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
   alias Scenic.Script
   alias Scenic.Assets.Static
 
@@ -95,8 +95,8 @@ defmodule Scenic.Component.Input.Checkbox do
 
     # theme is passed in as an inherited style
     theme =
-      (opts[:theme] || Theme.preset(:dark))
-      |> Theme.normalize()
+      (opts[:theme] || Themes.preset({:scenic, :dark}))
+      |> Themes.normalize()
 
     # font related info
     {:ok, {Static.Font, fm}} = Static.meta(@default_font)

lib/scenic/component/input/dropdown.ex

@@ -84,7 +84,7 @@ defmodule Scenic.Component.Input.Dropdown do
 
   alias Scenic.Graph
   alias Scenic.Scene
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
   import Scenic.Primitives
   alias Scenic.Assets.Static
 
@@ -188,8 +188,8 @@ defmodule Scenic.Component.Input.Dropdown do
 
     # theme is passed in as an inherited style
     theme =
-      (opts[:theme] || Theme.preset(:dark))
-      |> Theme.normalize()
+      (opts[:theme] || Themes.preset(:dark))
+      |> Themes.normalize()
 
     # font related info
     {:ok, {Static.Font, fm}} = Static.meta(@default_font)

lib/scenic/component/input/radio_button.ex

@@ -30,7 +30,7 @@ defmodule Scenic.Component.Input.RadioButton do
   alias Scenic.Scene
   alias Scenic.Graph
   alias Scenic.Primitive
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
   alias Scenic.Assets.Static
 
   require Logger
@@ -70,8 +70,8 @@ defmodule Scenic.Component.Input.RadioButton do
   def init(scene, {text, id, checked?}, opts) do
     # theme is passed in as an inherited style
     theme =
-      (opts[:theme] || Theme.preset(:dark))
-      |> Theme.normalize()
+      (opts[:theme] || Themes.preset(:dark))
+      |> Themes.normalize()
 
     # font related info
     {:ok, {Static.Font, fm}} = Static.meta(@default_font)

lib/scenic/component/input/slider.ex

@@ -69,7 +69,7 @@ defmodule Scenic.Component.Input.Slider do
   use Scenic.Component, has_children: false
 
   alias Scenic.Graph
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
   import Scenic.Primitives, only: [{:rect, 3}, {:line, 3}, {:rrect, 3}, {:update_opts, 2}]
 
   require Logger
@@ -192,8 +192,8 @@ defmodule Scenic.Component.Input.Slider do
 
     # theme is passed in as an inherited style
     theme =
-      (opts[:theme] || Theme.preset(:primary))
-      |> Theme.normalize()
+      (opts[:theme] || Themes.preset(:primary))
+      |> Themes.normalize()
 
     # get button specific styles
     width = opts[:width] || @default_width

lib/scenic/component/input/text_field.ex

@@ -80,7 +80,7 @@ defmodule Scenic.Component.Input.TextField do
 
   alias Scenic.Graph
   alias Scenic.Component.Input.Caret
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
   # alias Scenic.Assets.Static
 
   require Logger
@@ -138,8 +138,8 @@ defmodule Scenic.Component.Input.TextField do
 
     # theme is passed in as an inherited style
     theme =
-      (opts[:theme] || Theme.preset(:dark))
-      |> Theme.normalize()
+      (opts[:theme] || Themes.preset({:scenic, :dark}))
+      |> Themes.normalize()
 
     # get the text_field specific opts
     hint = opts[:hint] || @default_hint

lib/scenic/component/input/toggle.ex

@@ -59,7 +59,7 @@ defmodule Scenic.Component.Input.Toggle do
   alias Scenic.Graph
   alias Scenic.Primitive
   alias Scenic.Primitive.Group
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
   alias Scenic.ViewPort
 
   import Scenic.Primitives
@@ -131,7 +131,7 @@ defmodule Scenic.Component.Input.Toggle do
     # theme is passed in as an inherited style
     theme =
       opts[:theme]
-      |> Theme.normalize()
+      |> Themes.normalize()
 
     # get toggle specific opts
     thumb_radius = Keyword.get(opts, :thumb_radius, @default_thumb_radius)

lib/scenic/graph/compiler.ex

@@ -12,7 +12,7 @@ defmodule Scenic.Graph.Compiler do
   alias Scenic.Primitive
   alias Scenic.Graph
   alias Scenic.Color
-  alias Scenic.Primitive.Style.Theme
+  alias Scenic.Themes
   alias Scenic.Graph.Compiler
 
   # import IEx
@@ -271,7 +271,7 @@ defmodule Scenic.Graph.Compiler do
   defp do_text_color(ops, %{reqs: %{theme: theme}} = state) do
     color =
       theme
-      |> Theme.normalize()
+      |> Themes.normalize()
       |> Map.get(:text)
       |> Color.to_rgba()
 

lib/scenic/primitive/style/style.ex

@@ -49,6 +49,7 @@ defmodule Scenic.Primitive.Style do
   """
 
   alias Scenic.Primitive.Style
+  alias Scenic.Themes
 
   # import IEx
 
@@ -85,7 +86,7 @@ defmodule Scenic.Primitive.Style do
     :stroke => Style.Stroke,
     :text_align => Style.TextAlign,
     :text_base => Style.TextBase,
-    :theme => Style.Theme
+    :theme => Themes
   }
 
   @valid_styles @opts_map
@@ -106,7 +107,7 @@ defmodule Scenic.Primitive.Style do
     stroke: [type: {:custom, Style.Stroke, :validate, []}],
     text_align: [type: {:custom, Style.TextAlign, :validate, []}],
     text_base: [type: {:custom, Style.TextBase, :validate, []}],
-    theme: [type: {:custom, Style.Theme, :validate, []}]
+    theme: [type: {:custom, Themes, :validate, []}]
   ]
 
   @callback validate(data :: any) :: {:ok, data :: any} | {:error, String.t()}