solara 0.4.0 → 0.6.0

data/solara/lib/core/scripts/theme_generator.rb

@@ -1,253 +1,32 @@
 require 'json'
 require 'fileutils'
 
-class ThemeGeneratorManager
+class ThemeGenerator
     def initialize(input_path)
         @input_path = input_path
     end
 
     def generate(language, output_path)
-        case language.downcase
-        when 'kotlin'
-            generator = KotlinThemeGenerator.new(@input_path, output_path)
-        when 'swift'
-            generator = SwiftThemeGenerator.new(@input_path, output_path)
-        when 'dart'
-            generator = DartThemeGenerator.new(@input_path, output_path)
-        else
-            Solara.logger.fatal("Unsupported language: #{language}")
-            return
-        end
-
-        generator.generate
-    end
-end
-
-class ThemeGenerator
-    def initialize(input_path, output_path)
-        @theme = JSON.parse(File.read(input_path))
-        @output_path = output_path
-    end
-
-    def write_to_file(code)
-        FileUtils.mkdir_p(File.dirname(@output_path))
-        File.write(@output_path, code)
-        Solara.logger.debug("Generated theme file: #{@output_path}")
-    end
-end
-
-class KotlinThemeGenerator < ThemeGenerator
-    def generate
-        code = "import android.graphics.Color\n\n"
-        code += "object BrandTheme {\n"
-        code += generate_colors
-        code += generate_typography
-        code += generate_spacing
-        code += generate_border_radius
-        code += generate_elevation
-        code += "}"
-        write_to_file(code)
-    end
-
-    private
-
-    def generate_colors
-        code = "    object Colors {\n"
-        @theme['colors'].each do |name, value|
-            code += "        val #{name} = Color.parseColor(\"#{value}\")\n"
-        end
-        code + "    }\n\n"
-    end
-
-    def generate_typography
-        code = "    object Typography {\n"
-        code += "        object FontFamily {\n"
-        @theme['typography']['fontFamily'].each do |name, value|
-            code += "            val #{name} = \"#{value}\"\n"
-        end
-        code += "        }\n\n"
-        code += "        object FontSize {\n"
-        @theme['typography']['fontSize'].each do |name, value|
-            code += "            val #{name} = #{value}\n"
-        end
-        code += "        }\n"
-        code + "    }\n\n"
-    end
-
-    def generate_spacing
-        code = "    object Spacing {\n"
-        @theme['spacing'].each do |name, value|
-            code += "        val #{name} = #{value}\n"
-        end
-        code + "    }\n\n"
-    end
-
-    def generate_border_radius
-        code = "    object BorderRadius {\n"
-        @theme['borderRadius'].each do |name, value|
-            code += "        val #{name} = #{value}\n"
-        end
-        code + "    }\n\n"
-    end
-
-    def generate_elevation
-        code = "    object Elevation {\n"
-        @theme['elevation'].each do |name, value|
-            code += "        val #{name} = #{value}\n"
-        end
-        code + "    }\n"
-    end
-end
-
-class SwiftThemeGenerator < ThemeGenerator
-    def generate
-        code = "import UIKit\n\n"
-        code += "struct BrandTheme {\n"
-        code += generate_colors
-        code += generate_typography
-        code += generate_spacing
-        code += generate_border_radius
-        code += generate_elevation
-        code += "}\n\n"
-        code += generate_colors_hex_extension
-        write_to_file(code)
-    end
-
-    private
-
-    def generate_colors
-        code = "    struct Colors {\n"
-        @theme['colors'].each do |name, value|
-            code += "        static let #{name} = UIColor(hex: \"#{value}\")\n"
-        end
-        code + "    }\n\n"
-    end
-
-    def generate_colors_hex_extension
-        <<-SWIFT
-extension UIColor {
-    convenience init(hex: String) {
-        let hex = hex.trimmingCharacters(in: CharacterSet.alphanumerics.inverted)
-        var int: UInt64 = 0
-        Scanner(string: hex).scanHexInt64(&int)
-        let a, r, g, b: UInt64
-        switch hex.count {
-        case 3: // RGB (12-bit)
-            (a, r, g, b) = (255, (int >> 8) * 17, (int >> 4 & 0xF) * 17, (int & 0xF) * 17)
-        case 6: // RGB (24-bit)
-            (a, r, g, b) = (255, int >> 16, int >> 8 & 0xFF, int & 0xFF)
-        case 8: // ARGB (32-bit)
-            (a, r, g, b) = (int >> 24, int >> 16 & 0xFF, int >> 8 & 0xFF, int & 0xFF)
-        default:
-            (a, r, g, b) = (255, 255, 255, 0)
+    config_generator = CodeGenerator.new(
+        json: JSON.parse(File.read(@input_path)),
+        language: language,
+        parent_class_name: 'BrandTheme',
+        custom_types: {
+          "BrandThemeColorSchemes" => "BrandColorScheme",
+          "BrandThemeTypography" => "BrandTypography",
+          "BrandThemeSpacing" => "BrandSpacing",
+          "BrandThemeBorderRadius" => "BrandBorderRadius",
+          "BrandThemeElevation" => "BrandElevation",
+          "BrandThemeOpacity" => "BrandOpacity",
+          "BrandThemeAnimation" => "BrandAnimation",
+          "BrandThemeBreakpoints" => "BrandBreakpoints",
+          "BrandThemeColorSchemesLight" => "BrandLightColorScheme",
+          "BrandThemeColorSchemesDark" => "BrandDarkColorScheme",
         }
-
-        self.init(
-            red: CGFloat(r) / 255,
-            green: CGFloat(g) / 255,
-            blue: CGFloat(b) / 255,
-            alpha: CGFloat(a) / 255
-        )
-    }
-}
-        SWIFT
-    end
-
-    def generate_typography
-        code = "    struct Typography {\n"
-        code += "        struct FontFamily {\n"
-        @theme['typography']['fontFamily'].each do |name, value|
-            code += "            static let #{name} = \"#{value}\"\n"
-        end
-        code += "        }\n\n"
-        code += "        struct FontSize {\n"
-        @theme['typography']['fontSize'].each do |name, value|
-            code += "            static let #{name}: CGFloat = #{value}\n"
-        end
-        code += "        }\n"
-        code + "    }\n\n"
-    end
-
-    def generate_spacing
-        code = "    struct Spacing {\n"
-        @theme['spacing'].each do |name, value|
-            code += "        static let #{name}: CGFloat = #{value}\n"
-        end
-        code + "    }\n\n"
-    end
-
-    def generate_border_radius
-        code = "    struct BorderRadius {\n"
-        @theme['borderRadius'].each do |name, value|
-            code += "        static let #{name}: CGFloat = #{value}\n"
-        end
-        code + "    }\n\n"
-    end
-
-    def generate_elevation
-        code = "    struct Elevation {\n"
-        @theme['elevation'].each do |name, value|
-            code += "        static let #{name}: CGFloat = #{value}\n"
-        end
-        code + "    }\n"
+    )
+    content = config_generator.generate
+    FileManager.create_file_if_not_exist(output_path)
+    File.write(output_path, content)
+    Solara.logger.debug("Generated theme file: #{output_path}")
     end
 end
-
-class DartThemeGenerator < ThemeGenerator
-    def generate
-        code = "import 'package:flutter/material.dart';\n\n"
-        code += generate_colors
-        code += generate_typography
-        code += generate_spacing
-        code += generate_border_radius
-        code += generate_elevation
-        write_to_file(code)
-    end
-
-    private
-
-    def generate_colors
-        code = "  class BrandColors {\n"
-        @theme['colors'].each do |name, value|
-            code += "    static const Color #{name} = Color(0xFF#{value[1..-1]});\n"
-        end
-        code + "  }\n\n"
-    end
-
-    def generate_typography
-        code = "  class FontFamily {\n"
-        @theme['typography']['fontFamily'].each do |name, value|
-            code += "    static const String #{name} = '#{value}';\n"
-        end
-        code += "  }\n\n"
-        code += "  class FontSize {\n"
-        @theme['typography']['fontSize'].each do |name, value|
-            code += "    static const double #{name} = #{value};\n"
-        end
-        code + "  }\n\n"
-    end
-
-    def generate_spacing
-        code = "  class Spacing {\n"
-        @theme['spacing'].each do |name, value|
-            code += "    static const double #{name} = #{value};\n"
-        end
-        code + "  }\n\n"
-    end
-
-    def generate_border_radius
-        code = "  class BorderRadius {\n"
-        @theme['borderRadius'].each do |name, value|
-            code += "    static const double #{name} = #{value};\n"
-        end
-        code += "  }\n\n"
-    end
-
-    def generate_elevation
-        code = "  class Elevation {\n"
-        @theme['elevation'].each do |name, value|
-            code += "    static const double #{name} = #{value};\n"
-        end
-        code + "  }\n"
-    end
-end

data/solara/lib/core/solara_configurator.rb

@@ -7,7 +7,7 @@ class SolaraConfigurator
     end
 
     def start
-        GitignoreManager.ignore
+        GitignoreManager.ignore_common_files
         AliasManager.new.start
     end
 

data/solara/lib/core/template/brands/global/resources_manifest.json

@@ -0,0 +1,10 @@
+{
+    "description": "This file outlines the resources to be transferred from the brand source to the codebase during the switching process.",
+    "files": [
+        {
+            "source": "",
+            "destination": "",
+            "mandatory": true
+        }
+    ]
+}

data/solara/lib/core/template/brands/json/Json-Manifest.md

@@ -0,0 +1,59 @@
+# JSON Structure and Usage
+
+JSON manifest enables the generation of platform-specific code based on the provided JSON files. This enhancement
+streamlines the development process and ensures better code organization for different platforms.
+
+Each JSON file will be transformed into a class within the `solara_artifacts` directory.
+
+You can place your JSON files in the following directories:
+
+- `brands/BRAND/android/json`
+- `brands/BRAND/ios/json`
+- `brands/BRAND/flutter/json`
+- `brands/global/json`
+
+## The Manifest File
+
+Each directory contains a `json_manifest.json` file with the following structure:
+
+```json
+{
+    "files": [
+        {
+            "fileName": "",
+            "generate": true,
+            "parentClassName": "",
+            "customClassNames": [
+                {
+                    "originalName": "",
+                    "customName": ""
+                }
+            ]
+        }
+    ]
+}
+```
+
+### Property Descriptions
+
+- **files**: An array containing objects that define the JSON files to be processed.
+
+    - **fileName**: The name of the JSON file. This should include the file extension (e.g., `config.json`).
+
+    - **generate**: An object that specifies whether to generate a class for the JSON file and the details for that
+      class.
+
+        - **enabled**: A boolean value that indicates if class generation is enabled for this file. If set to `true`, a
+          class will be created based on the JSON structure.
+
+        - **className**: The name of the class that will be generated from the JSON file. This is typically derived from
+          the `fileName`.
+
+        - **customClassNames**: An array of objects that allow you to specify custom names for generated classes.
+
+            - **generatedName**: The name of the class as it would be generated by default.
+
+            - **customName**: The custom name you want to assign to the generated class instead of the default
+              `generatedName`. This is useful for maintaining consistency or aligning with existing naming conventions
+              in your codebase.
+

data/solara/lib/core/template/brands/json/json_manifest.json

@@ -0,0 +1,16 @@
+{
+    "description": "This file specifies the JSON files that can be optionally generated for the target platform code.",
+    "files": [
+        {
+            "fileName": "",
+            "generate": true,
+            "parentClassName": "",
+            "customClassNames": [
+                {
+                    "originalName": "",
+                    "customName": ""
+                }
+            ]
+        }
+    ]
+}

data/solara/lib/core/template/brands/shared/theme.json

@@ -1,46 +1,230 @@
 {
   "name": "BrandTheme",
   "version": "1.0.0",
-  "colors": {
-    "primary": "#007AFF",
-    "secondary": "#5AC8FA",
-    "background": "#FFFFFF",
-    "surface": "#F2F2F7",
-    "error": "#FF3B30",
-    "onPrimary": "#FFFFFF",
-    "onSecondary": "#000000",
-    "onBackground": "#000000",
-    "onSurface": "#000000",
-    "onError": "#FFFFFF"
+  "colorSchemes": {
+    "light": {
+      "primary": "#6750A4",
+      "onPrimary": "#FFFFFF",
+      "primaryContainer": "#EADDFF",
+      "onPrimaryContainer": "#21005D",
+      "secondary": "#625B71",
+      "onSecondary": "#FFFFFF",
+      "secondaryContainer": "#E8DEF8",
+      "onSecondaryContainer": "#1D192B",
+      "tertiary": "#7D5260",
+      "onTertiary": "#FFFFFF",
+      "tertiaryContainer": "#FFD8E4",
+      "onTertiaryContainer": "#31111D",
+      "error": "#B3261E",
+      "onError": "#FFFFFF",
+      "errorContainer": "#F9DEDC",
+      "onErrorContainer": "#410E0B",
+      "background": "#FFFBFE",
+      "onBackground": "#1C1B1F",
+      "surface": "#FFFBFE",
+      "onSurface": "#1C1B1F",
+      "surfaceVariant": "#E7E0EC",
+      "onSurfaceVariant": "#49454F",
+      "outline": "#79747E",
+      "outlineVariant": "#CAC4D0",
+      "shadow": "#000000",
+      "scrim": "#000000",
+      "inverseSurface": "#313033",
+      "inverseOnSurface": "#F4EFF4",
+      "inversePrimary": "#D0BCFF",
+      "surfaceDim": "#DED8E1",
+      "surfaceBright": "#FFFBFE",
+      "surfaceTint": "#F0F0F0",
+      "surfaceContainerLowest": "#FFFFFF",
+      "surfaceContainerLow": "#F7F2FA",
+      "surfaceContainer": "#F3EDF7",
+      "surfaceContainerHigh": "#ECE6F0",
+      "surfaceContainerHighest": "#E6E0E9",
+      "primaryFixed": "#6A5ACD",
+      "primaryFixedDim": "#5B4B9A",
+      "onPrimaryFixed": "#FFFFFF",
+      "onPrimaryFixedVariant": "#21005D",
+      "secondaryFixed": "#7A6A8A",
+      "secondaryFixedDim": "#6B5B71",
+      "onSecondaryFixed": "#FFFFFF",
+      "onSecondaryFixedVariant": "#2C2735",
+      "tertiaryFixed": "#DA6A76",
+      "tertiaryFixedDim": "#C65B65",
+      "onTertiaryFixed": "#FFFFFF",
+      "onTertiaryFixedVariant": "#492532",
+      "onInverseSurface": "#FFFFFF"
+    },
+    "dark": {
+      "primary": "#D0BCFF",
+      "onPrimary": "#381E72",
+      "primaryContainer": "#4F378B",
+      "onPrimaryContainer": "#EADDFF",
+      "secondary": "#CCC2DC",
+      "onSecondary": "#332D41",
+      "secondaryContainer": "#4A4458",
+      "onSecondaryContainer": "#E8DEF8",
+      "tertiary": "#EFB8C8",
+      "onTertiary": "#492532",
+      "tertiaryContainer": "#633B48",
+      "onTertiaryContainer": "#FFD8E4",
+      "error": "#F2B8B5",
+      "onError": "#601410",
+      "errorContainer": "#8C1D18",
+      "onErrorContainer": "#F9DEDC",
+      "background": "#1C1B1F",
+      "onBackground": "#E6E1E5",
+      "surface": "#1C1B1F",
+      "onSurface": "#E6E1E5",
+      "surfaceVariant": "#49454F",
+      "onSurfaceVariant": "#CAC4D0",
+      "outline": "#938F99",
+      "outlineVariant": "#49454F",
+      "shadow": "#000000",
+      "scrim": "#000000",
+      "inverseSurface": "#E6E1E5",
+      "inverseOnSurface": "#313033",
+      "inversePrimary": "#6750A4",
+      "surfaceDim": "#141218",
+      "surfaceBright": "#3B383E",
+      "surfaceTint": "#121212",
+      "surfaceContainerLowest": "#0F0D13",
+      "surfaceContainerLow": "#1D1B20",
+      "surfaceContainer": "#211F26",
+      "surfaceContainerHigh": "#2B2930",
+      "surfaceContainerHighest": "#36343B",
+      "primaryFixed": "#B0A4E0",
+      "primaryFixedDim": "#A08DBE",
+      "onPrimaryFixed": "#381E72",
+      "onPrimaryFixedVariant": "#EADDFF",
+      "secondaryFixed": "#A69DB3",
+      "secondaryFixedDim": "#8C8A94",
+      "onSecondaryFixed": "#332D41",
+      "onSecondaryFixedVariant": "#E8DEF8",
+      "tertiaryFixed": "#EFB8C8",
+      "tertiaryFixedDim": "#C65B65",
+      "onTertiaryFixed": "#492532",
+      "onTertiaryFixedVariant": "#FFD8E4",
+      "onInverseSurface": "#1C1B1F"
+    }
   },
   "typography": {
     "fontFamily": {
-      "regular": "",
-      "medium": "",
-      "bold": ""
+      "regular": "Roboto, sans-serif",
+      "medium": "Roboto-Medium, sans-serif",
+      "bold": "Roboto-Bold, sans-serif"
     },
     "fontSize": {
-      "small": 12,
-      "medium": 16,
-      "large": 20,
-      "extraLarge": 24
+      "caption": 12,
+      "body1": 16,
+      "body2": 14,
+      "subtitle1": 16,
+      "subtitle2": 14,
+      "h6": 20,
+      "h5": 24,
+      "h4": 34,
+      "h3": 48,
+      "h2": 60,
+      "h1": 96
+    },
+    "fontWeight": {
+      "light": 300,
+      "regular": 400,
+      "medium": 500,
+      "bold": 700
+    },
+    "lineHeight": {
+      "tight": 1.2,
+      "normal": 1.5,
+      "relaxed": 1.8
+    },
+    "letterSpacing": {
+      "tight": -0.5,
+      "normal": 0,
+      "wide": 0.5
     }
   },
   "spacing": {
-    "small": 8,
-    "medium": 16,
-    "large": 24,
-    "extraLarge": 32
+    "xxs": 4,
+    "xs": 8,
+    "sm": 12,
+    "md": 16,
+    "lg": 24,
+    "xl": 32,
+    "xxl": 48
   },
   "borderRadius": {
-    "small": 4,
-    "medium": 8,
-    "large": 12
+    "none": 0,
+    "sm": 4,
+    "md": 8,
+    "lg": 12,
+    "full": 9999
   },
   "elevation": {
-    "none": 0,
-    "low": 2,
-    "medium": 4,
-    "high": 8
+    "none": {
+      "shadowColor": "#000000",
+      "shadowOffset": {
+        "width": 0,
+        "height": 0
+      },
+      "shadowOpacity": 0,
+      "shadowRadius": 0,
+      "elevation": 0
+    },
+    "low": {
+      "shadowColor": "#000000",
+      "shadowOffset": {
+        "width": 0,
+        "height": 2
+      },
+      "shadowOpacity": 0.1,
+      "shadowRadius": 4,
+      "elevation": 2
+    },
+    "medium": {
+      "shadowColor": "#000000",
+      "shadowOffset": {
+        "width": 0,
+        "height": 4
+      },
+      "shadowOpacity": 0.15,
+      "shadowRadius": 8,
+      "elevation": 4
+    },
+    "high": {
+      "shadowColor": "#000000",
+      "shadowOffset": {
+        "width": 0,
+        "height": 8
+      },
+      "shadowOpacity": 0.2,
+      "shadowRadius": 16,
+      "elevation": 8
+    }
+  },
+  "opacity": {
+    "disabled": 0.38,
+    "hovered": 0.08,
+    "focused": 0.12,
+    "pressed": 0.16,
+    "dragged": 0.24
+  },
+  "animation": {
+    "duration": {
+      "short": 200,
+      "medium": 300,
+      "long": 400
+    },
+    "easing": {
+      "standard": "cubic-bezier(0.4, 0.0, 0.2, 1)",
+      "accelerate": "cubic-bezier(0.4, 0.0, 1, 1)",
+      "decelerate": "cubic-bezier(0.0, 0.0, 0.2, 1)"
+    }
+  },
+  "breakpoints": {
+    "xs": 0,
+    "sm": 600,
+    "md": 960,
+    "lg": 1280,
+    "xl": 1920
   }
 }

data/solara/lib/core/template/config/android_template_config.json

@@ -59,6 +59,56 @@
             "source": "shared/brand_config.json",
             "target": "shared/brand_config.json",
             "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "global/resources_manifest.json",
+            "target": "../../global/resources_manifest.json",
+            "condition": "true"
         }
     ],
     "variables": {