drawio_dsl 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 96f9176e2e3f9b37f0a02f462d075835aae641a43d14dc45c747a1434fcb17df
-  data.tar.gz: 07ef19170c1721bb9ebe7a58d9cc6d20ca000d620b555941c2e396d83a8b27e0
+  metadata.gz: 43e99df9f899e7c7ebeb6618d9b2018cad1a17abf786cf047d918c1eed513f77
+  data.tar.gz: 2b251a9fa966d5447cc8130b1a1b9a2ac90e7f229b5b1aa0d182a233179ec88e
 SHA512:
-  metadata.gz: ccb338c21e1a14d55e0fb7965c05c014714e37081a1b2f365ea01168017d15327043255a23346dde6c7674419c5458ea9516411240108e5e5c4cb688b9210a9f
-  data.tar.gz: ab033223b347fa65e1e6e2ddb91d93085276052dd21685d5bd76db0c9cc0f92c1c0a2e5cade339f4e1f7a67569ee42153249d61ec6f15bdb8401e7b52d25d57b
+  metadata.gz: d0da48b1461fa48072af5674a689dd9beac83fee630cb2cd656c22a3495fdffd062ec3fffa80dfca57478a240557ac70c456c14adc87b31d6dd2d4930d77dc2e
+  data.tar.gz: 6376e89f6e55ff96b644cbdf23f26000facdad358791f9bfa66eeee4bc7193389cc75c6601c3f5a8cc7a51f24c5717f1985dbcdd86214efbb1cadf5eff991b1e

data/.builders/.data/shapes.json

@@ -0,0 +1,82 @@
+[
+  {
+    "type": "callout",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;shape=callout"
+  },
+  {
+    "type": "circle",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;ellipse"
+  },
+  {
+    "type": "cloud",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;shape=cloud"
+  },
+  {
+    "type": "diamond",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;rhombus"
+  },
+  {
+    "type": "ellipse",
+    "x": 0,
+    "y": 0,
+    "w": 200,
+    "h": 120,
+    "style_modifiers": "double=1;ellipse"
+  },
+  {
+    "type": "hexagon",
+    "x": 0,
+    "y": 0,
+    "w": 200,
+    "h": 120,
+    "style_modifiers": "double=1;shape=hexagon"
+  },
+  {
+    "type": "note",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": "double=1;shape=note"
+  },
+  {
+    "type": "process",
+    "x": 0,
+    "y": 0,
+    "w": 200,
+    "h": 120,
+    "style_modifiers": "double=1;shape=process"
+  },
+  {
+    "type": "rectangle",
+    "x": 0,
+    "y": 0,
+    "w": 200,
+    "h": 120,
+    "style_modifiers": ""
+  },
+  {
+    "type": "square",
+    "x": 0,
+    "y": 0,
+    "w": 160,
+    "h": 160,
+    "style_modifiers": ""
+  }
+]

data/.builders/.templates/basic/schema_require.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+require_relative 'common_style'
+require_relative 'default_palette'
+require_relative 'diagram'
+require_relative 'node'
+require_relative 'page'
+
+require_relative 'layouts/layout'
+require_relative 'layouts/flex_layout'
+require_relative 'layouts/grid_layout'
+
+require_relative 'shapes/shape'
+{{#each shapes}}
+require_relative 'shapes/{{snake ./type}}'
+{{/each}}

data/.builders/.templates/schema_shape.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module DrawioDsl
+  module Schema
+    class {{camle type}} < Shape
+      configure_shape(:{{snake type}})
+    end
+  end
+end

data/.builders/.templates/schema_shape_spec.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+RSpec.describe DrawioDsl::Schema::{{camle type}} do
+  include_context :node_dependencies
+
+  subject { instance }
+
+  let(:instance) { described_class.new(diagram, **args) }
+  let(:args) { { id: 1 } }
+  let(:default) { KConfig.configuration.drawio.shapes.{{snake type}} }
+
+  it_behaves_like :basic_shape_attributes
+end

data/.builders/blueprint/shapes.rb

@@ -0,0 +1,29 @@
+KManager.model :shapes, namespace: %i[domain] do
+  # microapp = import(:handlebars_helpers, :microapp)
+
+  table :shapes do
+    fields [:type, :x, :y, :w, :h, :style_modifiers]
+
+    # row :shape      , x: 0, y: 0, w:  20, h:  20, style_modifiers: ''
+    row :callout    , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=callout'
+    row :circle     , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;ellipse'
+    row :cloud      , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=cloud'
+    row :diamond    , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;rhombus'
+    row :ellipse    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;ellipse'
+    row :hexagon    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=hexagon'
+    row :note       , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=note'
+    row :process    , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=process'
+    row :rectangle  , x: 0, y: 0, w: 200, h: 120, style_modifiers: ''
+    row :square     ,  0,  0,  160,  160,  ''
+    
+  end
+
+  action do
+    data = self.raw_data
+    shapes = JSON.pretty_generate(data['shapes'])
+
+    k_builder
+      .cd(:data)
+      .add_file('shapes.json', content: shapes, on_exist: :write)
+  end
+end

data/.builders/boot.rb

@@ -45,11 +45,15 @@ KConfig.configure(CONFIG_KEY) do |config|
   base_folder       = File.expand_path('../', builder_folder)
   global_template   = File.expand_path('~/dev/kgems/k_templates/templates')
 
+  # Templates
   config.template_folders.add(:global_template    , global_template)
   config.template_folders.add(:template           , File.expand_path('.templates', Dir.pwd))
 
+  # Target Folders
   config.target_folders.add(:app                  , base_folder)
+  config.target_folders.add(:lib                  , :app, 'lib', 'drawio_dsl')
   config.target_folders.add(:builder              , builder_folder)
+  config.target_folders.add(:data                 , :builder, '.data')
 end
 
 KConfig.configuration(CONFIG_KEY).debug
@@ -60,6 +64,7 @@ resource_manager
   .fileset
   .glob('*.rb', exclude: ['boot.rb'])
   .glob('generators/**/*.rb')
+  .glob('blueprint/**/*.rb')
 resource_manager.add_resources
 
 KManager.boot

data/.builders/generators/90-requires.rb

@@ -0,0 +1,35 @@
+KManager.action :requires do
+  # NOT yet working on file change
+  # depend_on(:domain_shapes_kdoc)
+
+  # init do
+  #   # context.shapes = import_data(:domain_shapes_kdoc, as: :ostruct)
+  # end
+
+  action do
+    shapes_file = k_builder.target_folders.get_filename(:data, 'shapes.json')
+    shapes = JSON.parse(File.read(shapes_file))
+    puts 'david'
+    KDirector::Dsls::BasicDsl
+      .init(k_builder,
+        on_exist:                   :write,                      # %i[skip write compare]
+        on_action:                  :execute                    # %i[queue execute]
+      )
+      .blueprint(
+        active: true,
+        name: :bin_hook,
+        description: 'initialize repository',
+        on_exist: :write) do
+
+        cd(:lib)
+
+        add('schema/_.rb.txt', template_file: 'schema_require.rb', shapes: shapes)
+      end
+
+
+    # # director.play_actions
+    # director.builder.debug
+    # director.debug
+    # director.k_builder.debug
+  end
+end

data/.builders/generators/sample_diagrams/10-page-margin.rb

@@ -0,0 +1,46 @@
+KManager.action :bootstrap do
+  action do
+    director = DrawioDsl::Drawio
+      .init(k_builder)
+      .diagram(theme: :style_01)
+      .page('PgMargin-default') do
+        grid_layout(wrap_at: 4)
+        square(title: 'Page Margin 50, 50 (Default)')
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('PgMargin-0-0', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        square(title: 'Page Margin 0, 0')
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('PgMargin-90-70', margin_left: 90, margin_top: 70) do
+        grid_layout(wrap_at: 4)
+        square(title: 'Page Margin 90, 70')
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+
+    File.write('../spec/.samples/drawio/10-page-margin.xml', diagram.build)
+    File.write('../spec/.samples/drawio/10-page-margin.drawio', diagram.build)
+  end
+end

data/.builders/generators/sample_diagrams/15-grid-direction.rb

@@ -0,0 +1,40 @@
+KManager.action :bootstrap do
+  action do
+
+    # KConfig.configuration.drawio.square.w = KConfig.configuration.drawio.square.w / 4
+    # KConfig.configuration.drawio.square.h = KConfig.configuration.drawio.square.h / 4
+    # KConfig.configuration.drawio.circle.w = KConfig.configuration.drawio.circle.w / 4
+    # KConfig.configuration.drawio.circle.h = KConfig.configuration.drawio.circle.h / 4
+    # KConfig.configuration.drawio.rectangle.w = KConfig.configuration.drawio.rectangle.w / 4
+    # KConfig.configuration.drawio.rectangle.h = KConfig.configuration.drawio.rectangle.h / 4
+
+    director = DrawioDsl::Drawio
+      .init(k_builder)
+      .diagram(theme: :style_01)
+      .page('Horizontal', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, direction: :horizontal)
+        circle(title: '01')
+        square(title: '02')
+        circle(title: '03')
+        square(title: '04')
+        circle(title: '05')
+        square(title: '06')
+        circle(title: '07')
+      end
+      .page('Vertical', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, direction: :vertical)
+        circle(title: '01')
+        square(title: '02')
+        circle(title: '03')
+        square(title: '04')
+        circle(title: '05')
+        square(title: '06')
+        circle(title: '07')
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/15-grid-direction.xml', diagram.build)
+    File.write('../spec/.samples/drawio/15-grid-direction.drawio', diagram.build)
+  end
+end

data/.builders/generators/sample_diagrams/16-grid-alignment.rb

@@ -0,0 +1,73 @@
+KManager.action :bootstrap do
+  action do
+
+    # KConfig.configuration.drawio.square.w = KConfig.configuration.drawio.square.w / 4
+    # KConfig.configuration.drawio.square.h = KConfig.configuration.drawio.square.h / 4
+    # KConfig.configuration.drawio.circle.w = KConfig.configuration.drawio.circle.w / 4
+    # KConfig.configuration.drawio.circle.h = KConfig.configuration.drawio.circle.h / 4
+    # KConfig.configuration.drawio.rectangle.w = KConfig.configuration.drawio.rectangle.w / 4
+    # KConfig.configuration.drawio.rectangle.h = KConfig.configuration.drawio.rectangle.h / 4
+
+    director = DrawioDsl::Drawio
+      .init(k_builder,
+        on_exist:                   :skip,                      # %i[skip write compare]
+        on_action:                  :queue                      # %i[queue execute]
+      )
+      .diagram(theme: :style_01)
+      .page('Grid-Center', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Grid-Top', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, v_align: :top, h_align: :center)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Grid-Bottom', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, v_align: :bottom, h_align: :center)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Grid-Left', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, v_align: :center, h_align: :left)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Grid-Right', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 3, v_align: :center, h_align: :right)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/16-grid-alignment.xml', diagram.build)
+    File.write('../spec/.samples/drawio/16-grid-alignment.drawio', diagram.build)
+  end
+end

data/.builders/generators/sample_diagrams/20-styles.rb

@@ -0,0 +1,64 @@
+KManager.action :bootstrap do
+  action do
+
+    # :rounded, :shadow, :sketch, :glass
+    director = DrawioDsl::Drawio
+      .init(k_builder)
+      .diagram(theme: :style_06)
+      .page('Style-Plain', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Style-Shadow', shadow: 1, margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Style-Rounded', rounded: 1, margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Style-Glass', glass: 1, margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+      .page('Style-Sketch', sketch: 1, margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 4)
+        circle
+        square
+        circle
+        square
+        circle
+        square
+        circle
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/20-styles.xml', diagram.build)
+    File.write('../spec/.samples/drawio/20-styles.drawio', diagram.build)
+  end
+end

data/.builders/generators/sample_diagrams/25-themes.rb

@@ -0,0 +1,24 @@
+KManager.action :bootstrap do
+  action do
+
+    # :rounded, :shadow, :sketch, :glass
+    director = DrawioDsl::Drawio
+      .init(k_builder)
+      .diagram(theme: :style_06)
+      .page('Style-Plain', margin_left: 0, margin_top: 0) do
+        grid_layout(wrap_at: 5)
+
+        square(title: 'The quick brown fox jumps over the lazy dog')
+        circle(title: 'Mary had a little lamb')
+
+        KConfig.configuration.drawio.themes.keys.each do |theme|
+          random(title: theme.to_s, theme: theme)
+        end
+      end
+
+    diagram = DrawioDsl::XmlBuilder.new(director.builder.diagram)
+
+    File.write('../spec/.samples/drawio/25-themes.xml', diagram.build)
+    File.write('../spec/.samples/drawio/25-themes.drawio', diagram.build)
+  end
+end

data/.rubocop.yml

@@ -83,7 +83,8 @@ Metrics/ParameterLists:
 Layout/EmptyLineBetweenDefs:
   Exclude:
     - "**/spec/**/*"
-
+Style/Documentation:
+  Enabled: false
 Lint/AmbiguousBlockAssociation:
   Exclude:
     - "**/spec/**/*"

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+# [0.4.0](https://github.com/klueless-io/drawio_dsl/compare/v0.3.0...v0.4.0) (2022-03-05)
+
+
+### Features
+
+* big refactor, plus 98% test coverage ([0d1075c](https://github.com/klueless-io/drawio_dsl/commit/0d1075c177ff1441246950aaa7306ef774ba6df4))
+
+# [0.3.0](https://github.com/klueless-io/drawio_dsl/compare/v0.2.0...v0.3.0) (2022-03-04)
+
+
+### Features
+
+* add samples for direction, alignment, themes, styles and page margin ([2e9f735](https://github.com/klueless-io/drawio_dsl/commit/2e9f735ba50c9391d7dea64c565ca9c0fb61978a))
+
+# [0.2.0](https://github.com/klueless-io/drawio_dsl/compare/v0.1.0...v0.2.0) (2022-03-04)
+
+
+### Features
+
+* update drawio with grid layout engine ([cc5dc51](https://github.com/klueless-io/drawio_dsl/commit/cc5dc51debfd902a815df704fa2dd77f39f498c7))
+
 # [0.1.0](https://github.com/klueless-io/drawio_dsl/compare/v0.0.1...v0.1.0) (2022-03-02)
 
 

data/lib/drawio_dsl/configuration.rb

@@ -16,38 +16,33 @@ module DrawioDsl
     include KLog::Logging
 
     BaseStyle = Struct.new(:white_space, :html, :rounded, :shadow, :sketch, :glass, keyword_init: true)
-
-    ShapeDefaults   = Struct.new(:type, :x, :y, :w, :h, :style_modifiers)
+    ShapeDefaults   = Struct.new(:type, :x, :y, :w, :h, :style_modifiers, keyword_init: true)
     ShapeThemeStyle = Struct.new(:fill_color, :stroke_color, :font_color, :gradient, keyword_init: true)
 
+    Shapes = Struct.new(
+      :shape,
+      :square,
+      :rectangle,
+      :circle,
+      :process,
+      :ellipse,
+      :diamond,
+      :hexagon,
+      :cloud,
+      :note,
+      :callout,
+      keyword_init: true
+    )
+
     attr_accessor :base_style
 
-    # Theme colors
     attr_accessor :themes
-
-    # Shape shapes
-    attr_accessor :shape
-    attr_accessor :square
-    attr_accessor :rectangle
-    attr_accessor :circle
-    attr_accessor :process
-    attr_accessor :ellipse
-    attr_accessor :triangle
-    attr_accessor :parallelogram
-    attr_accessor :hexagon
+    attr_accessor :shapes
 
     def initialize
       @base_style = BaseStyle.new(white_space: :wrap, html: 1, rounded: nil, shadow: nil, sketch: nil, glass: nil)
 
-      @shape      = ShapeDefaults.new(:shape   , 0, 0, 20, 20, '')
-      @square     = ShapeDefaults.new(:square    , 0, 0, 160, 160, '')
-      @rectangle  = ShapeDefaults.new(:rectangle , 0, 0, 200, 120, '')
-      @circle     = ShapeDefaults.new(:circle    , 0, 0, 160, 160, 'ellipse')
-      @process    = ShapeDefaults.new(:process   , 0, 0, 200, 120, 'shape=process')
-      @ellipse    = ShapeDefaults.new(:ellipse   , 0, 0, 200, 120, 'ellipse')
-      @triangle   = ShapeDefaults.new(:triangle  , 0, 0, 160, 160, 'rhombus')
-
-      @themes     = {}
+      add_shapes
       add_themes
     end
 
@@ -61,12 +56,30 @@ module DrawioDsl
 
     private
 
+    def add_shapes
+      @shapes = Shapes.new(
+        shape: ShapeDefaults.new(type: :shape , x: 0, y: 0, w: 20, h: 20, style_modifiers: ''),
+        square: ShapeDefaults.new(type: :square , x: 0, y: 0, w: 160, h: 160, style_modifiers: ''),
+        rectangle: ShapeDefaults.new(type: :rectangle , x: 0, y: 0, w: 200, h: 120, style_modifiers: ''),
+        circle: ShapeDefaults.new(type: :circle , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;ellipse'),
+        process: ShapeDefaults.new(type: :process , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=process'),
+        ellipse: ShapeDefaults.new(type: :ellipse , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;ellipse'),
+        diamond: ShapeDefaults.new(type: :diamond , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;rhombus'),
+        hexagon: ShapeDefaults.new(type: :hexagon , x: 0, y: 0, w: 200, h: 120, style_modifiers: 'double=1;shape=hexagon'),
+        cloud: ShapeDefaults.new(type: :cloud , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=cloud'),
+        note: ShapeDefaults.new(type: :note , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=note'),
+        callout: ShapeDefaults.new(type: :callout , x: 0, y: 0, w: 160, h: 160, style_modifiers: 'double=1;shape=callout')
+      )
+    end
+
     def add_theme(name, **opts)
       @themes[name] = ShapeThemeStyle.new(**opts)
     end
 
     # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
     def add_themes
+      @themes = {}
+
       add_theme(:style_01         , fill_color: '#f5f5f5', stroke_color: '#666666', font_color: '#333333')
       add_theme(:style_02         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', font_color: '#333333')
       add_theme(:style_03         , fill_color: '#d5e8d4', stroke_color: '#82b366', font_color: '#333333')
@@ -90,26 +103,26 @@ module DrawioDsl
       add_theme(:style_21         , fill_color: '#647687', stroke_color: '#314354', font_color: '#ffffff')
       add_theme(:style_22         , fill_color: '#76608a', stroke_color: '#432D57', font_color: '#ffffff')
       add_theme(:style_23         , fill_color: '#a0522d', stroke_color: '#6D1F00', font_color: '#ffffff')
-      add_theme(:style_24         , fill_color: '#fad7ac', stroke_color: '#b46504')
-      add_theme(:style_25         , fill_color: '#fad9d5', stroke_color: '#ae4132')
-      add_theme(:style_26         , fill_color: '#b0e3e6', stroke_color: '#0e8088')
-      add_theme(:style_27         , fill_color: '#b1ddf0', stroke_color: '#10739e')
-      add_theme(:style_28         , fill_color: '#d0cee2', stroke_color: '#56517e')
-      add_theme(:style_29         , fill_color: '#bac8d3', stroke_color: '#23445d')
-      add_theme(:style_30         , fill_color: '#f5f5f5', stroke_color: '#666666', gradient: '#b3b3b3')
-      add_theme(:style_31         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', gradient: '#7ea6e0')
-      add_theme(:style_32         , fill_color: '#d5e8d4', stroke_color: '#82b366', gradient: '#97d077')
-      add_theme(:style_33         , fill_color: '#ffcd28', stroke_color: '#d79b00', gradient: '#ffa500')
-      add_theme(:style_34         , fill_color: '#fff2cc', stroke_color: '#d6b656', gradient: '#ffd966')
-      add_theme(:style_35         , fill_color: '#f8cecc', stroke_color: '#b85450', gradient: '#ea6b66')
-      add_theme(:style_36         , fill_color: '#e6d0de', stroke_color: '#996185', gradient: '#d5739d')
-      add_theme(:style_37         , fill_color: '#eeeeee', stroke_color: '#36393d')
-      add_theme(:style_38         , fill_color: '#f9f7ed', stroke_color: '#36393d')
-      add_theme(:style_39         , fill_color: '#ffcc99', stroke_color: '#36393d')
-      add_theme(:style_40         , fill_color: '#cce5ff', stroke_color: '#36393d')
-      add_theme(:style_41         , fill_color: '#ffff88', stroke_color: '#36393d')
-      add_theme(:style_42         , fill_color: '#cdeb8b', stroke_color: '#36393d')
-      add_theme(:style_43         , fill_color: '#ffcccc', stroke_color: '#36393d')
+      add_theme(:style_24         , fill_color: '#fad7ac', stroke_color: '#b46504', font_color: '#333333')
+      add_theme(:style_25         , fill_color: '#fad9d5', stroke_color: '#ae4132', font_color: '#333333')
+      add_theme(:style_26         , fill_color: '#b0e3e6', stroke_color: '#0e8088', font_color: '#000000')
+      add_theme(:style_27         , fill_color: '#b1ddf0', stroke_color: '#10739e', font_color: '#000000')
+      add_theme(:style_28         , fill_color: '#d0cee2', stroke_color: '#56517e', font_color: '#000000')
+      add_theme(:style_29         , fill_color: '#bac8d3', stroke_color: '#23445d', font_color: '#000000')
+      add_theme(:style_30         , fill_color: '#f5f5f5', stroke_color: '#666666', font_color: '#000000', gradient: '#b3b3b3')
+      add_theme(:style_31         , fill_color: '#dae8fc', stroke_color: '#6c8ebf', font_color: '#000000', gradient: '#7ea6e0')
+      add_theme(:style_32         , fill_color: '#d5e8d4', stroke_color: '#82b366', font_color: '#000000', gradient: '#97d077')
+      add_theme(:style_33         , fill_color: '#ffcd28', stroke_color: '#d79b00', font_color: '#000000', gradient: '#ffa500')
+      add_theme(:style_34         , fill_color: '#fff2cc', stroke_color: '#d6b656', font_color: '#000000', gradient: '#ffd966')
+      add_theme(:style_35         , fill_color: '#f8cecc', stroke_color: '#b85450', font_color: '#000000', gradient: '#ea6b66')
+      add_theme(:style_36         , fill_color: '#e6d0de', stroke_color: '#996185', font_color: '#000000', gradient: '#d5739d')
+      add_theme(:style_37         , fill_color: '#eeeeee', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_38         , fill_color: '#f9f7ed', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_39         , fill_color: '#ffcc99', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_40         , fill_color: '#cce5ff', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_41         , fill_color: '#ffff88', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_42         , fill_color: '#cdeb8b', stroke_color: '#36393d', font_color: '#000000')
+      add_theme(:style_43         , fill_color: '#ffcccc', stroke_color: '#36393d', font_color: '#000000')
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end