solara 0.2.0 → 0.2.2

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

@@ -1,77 +1,65 @@
 require 'json'
 require 'fileutils'
 
-class ThemeGenerator
-    def initialize(input_path, output_path, language)
-        @theme = JSON.parse(File.read(input_path))
-        @output_path = output_path
-        @language = language.downcase
+class ThemeGeneratorManager
+    def initialize(input_path)
+        @input_path = input_path
+    end
 
-        unless %w[kotlin swift dart].include?(@language)
-            raise ArgumentError, "Unsupported language. Choose 'kotlin', 'swift', or 'dart'."
+    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
-    end
 
-    def generate
-        code = send("generate_#{@language}")
-        write_to_file(code)
+        generator.generate
     end
+end
 
-    private
-
-    def generate_kotlin
-        kotlin_code = "import androidx.compose.ui.graphics.Color\n"
-        kotlin_code += "import androidx.compose.ui.unit.dp\n"
-        kotlin_code += "import androidx.compose.ui.unit.sp\n\n"
-        kotlin_code += "object #{@theme['name']} {\n"
-        kotlin_code += generate_kotlin_colors
-        kotlin_code += generate_kotlin_typography
-        kotlin_code += generate_kotlin_spacing
-        kotlin_code += generate_kotlin_border_radius
-        kotlin_code += generate_kotlin_elevation
-        kotlin_code += "}"
-        kotlin_code
-    end
-
-    def generate_swift
-        swift_code = "import SwiftUI\n\n"
-        swift_code += "struct #{@theme['name']} {\n"
-        swift_code += generate_swift_colors
-        swift_code += generate_swift_typography
-        swift_code += generate_swift_spacing
-        swift_code += generate_swift_border_radius
-        swift_code += generate_swift_elevation
-        swift_code += "}\n\n"
-        swift_code += generate_swift_colors_hext_extension
-        swift_code
-    end
-
-    def generate_dart
-        dart_code = "import 'package:flutter/material.dart';\n\n"
-        dart_code += generate_dart_colors
-        dart_code += generate_dart_typography
-        dart_code += generate_dart_spacing
-        dart_code += generate_dart_border_radius
-        dart_code += generate_dart_elevation
-        dart_code
+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 #{@language.capitalize} theme file: #{@output_path}")
+        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
 
-    def generate_kotlin_colors
+    private
+
+    def generate_colors
         code = "    object Colors {\n"
         @theme['colors'].each do |name, value|
-            code += "        val #{name} = Color(0xFF#{value[1..-1]})\n"
+            code += "        val #{name} = Color.parseColor(\"#{value}\")\n"
         end
-        code += "    }\n\n"
-        code
+        code + "    }\n\n"
     end
 
-    def generate_kotlin_typography
+    def generate_typography
         code = "    object Typography {\n"
         code += "        object FontFamily {\n"
         @theme['typography']['fontFamily'].each do |name, value|
@@ -80,82 +68,92 @@ class ThemeGenerator
         code += "        }\n\n"
         code += "        object FontSize {\n"
         @theme['typography']['fontSize'].each do |name, value|
-            code += "            val #{name} = #{value}.sp\n"
+            code += "            val #{name} = #{value}\n"
         end
         code += "        }\n"
-        code += "    }\n\n"
-        code
+        code + "    }\n\n"
     end
 
-    def generate_kotlin_spacing
+    def generate_spacing
         code = "    object Spacing {\n"
         @theme['spacing'].each do |name, value|
-            code += "        val #{name} = #{value}.dp\n"
+            code += "        val #{name} = #{value}\n"
         end
-        code += "    }\n\n"
-        code
+        code + "    }\n\n"
     end
 
-    def generate_kotlin_border_radius
+    def generate_border_radius
         code = "    object BorderRadius {\n"
         @theme['borderRadius'].each do |name, value|
-            code += "        val #{name} = #{value}.dp\n"
+            code += "        val #{name} = #{value}\n"
         end
-        code += "    }\n\n"
-        code
+        code + "    }\n\n"
     end
 
-    def generate_kotlin_elevation
+    def generate_elevation
         code = "    object Elevation {\n"
         @theme['elevation'].each do |name, value|
-            code += "        val #{name} = #{value}.dp\n"
+            code += "        val #{name} = #{value}\n"
         end
-        code += "    }\n"
-        code
+        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
 
-    def generate_swift_colors
+    private
+
+    def generate_colors
         code = "    struct Colors {\n"
         @theme['colors'].each do |name, value|
-            code += "        static let #{name} = Color(hex: \"#{value}\")\n"
-        end
-        code += "    }\n\n"
-        code
-    end
-
-    def generate_swift_colors_hext_extension
-        code = <<-SWIFT
-extension Color {
-  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) = (1, 1, 1, 0)
-      }
-
-      self.init(
-          .sRGB,
-          red: Double(r) / 255,
-          green: Double(g) / 255,
-          blue:  Double(b) / 255,
-          opacity: Double(a) / 255
-      )
-  }
+            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)
+        }
+
+        self.init(
+            red: CGFloat(r) / 255,
+            green: CGFloat(g) / 255,
+            blue: CGFloat(b) / 255,
+            alpha: CGFloat(a) / 255
+        )
+    }
 }
         SWIFT
-        code
     end
 
-    def generate_swift_typography
+    def generate_typography
         code = "    struct Typography {\n"
         code += "        struct FontFamily {\n"
         @theme['typography']['fontFamily'].each do |name, value|
@@ -167,47 +165,56 @@ extension Color {
             code += "            static let #{name}: CGFloat = #{value}\n"
         end
         code += "        }\n"
-        code += "    }\n\n"
-        code
+        code + "    }\n\n"
     end
 
-    def generate_swift_spacing
+    def generate_spacing
         code = "    struct Spacing {\n"
         @theme['spacing'].each do |name, value|
             code += "        static let #{name}: CGFloat = #{value}\n"
         end
-        code += "    }\n\n"
-        code
+        code + "    }\n\n"
     end
 
-    def generate_swift_border_radius
+    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"
-        code
+        code + "    }\n\n"
     end
 
-    def generate_swift_elevation
+    def generate_elevation
         code = "    struct Elevation {\n"
         @theme['elevation'].each do |name, value|
             code += "        static let #{name}: CGFloat = #{value}\n"
         end
-        code += "    }\n"
-        code
+        code + "    }\n"
+    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
 
-    def generate_dart_colors
+    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"
-        code
+        code + "  }\n\n"
     end
 
-    def generate_dart_typography
+    def generate_typography
         code = "  class FontFamily {\n"
         @theme['typography']['fontFamily'].each do |name, value|
             code += "    static const String #{name} = '#{value}';\n"
@@ -217,34 +224,30 @@ extension Color {
         @theme['typography']['fontSize'].each do |name, value|
             code += "    static const double #{name} = #{value};\n"
         end
-        code += "  }\n\n"
-        code
+        code + "  }\n\n"
     end
 
-    def generate_dart_spacing
+    def generate_spacing
         code = "  class Spacing {\n"
         @theme['spacing'].each do |name, value|
             code += "    static const double #{name} = #{value};\n"
         end
-        code += "  }\n\n"
-        code
+        code + "  }\n\n"
     end
 
-    def generate_dart_border_radius
+    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"
-        code
     end
 
-    def generate_dart_elevation
+    def generate_elevation
         code = "  class Elevation {\n"
         @theme['elevation'].each do |name, value|
             code += "    static const double #{name} = #{value};\n"
         end
-        code += "  }\n"
-        code
+        code + "  }\n"
     end
 end

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

@@ -6,6 +6,29 @@ class YamlManager
     @file_path = file_path
   end
 
+  def add_font(family, assets)
+    yaml_data = load_yaml
+
+    # Ensure the 'flutter' key exists
+    yaml_data['flutter'] ||= {}
+    yaml_data['flutter']['fonts'] ||= []
+
+    # Check if the font family already exists
+    existing_font = yaml_data['flutter']['fonts'].find { |f| f['family'] == family }
+
+    if existing_font
+      Solara.logger.debug("YamlManager: Font family '#{family}' already exists.")
+      # Update existing font assets
+      existing_font['fonts'] = assets
+    else
+      # Add new font family
+      yaml_data['flutter']['fonts'] << { 'family' => family, 'fonts' => assets }
+      Solara.logger.debug("YamlManager: Font family '#{family}' has been added.")
+    end
+
+    save_yaml(yaml_data)
+  end
+  
   def add_property(property_name, property_value)
     yaml_data = load_yaml
 

data/solara/lib/core/solara_configurator.rb

@@ -7,7 +7,7 @@ class SolaraConfigurator
     end
 
     def start
-        GitignoreManager.ignore_redundant_files
+        GitignoreManager.ignore
         AliasGeneratorManager.new.start
     end
 

data/solara/lib/core/template/brands/android/android_config.json

@@ -1,5 +1,4 @@
 {
-  "brandName": "",
   "applicationId": "",
   "versionName": "1.0.0",
   "versionCode": 1,

data/solara/lib/core/template/brands/android/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name"></string>
+</resources>

data/solara/lib/core/template/brands/ios/InfoPlist.xcstrings

@@ -0,0 +1,30 @@
+{
+  "sourceLanguage": "en",
+  "strings": {
+    "CFBundleDisplayName": {
+      "comment": "Bundle display name",
+      "extractionState": "extracted_with_value",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "new",
+            "value": ""
+          }
+        }
+      }
+    },
+    "CFBundleName": {
+      "comment": "Bundle name",
+      "extractionState": "extracted_with_value",
+      "localizations": {
+        "en": {
+          "stringUnit": {
+            "state": "new",
+            "value": ""
+          }
+        }
+      }
+    }
+  },
+  "version": "1.0"
+}

data/solara/lib/core/template/brands/ios/ios_config.json

@@ -1,7 +1,6 @@
 {
-  "PRODUCT_NAME": "",
   "PRODUCT_BUNDLE_IDENTIFIER": "",
   "MARKETING_VERSION": "1.0.0",
-  "BUNDLE_VERSION": "1",
+  "BUNDLE_VERSION": 1,
   "APL_MRCH_ID": ""
 }

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

@@ -1,2 +1,3 @@
 {
+    "brandName": ""    
 }

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

@@ -15,9 +15,9 @@
   },
   "typography": {
     "fontFamily": {
-      "regular": "Roboto",
-      "medium": "Roboto-Medium",
-      "bold": "Roboto-Bold"
+      "regular": "",
+      "medium": "",
+      "bold": ""
     },
     "fontSize": {
       "small": 12,

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

@@ -25,10 +25,20 @@
             "target": "android/android_signing.json",
             "condition": "true"
         },
+        {
+            "source": "ios/xcassets/",
+            "target": "ios/xcassets/",
+            "condition": "true"
+        },
         {
             "source": "ios/assets/",
             "target": "ios/assets/",
-            "condition": "true" 
+            "condition": "true"
+        },
+        {
+            "source": "ios/InfoPlist.xcstrings",
+            "target": "ios/InfoPlist.xcstrings",
+            "condition": "true"
         },
         {
             "source": "ios/ios_config.json",

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

@@ -25,11 +25,21 @@
             "target": "android/android_signing.json",
             "condition": "true"
         },
+        {
+            "source": "ios/xcassets/",
+            "target": "ios/xcassets/",
+            "condition": "true"
+        },
         {
             "source": "ios/assets/",
             "target": "ios/assets/",
             "condition": "true" 
         },
+        {
+            "source": "ios/InfoPlist.xcstrings",
+            "target": "ios/InfoPlist.xcstrings",
+            "condition": "true"
+        },
         {
             "source": "ios/ios_config.json",
             "target": "ios/ios_config.json",
@@ -41,8 +51,8 @@
             "condition": "true"
         },
         {
-            "source": "shared/assets/",
-            "target": "shared/assets/",
+            "source": "flutter/assets/",
+            "target": "flutter/assets/",
             "condition": "true"
         },
         {

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

@@ -25,15 +25,25 @@
             "target": "android/android_signing.json",
             "condition": "true"
         },
+        {
+            "source": "ios/xcassets/",
+            "target": "ios/xcassets/",
+            "condition": "true"
+        },
         {
             "source": "ios/assets/",
             "target": "ios/assets/",
             "condition": "true" 
         },
+        {
+            "source": "ios/InfoPlist.xcstrings",
+            "target": "ios/InfoPlist.xcstrings",
+            "condition": "true"
+        },
         {
             "source": "ios/ios_config.json",
             "target": "ios/ios_config.json",
-            "condition": "true"  
+            "condition": "true"
         },
         {
             "source": "ios/ios_signing.json",

data/solara/lib/core/template/project_template_generator.rb

@@ -15,9 +15,14 @@ class ProjectTemplateGenerator
         source_path = File.join(@template_dir, file["source"])
         target_path = File.join(@target_dir, file["target"])
 
-        copy_content = file.fetch("copy_content", true)
-        copy_item(source_path, target_path, copy_content)
-        replace_variables(target_path, @config["variables"]) if copy_content
+        if file["source"].nil? || file["source"].empty? || !File.exist?(source_path)
+          # Create the target directory if no source path is provided
+          FileUtils.mkdir_p(target_path)
+        else
+          copy_content = file.fetch("copy_content", true)
+          copy_item(source_path, target_path, copy_content)
+          replace_variables(target_path, @config["variables"]) if copy_content
+        end
       end
     end
   end

data/solara/lib/solara/version.rb

@@ -1,3 +1,3 @@
 module Solara
-  VERSION = "0.2.0"
+  VERSION = "0.2.2"
 end

data/solara/lib/solara.rb

@@ -54,6 +54,10 @@ module Solara
             brand_name = options['brand_name']
             input_platform = options['platform']
 
+            if !brand_key || !brand_name
+                Solara.logger.warn('To set up Solara, we need to onboard an initial brand. Please provide the following details for your first brand:')
+            end
+
             brand_key = validate_brand_key(brand_key, ignore_brand_check: true)
             brand_name = validate_brand_name(brand_name)
 
@@ -66,7 +70,7 @@ module Solara
             platform = platform.to_s.downcase
 
             SolaraSettingsManager.instance.platform = platform
-            SolaraManager.new.init(platform, brand_key, brand_name)
+            SolaraManager.new.init(brand_key, brand_name)
         end
 
         desc "status", "Check the current status of Solara. The results may include information about the brand's current standing, the list of brands, and additional details."
@@ -142,7 +146,7 @@ module Solara
             brand_key = validate_brand_key(brand_key)
             begin
                 SolaraManager.new.switch(brand_key)
-            rescue StandardError => e
+            rescue Issue => e
                 Solara.logger.fatal("Switching to #{brand_key} failed.")
                 exit 1
             end
@@ -192,7 +196,7 @@ module Solara
                 return brand_key
             end
 
-                if brand_key.nil? || brand_key.empty? || (!ignore_brand_check && BrandsManager.instance.find(brand_key).nil?)
+                if brand_key.nil? || brand_key.empty? || (!ignore_brand_check && !BrandsManager.instance.exists(brand_key))
                 message = message || (brand_key.nil? || brand_key.empty? ? "Please enter brand key: " : "Please enter existing brand key: ")
                 brand_key = TerminalInputManager.new.get_validated(message) do |input|
                     # Validate that it starts with a letter and contains no spaces
@@ -202,7 +206,7 @@ module Solara
                     end
 
                     # Check if the brand exists in the list
-                    if !ignore_brand_check && BrandsManager.instance.find(input).nil?
+                    if !ignore_brand_check && !BrandsManager.instance.exists(input)
                         Solara.logger.failure("Brand key does not exist.")
                         next false # Use `next` to continue the loop
                     end

data/solara/lib/solara_initializer.rb

@@ -20,12 +20,15 @@ class SolaraInitializer
     def init
         Solara.logger.header("Initializing Solara")
         confirm_init_if_necessary
+
+        ProjectDoctor.new.visit
+
         message = "Initialized #{SolaraSettingsManager.instance.platform} successfully."
         SolaraManager.new.onboard(@brand_key, @brand_name, init: true, success_message: message)
     end
 
     def confirm_init_if_necessary
-        brand_path = File.join(FilePath.solara, 'brands')
+        brand_path = FilePath.brands
         # Check if Solara path exists
         if Dir.exist?(brand_path)
             Solara.logger.warn("Solara already initialized! Be aware that reinitializing will delete all current brands!")
@@ -37,7 +40,7 @@ class SolaraInitializer
                 Solara.logger.info("Solara initialization cancelled.")
                 exit 1
             end
-            FileUtils.rm_rf(brand_path)
+            FileManager.delete_if_exists(brand_path)
         end
     end