solara 0.4.0 → 0.5.0

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

@@ -99,6 +99,14 @@ module FilePath
         File.join(brands, brand_key)
     end
 
+    def self.brand_json_dir(brand_key, platform = nil)
+        File.join(brand(brand_key), platform || SolaraSettingsManager.instance.platform, 'json')
+    end
+
+    def self.brand_global_json_dir
+        File.join(global, 'json')
+    end
+
     def self.android_config(brand_key)
         File.join(android_brand_root(brand_key), 'android_config.json')
     end
@@ -116,7 +124,15 @@ module FilePath
     end
 
     def self.brand_fonts
-        File.join(solara_brand, 'global', 'fonts')
+        File.join(global, 'fonts')
+    end
+
+    def self.resources_manifest
+        File.join(global, 'resources_manifest.json')
+    end
+
+    def self.global
+        File.join(solara_brand, 'global')
     end
 
     def self.brand_config(brand_key)
@@ -287,6 +303,10 @@ module FilePath
         File.join(root, 'core', 'template')
     end
 
+    def self.brand_configurations
+        File.join(solara_template, 'configurations.json')
+    end
+
     def self.solara_aliases_json
         File.join(dot_solara, 'aliases', 'aliases.json')
     end

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

@@ -4,7 +4,7 @@ class GitignoreManager
         create_gitignore_if_not_exists
     end
 
-    def self.ignore
+    def self.ignore_common_files
         Solara.logger.start_step("Exclude Brand-Generated Files and Folders from Git")
 
         items = [
@@ -29,7 +29,7 @@ class GitignoreManager
         
     def add_items(items)
         items.each do |item|
-            add_item(item)
+            add_item(FileManager.get_relative_path_to_root(item))
         end
     end
 
@@ -39,7 +39,15 @@ class GitignoreManager
         if existing_items.include?(item)
             Solara.logger.debug("'#{item}' already exists in .gitignore")
         else
-            File.open(@gitignore_path, 'a') do |file|
+            File.open(@gitignore_path, 'a+') do |file|
+                # Move the file pointer to the beginning to check the last character
+                file.seek(0, IO::SEEK_END)
+                if file.size > 0
+                    # Only add a new line if the last character is not a newline
+                    file.seek(-1, IO::SEEK_END)
+                    last_char = file.getc
+                    file.puts if last_char != "\n"
+                end
                 file.puts(item)
             end
             Solara.logger.debug("Added '#{item}' to .gitignore")

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

@@ -0,0 +1,95 @@
+require 'json'
+
+class JsonManifestProcessor
+
+  def initialize(json_path, language, output_path)
+    @json_path = json_path
+    @language = language
+    @output_path = output_path
+  end
+
+  def process
+    manifest = read_json
+    process_files(manifest)
+  end
+
+  private
+
+  def process_files(manifest)
+    manifest['files'].each do |file|
+      generate_code(file)
+    end
+  end
+
+  def generate_code(file)
+      return unless file['generate']['enabled']
+
+      file_name = file['fileName']
+      class_name = file['generate']['className']
+
+      puts "generate_code: file_name = #{file_name}, class_name = #{class_name}"
+      return if file_name.empty? || class_name.empty?
+      puts "generate_code: file_name = #{file_name}, class_name = #{class_name}"
+
+      custom_class_names = convert_to_map(file['generate']['customClassNames'])
+
+      file_path = File.join(@json_path, file_name)
+      code_generator = CodeGenerator.new(
+        json: JSON.parse(File.read(file_path)),
+        language: @language ,
+        parent_class_name: class_name,
+        custom_types: custom_class_names
+      )
+
+      generated_code = code_generator.generate
+
+      output_path = File.join(@output_path, gnerated_filename(class_name))
+      write_to_file(output_path, generated_code)
+  end
+
+  def gnerated_filename(class_name)
+    case SolaraSettingsManager.instance.platform
+    when Platform::Flutter
+      "#{to_snake_case(class_name)}.dart"
+    when Platform::IOS
+      "#{class_name}.swift"
+    when Platform::Android
+      "#{class_name}.kt"
+    else
+      raise ArgumentError, "Invalid platform: #{@platform}"
+    end
+  end
+
+  def to_snake_case(string)
+    string.gsub(/[A-Z]/) { |match| "_#{match.downcase}" }.sub(/^_/, '')
+  end
+
+  def write_to_file(output, content)
+    puts "generate_code: output = #{output}, content = #{content}"
+    File.write(output, content)
+    Solara.logger.debug("Genrated #{output}")
+  rescue StandardError => e
+    Solara.logger.debug("Error writing to file #{file_name}: #{e.message}")
+  end
+
+  def convert_to_map(custom_class_names)
+    custom_class_names.each_with_object({}) do |item, result|
+      result[item['generatedName']] = item['customName']
+    end
+  end
+
+  def read_json
+    mainfest_path = File.join(@json_path, 'json_manifest.json')
+    JSON.parse(File.read(mainfest_path))
+  rescue JSON::ParserError => e
+    Solara.logger.debug("Error parsing JSON: #{e.message}")
+    {}
+  rescue Errno::ENOENT => e
+    Solara.logger.debug("Error reading file: #{e.message}")
+    {}
+  rescue StandardError => e
+    Solara.logger.debug("Unexpected error: #{e.message}")
+    {}
+  end
+
+end

data/solara/lib/core/scripts/platform/ios/infoplist_string_catalog_manager.rb

@@ -2,12 +2,22 @@ require 'json'
 
 module StringCatalogUtils
   def load_string_catalog(path)
+    @path = path
     JSON.parse(File.read(path))
   end
 
   def get_value(data, key, target, language)
     lang = language || data['sourceLanguage']
-    data['strings'][key]['localizations'][lang]['stringUnit'][target]
+    localizations = data.dig('strings', key, 'localizations', lang)
+
+    unless localizations && localizations['stringUnit']
+      error_message = "The default language is #{lang}, but no localizations are available for key '#{key}'. Please address this issue in {@path}. You can easily open the file in Xcode to make the necessary adjustments."
+      Solara.logger.fatal(error_message)
+      exit 1
+    end
+
+    string_unit = localizations['stringUnit']
+    string_unit[target]
   end
 
   def has_value?(data, key, language)

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

@@ -0,0 +1,151 @@
+require 'json'
+require 'fileutils'
+
+class ResourceManifestProcessor
+  def initialize(brand_key)
+    @brand_key = brand_key
+    @manifest_file = FilePath.resources_manifest
+    @config = load_manifest_file
+  end
+
+  def copy
+    @base_source_path = FilePath.brands
+    @base_destination_path = FilePath.project_root
+    @config['files'].each do |item|
+      process_file_item(item)
+    end
+  end
+
+  private
+
+  def clean(item, src, dst)
+    paths = destinations(item, src, dst)
+    paths.each do |path|
+      File.delete(path) if File.exist?(path)
+    end
+  end
+
+  def process_file_item(item)
+    src = resolve_source_path(@brand_key, item['source'], @base_source_path)
+    dst = File.join(@base_destination_path, item['destination'])
+
+    clean(item, src, dst)
+
+    return skip_empty_paths(item) if empty_paths?(item)
+
+    check_mandatory_file(item, src, dst)
+
+    if File.exist?(src)
+      copy_file(src, dst)
+      git_ignore(destinations(item, src, dst))
+    else
+      log_file_not_found(item)
+    end
+  end
+
+  def destinations(item, src, dst, visited = {})
+    return [] if visited[src]
+
+    visited[src] = true  # Mark the current source as visited
+
+    if File.file?(src)
+      if File.directory?(dst)
+        return [File.join(dst, File.basename(src))]
+      else
+        return [dst]
+      end
+    elsif File.directory?(src)
+      return destinations_of_directory_contents(src, dst)
+    end
+
+    if !item['mandatory'] && !File.file?(src)
+      return get_optional_resource_destination(item, dst, visited)
+    end
+
+    []
+  end
+
+  def get_optional_resource_destination(item, dst, visited)
+    return [] if item['mandatory']
+    keys = BrandsManager.instance.brands_list.map { |brand| brand['key'] }
+    keys.each do |key|
+      src = resolve_source_path(key, item['source'], @base_source_path)
+      result = destinations(item, src, dst, visited)
+      return result unless result.empty?
+    end
+    []
+  end
+
+  def destinations_of_directory_contents(src_dir, dst_dir)
+    items = []
+    Dir.foreach(src_dir) do |file|
+      next if file == '.' || file == '..'
+      full_dst_path = File.join(dst_dir, file)
+      items << full_dst_path
+    end
+    items
+  end
+
+  def git_ignore(files)
+    files.each do |file|
+      GitignoreManager.new(FilePath.project_root).add_items([file])
+    end
+  end
+
+  def resolve_source_path(brand_key, source, base_source_path)
+    source.gsub(/\{.*?\}/, brand_key).prepend(base_source_path + '/')
+  end
+
+  def empty_paths?(item)
+    item['source'].empty? || item['destination'].empty?
+  end
+
+  def skip_empty_paths(item)
+    Solara.logger.debug("Skipped (empty source or destination) for #{@brand_key}: #{item['source']} -> #{item['destination']}")
+  end
+
+  def check_mandatory_file(item, src, dst)
+    if item['mandatory'] && !File.exist?(src)
+      Solara.logger.fatal("Mandatory resource file/folder not found for #{@brand_key}: #{src}. Please add the resource or mark it as not mandatory in #{FilePath.resources_manifest}.")
+      exit 1
+    end
+
+  end
+
+  def copy_file(src, dst)
+    if File.directory?(src)
+      FileUtils.mkdir_p(dst)
+      FileUtils.cp_r(File.join(src, '.'), dst)
+    else
+      FileUtils.mkdir_p(File.dirname(dst))
+      FileUtils.cp(src, dst)
+    end
+    Solara.logger.debug("Copied resource for #{@brand_key}: #{File.basename(src)} to #{File.basename(dst)}")
+  end
+
+  def log_file_not_found(item)
+    Solara.logger.debug("Skipped resource (not found) for #{@brand_key}: #{item['source']}")
+  end
+
+  def load_manifest_file
+    validate_manifest_file_existence
+    parse_manifest_file
+  end
+
+  def validate_manifest_file_existence
+    unless File.exist?(@manifest_file)
+      Solara.logger.fatal("Brand switch copy manifest not found for #{@brand_key}: #{@manifest_file}")
+      exit 1
+    end
+  end
+
+  def parse_manifest_file
+    begin
+      JSON.parse(File.read(@manifest_file))
+    rescue JSON::ParserError => e
+      Solara.logger.fatal("Invalid brand switch copy manifest for #{@brand_key}: #{e.message}")
+      exit 1
+    end
+  end
+
+end

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

@@ -37,7 +37,7 @@ class SolaraStatusManager
         
             solara dashboard -k #{current_brand['key']}
      
-            Then, click the "Apply Changes" button.
+            Then, click the "Sync" button.
         MESSAGE
         Solara.logger.info(message)
     end

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
+        }
+    ]
+}