solara 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 190a0c29bbb6d5e00c92181dd75543be6a37c671110d2db37c2704a92f962ff3
-  data.tar.gz: 37977f6295ce0ec00be3427e62b2930353091dde1705d12eb967932187b9ea89
+  metadata.gz: dea7da41ec79265551adc948a5586af994164b9c04ef3576b2c37b9fab2f108f
+  data.tar.gz: 31352f627b65fa267a082095bfec2346b03173a944e2c967974107c0c30f7e9b
 SHA512:
-  metadata.gz: 7ae71b89f2009fb46d5ec2f50baaba4b759a38b75a2bd1040117ef87263c5bfbb97b38aba44f2b911b5711d60a9c72109a91cb8a65841a0779b318d522fa271a
-  data.tar.gz: 9c204a83bb994794f1afebbd793c73901596bf4cebae5ff38ed0ae844cc17bc6cb289232af14fa8c75520f5e0c5318866477bdd1a19ac3e62d073cd71f3f8144
+  metadata.gz: a4623541490f240d2ffacbb682d8b9388058633af6e40d548cd998cad186f87addd4efc4675e2257d4c90102f42ce7589e3c90d400f84775d8ca25f1af201f5b
+  data.tar.gz: c5158cd2c02abd104155d482c3e59e8c7a79b4289eb4316a5c9ee7de101892b6ae1d1341c247b97a38611041add484a4abaaf9d414c4380fa7cebbf12ecbbf35

data/solara/lib/core/aliases/alias_generator.rb

@@ -18,6 +18,7 @@ class AliasGenerator
 
     def add_brand_aliases(brands)
         alias_templates = [
+            "solara_export_{brand_key}='solara export --brand_keys {brand_key}'",
             "solara_offboard_{brand_key}='solara offboard -k {brand_key}'",
             "solara_switch_{brand_key}='solara switch -k {brand_key}'",
             "solara_doctor_{brand_key}='solara doctor -k {brand_key}'",

data/solara/lib/core/aliases/alias_generator_manager.rb

@@ -1,6 +1,6 @@
 class AliasGeneratorManager
   def initialize
-    @generator = AliasGenerator.new()
+    @generator = AliasGenerator.new
   end
 
   def start
@@ -8,6 +8,7 @@ class AliasGeneratorManager
     common_aliases = [
       "solara_dashboard='solara dashboard'",
       "solara_doctor='solara doctor'",
+      "solara_status='solara status'",
     ]
 
     @generator.add_brand_aliases(BrandsManager.instance.brands_list)

data/solara/lib/core/aliases/solara_terminal_setup.rb

@@ -83,7 +83,7 @@ class SolaraSetup
         reg['AutoRun', Win32::Registry::REG_EXPAND_SZ] = @windows_setup_file
       end
       Solara.logger.success("Windows AutoRun registry key set up successfully.")
-      pSolara.logger.warn("Please restart your Command Prompt to apply changes.")
+      Solara.logger.warn("Please restart your Command Prompt to apply changes.")
     rescue Win32::Registry::Error => e
       Solara.logger.failure("Failed to set up Windows registry: #{e.message}")
       Solara.logger.failure("Please add the following file path to your AutoRun registry key manually:")

data/solara/lib/core/brands/brand_font_switcher.rb

@@ -0,0 +1,154 @@
+Dir[File.expand_path('scripts/*.rb', __dir__)].each { |file| require_relative file }
+Dir[File.expand_path('../template/*.rb', __dir__)].each { |file| require_relative file }
+Dir[File.expand_path('platform/android/*.rb', __dir__)].each { |file| require_relative file }
+Dir[File.expand_path('platform/ios/*.rb', __dir__)].each { |file| require_relative file }
+Dir[File.expand_path('platform/flutter/*.rb', __dir__)].each { |file| require_relative file }
+class BrandFontSwitcher
+def initialize(brand_key)
+    @brand_key = brand_key
+    @fonts_path = FilePath.brand_fonts
+    @font_files = Dir.glob(File.join(@fonts_path, '*.{ttf,otf}'))
+    Solara.logger.end_step("Switch Info.plist")
+end
+
+def switch
+    Solara.logger.header("Switch Fonts")
+
+    case SolaraSettingsManager.instance.platform
+    when Platform::Flutter
+      FlutterFontSwitcher.new(@brand_key, @font_files).switch
+      AndroidFontSwitcher.new(@brand_key, @font_files).switch
+      IOSFontSwitcher.new(@brand_key, @font_files).switch
+    when Platform::Android
+      AndroidFontSwitcher.new(@brand_key, @font_files).switch
+    when Platform::IOS
+      IOSFontSwitcher.new(@brand_key, @font_files).switch
+    else
+      raise ArgumentError, "Invalid platform: #{SolaraSettingsManager.instance.platform}"
+    end
+    end
+end
+
+class FlutterFontSwitcher
+    def initialize(brand_key, font_files)
+        @brand_key = brand_key
+        @font_files = font_files
+    end
+
+    def switch
+        Solara.logger.start_step("Switch Flutter fonts")
+        destination = FilePath.flutter_project_fonts
+        copy_fonts(destination)
+
+        add_fonts_to_pubspec
+        Solara.logger.end_step("Switch Flutter fonts")
+    end
+
+    private
+
+    def add_fonts_to_pubspec
+        yaml_manager = YamlManager.new(FilePath.pub_spec_yaml)
+        font_families = Hash.new { |hash, key| hash[key] = [] }
+
+        font_names = @font_files.map { |file| File.basename(file) }
+        font_names.each do |font_file|
+          base_name = File.basename(font_file, File.extname(font_file))
+          family_name = base_name.split('-').first
+          font_families[family_name] << font_file
+        end
+
+        font_families.each do |family_name, files|
+          assets = files.map { |file| { 'asset' => "assets/solara_fonts/#{file}" } }
+          yaml_manager.add_font(family_name, assets)
+        end
+    end
+
+    def copy_fonts(destination)
+      FontCopier.new.copy(destination, @font_files)
+    end
+end
+
+class AndroidFontSwitcher
+    def initialize(brand_key, font_files)
+      @brand_key = brand_key
+      @font_files = font_files
+    end
+
+    def switch
+      Solara.logger.start_step("Switch Android fonts")
+      destination = FilePath.android_project_fonts
+      copy_fonts(destination)
+      rename_fonts_in_directory(FilePath.android_project_fonts)
+      Solara.logger.end_step("Switch Android fonts")
+    end
+
+    private
+
+    def rename_fonts_in_directory(directory)
+      Dir.foreach(directory) do |file|
+        next if file == '.' || file == '..' # Skip current and parent directory entries
+
+        old_path = File.join(directory, file)
+        if File.file?(old_path)
+          new_name = sanitize_font_name(file)
+          new_path = File.join(directory, new_name)
+
+          # Rename the file if the new name is different
+          unless old_path == new_path
+            FileUtils.mv(old_path, new_path)
+            Solara.logger.debug("Renamed: #{file} -> #{new_name}")
+          end
+        end
+      end
+    end
+
+    def sanitize_font_name(font_name)
+      # Convert to lowercase
+      sanitized_name = font_name.downcase
+      # Replace spaces with underscores
+      sanitized_name.gsub!('-', '_')
+      sanitized_name.gsub!(' ', '_')
+      # Remove special characters (except underscores and dots)
+      sanitized_name.gsub!(/[^a-z0-9_.]/, '')
+      sanitized_name
+    end
+
+    def copy_fonts(destination)
+      FontCopier.new.copy(destination, @font_files)
+    end
+end
+
+class IOSFontSwitcher
+    def initialize(brand_key, font_files)
+      @brand_key = brand_key
+      @font_files = font_files
+    end
+
+    def switch
+      Solara.logger.start_step("Switch iOS fonts")
+      destination = FilePath.ios_project_fonts
+      copy_fonts(destination)
+
+      font_names = @font_files.map { |file| File.basename(file) }
+      info_plist_path = FilePath.info_plist
+      manager = IOSPlistManager.new(@project, info_plist_path)
+      manager.add_fonts(font_names)
+
+      Solara.logger.end_step("Switch iOS fonts")
+    end
+
+    private
+
+    def copy_fonts(destination)
+      FontCopier.new.copy(destination, @font_files)
+    end
+end
+
+  class FontCopier
+    def copy(destination, font_files)
+      FileUtils.mkdir_p(destination)
+      return if font_files.empty?
+
+      FolderCopier.new(FilePath.brand_fonts, destination).copy
+    end
+  end

data/solara/lib/core/brands/brand_onboarder.rb

@@ -20,15 +20,11 @@ class BrandOnboarder
         add_to_brands_list
     end
 
-    def add_to_brands_list
-        BrandsManager.instance.add_brand(@brand_name, @brand_key)
-    end
-
     def generate_brand_template
         Solara.logger.debug("Onboarding #{@brand_key} from template.")
 
         template_dir = FilePath.template_brands
-        target_dir = File.join(FilePath.solara, 'brands', @brand_key)
+        target_dir = FilePath.brand(@brand_key)
         config_file = FilePath.template_config
 
         generator = ProjectTemplateGenerator.new(template_dir, target_dir, config_file)
@@ -38,9 +34,15 @@ class BrandOnboarder
     def clone_brand
         Solara.logger.debug("Cloning #{@clone_brand_key} to #{@brand_key}")
         source = FilePath.brand(@clone_brand_key)
-        destination = File.join(FilePath.solara, 'brands', @brand_key)
+        destination = FilePath.brand(@brand_key)
+
+        FileManager.delete_if_exists(destination)
         FolderCopier.new(source, destination).copy
     end
 
+    def add_to_brands_list
+        BrandsManager.instance.add_brand(@brand_name, @brand_key)
+    end
+
 end
 

data/solara/lib/core/brands/brand_switcher.rb

@@ -1,204 +1,270 @@
+# Load required files
 Dir[File.expand_path('scripts/*.rb', __dir__)].each { |file| require_relative file }
 Dir[File.expand_path('platform/android/*.rb', __dir__)].each { |file| require_relative file }
 Dir[File.expand_path('platform/ios/*.rb', __dir__)].each { |file| require_relative file }
 Dir[File.expand_path('platform/flutter/*.rb', __dir__)].each { |file| require_relative file }
 
 class BrandSwitcher
-    def initialize(brand_key, ignore_health_check: false)
-        Solara.logger.debug("ignore_health_check = #{ignore_health_check}")
-        @brand_key = brand_key
-        @ignore_health_check = ignore_health_check
-        @platform = SolaraSettingsManager.instance.platform
-    end
+  def initialize(brand_key, ignore_health_check: false)
+    @brand_key = brand_key
+    @ignore_health_check = ignore_health_check
+    @platform = SolaraSettingsManager.instance.platform
+    @health_checker = HealthChecker.new(@brand_key, @ignore_health_check)
+    @artifacts_switcher = ArtifactSwitcher.new(@platform)
+  end
+
+  def start
+    Solara.logger.header("Switching to #{@brand_key}")
+
+    @health_checker.check_health
+    BrandsManager.instance.save_current_brand(@brand_key)
+    @artifacts_switcher.switch
+    switch
+    SolaraConfigurator.new.start
+
+    Solara.logger.success("Switched to #{@brand_key} successfully.")
+  end
 
-    def self.switch_to_first_brand(ignore_health_check: true)
-        first_brand_key = BrandsManager.instance.first_brand_key
-        if first_brand_key.nil?
-            return
-        end
-        BrandSwitcher.new(first_brand_key, ignore_health_check: ignore_health_check).start
+  private
+
+  def switch
+    BrandFontSwitcher.new(@brand_key).switch
+    
+    case @platform
+    when Platform::Flutter
+      IOSBrandSwitcher.new(@brand_key).switch
+      AndroidBrandSwitcher.new(@brand_key).switch
+      FlutterBrandSwitcher.new(@brand_key).switch
+    when Platform::IOS
+      IOSBrandSwitcher.new(@brand_key).switch
+    when Platform::Android
+      AndroidBrandSwitcher.new(@brand_key).switch
+    else
+      raise ArgumentError, "Invalid platform: #{@platform}"
     end
+  end
+end
 
-    def start
-        Solara.logger.header("Switching to #{@brand_key}")
+class FlutterBrandSwitcher
+  def initialize(brand_key)
+    @brand_key = brand_key
+    @theme_switcher = ThemeSwitcher.new(@brand_key)
+    @brand_config_switcher = BrandConfigSwitcher.new(@brand_key)
+  end
 
-        health_errors = SolaraManager.new.doctor([@brand_key]).select { |issue| issue.type == Issue::ERROR }
-        unless health_errors.empty?
-            unless @ignore_health_check
-                errors_with_index = health_errors.each_with_index.map { |error, index| "#{index + 1}: #{error}" }
-                raise "Health check completed with errors: \n\n#{errors_with_index.join("\n")}."
-            end
-        end
+  def switch
+    @theme_switcher.switch(Language::Dart)
+    @brand_config_switcher.switch(Language::Dart)
+    BrandResourcesSwitcher.new(@brand_key).switch(Platform::Flutter)
+  end
+end
 
-        BrandsManager.instance.save_current_brand(@brand_key)
+class AndroidBrandSwitcher
+  def initialize(brand_key)
+    @brand_key = brand_key
+    @theme_switcher = ThemeSwitcher.new(@brand_key)
+    @brand_config_switcher = BrandConfigSwitcher.new(@brand_key)
+  end
 
-        Solara.logger.start_step("Create artifacts directories")
-        create_artifacts_dirs
-        Solara.logger.end_step("Create artifacts directories")
+  def switch
+    BrandConfigManager.new(@brand_key).generate_android_properties
 
-        switch
+    config_path = FilePath.android_brand_config(@brand_key)
+    config = JSON.parse(File.read(config_path))
 
-        SolaraConfigurator.new.start
+    GradleSwitcher.new(@brand_key).switch
+    AndroidManifestSwitcher.new.switch(config)
+    @theme_switcher.switch(Language::Kotlin)
+    @brand_config_switcher.switch(Language::Kotlin)
+    BrandResourcesSwitcher.new(@brand_key).switch(Platform::Android)
+  end
+end
 
-        Solara.logger.success("Switched to #{@brand_key} successfully.")
-    end
+class IOSBrandSwitcher
+  def initialize(brand_key)
+    @brand_key = brand_key
+    @theme_switcher = ThemeSwitcher.new(@brand_key)
+    @brand_config_switcher = BrandConfigSwitcher.new(@brand_key)
+  end
 
-    def create_artifacts_dirs
-        case @platform
-        when Platform::Flutter
-            directories = [
-                FilePath::flutter_artifacts,
-                FilePath::android_artifacts,
-                IOSFilePathManager.instance.artifacts
-            ]
-            DirectoryCreator.create_directories(directories, delete_if_exists: true)
-
-        when Platform::IOS
-            directories = [
-                IOSFilePathManager.instance.artifacts
-            ]
-            DirectoryCreator.create_directories(directories, delete_if_exists: true)
-
-        when Platform::Android
-            directories = [
-                FilePath::android_artifacts
-            ]
-            DirectoryCreator.create_directories(directories, delete_if_exists: true)
-        else
-            raise ArgumentError, "Invalid platform: #{@platform}"
-        end
-    end
+  def switch
+    BrandConfigManager.new(@brand_key).generate_ios_xcconfig
+    @theme_switcher.switch(Language::Swift)
+    @brand_config_switcher.switch(Language::Swift)
+    switch_infoplist
+    BrandResourcesSwitcher.new(@brand_key).switch(Platform::IOS)
+    switch_xcode_project
+  end
 
-    def switch
-        case @platform
-        when Platform::Flutter
-            switch_flutter
-            switch_android
-            switch_ios
-
-        when Platform::IOS
-            switch_ios
-
-        when Platform::Android
-            switch_android
-        else
-            raise ArgumentError, "Invalid platform: #{@platform}"
-        end
-    end
+  private
 
-    def generate_theme_kotlin
-        generate_theme(
-            'BrandTheme.kt',
-            Language::Kotlin,
-            Platform::Android)
-    end
+  def switch_infoplist
+    Solara.logger.start_step("Switch Info.plist")
+    project_path = FilePath.xcode_project
+    InfoPlistSwitcher.new(project_path, @brand_key).switch
+    Solara.logger.end_step("Switch Info.plist")
+  end
 
-    def generate_theme_swift
-        generate_theme(
-            'BrandTheme.swift',
-            Language::Swift,
-            Platform::IOS)
-    end
+  def switch_xcode_project
+    Solara.logger.start_step("Switch Xcode project")
+    project_path = FilePath.xcode_project
+    XcodeProjectSwitcher.new(project_path, @brand_key).switch
+    Solara.logger.end_step("Switch Xcode project")
+  end
+end
 
-    def generate_theme_dart
-        generate_theme(
-            'brand_theme.dart',
-            Language::Dart,
-            Platform::Flutter)
-    end
+class HealthChecker
+  def initialize(brand_key, ignore_health_check)
+    @brand_key = brand_key
+    @ignore_health_check = ignore_health_check
+  end
 
-    def generate_theme(
-        name,
-        language,
-        platform)
-        Solara.logger.start_step("Generate #{language} theme for #{platform}")
-        generator = ThemeGenerator.new(
-            FilePath.brand_theme(@brand_key),
-            FilePath.generated_config(name, platform),
-            language)
-        generator.generate
-        Solara.logger.end_step("Generate #{language} theme for #{platform}")
-    end
+  def check_health
+    health_errors = SolaraManager.new.doctor([@brand_key]).select { |issue| issue.type == Issue::ERROR }
+    return if health_errors.empty?
 
-    def generate_app_config_kotlin
-        generate_brand_config(
-            'BrandConfig.kt',
-            Language::Kotlin,
-            Platform::Android
-        )
+    unless @ignore_health_check
+      errors_with_index = health_errors.each_with_index.map { |error, index| "#{index + 1}: #{error}" }
+      raise Issue.error("Health check completed with errors: \n\n#{errors_with_index.join("\n")}.")
     end
+  end
+end
 
-    def generate_app_config_swift
-        generate_brand_config(
-            'BrandConfig.swift',
-            Language::Swift,
-            Platform::IOS)
-    end
+class ArtifactSwitcher
+  def initialize(platform)
+    @platform = platform
+  end
 
-    def generate_app_config_dart
-        generate_brand_config(
-            'brand_config.dart',
-            Language::Dart,
-            Platform::Flutter)
-    end
+  def switch
+    Solara.logger.start_step("Switch artifacts directories")
+    directories = directories_for_platform
+    DirectoryCreator.create_directories(directories, delete_if_exists: true)
+    Solara.logger.end_step("Switch artifacts directories")
+  end
 
-    def generate_brand_config(
-        name,
-        language,
-        platform)
-        BrandConfigManager.new(@brand_key).generate_brand_config(
-            name,
-            language,
-            platform)
-    end
+  private
 
-    def switch_flutter
-        generate_theme_dart
-        generate_app_config_dart
-        BrandResourcesManager.new(@brand_key).update_flutter
+  def directories_for_platform
+    case @platform
+    when Platform::Flutter
+      FlutterArtifactSwitcher.new.directories +
+      IOSArtifactSwitcher.new.directories +
+      AndroidArtifactSwitcher.new.directories
+    when Platform::IOS
+      IOSArtifactSwitcher.new.directories
+    when Platform::Android
+      AndroidArtifactSwitcher.new.directories
+    else
+      raise ArgumentError, "Invalid platform: #{@platform}"
     end
+  end
+end
 
-    def switch_android
-        BrandConfigManager.new(@brand_key).generate_android_properties
-        config_path = FilePath.android_brand_config(@brand_key)
-        config = JSON.parse(File.read(config_path))
-        update_build_gradle
-        update_manifest(config)
-        update_strings_xml(config)
-        BrandResourcesManager.new(@brand_key).update_android
-        generate_theme_kotlin
-        generate_app_config_kotlin
-    end
+class FlutterArtifactSwitcher
+  def directories
+    [
+      FilePath.flutter_lib_artifacts,
+      FilePath.flutter_assets_artifacts,
+      FilePath.flutter_project_fonts,
+    ]
+  end
+end
 
-    def update_build_gradle
-        switcher = GradleSwitcher.new(@brand_key)
-        switcher.update_build_gradle
-    end
+class IOSArtifactSwitcher
+  def directories
+    [
+      FilePath.ios_project_root_artifacts,
+      FilePath.ios_project_assets_artifacts,
+    ]
+  end
+end
 
-    def update_manifest(config)
-        switcher = AndroidManifestSwitcher.new
-        switcher.update_manifest(config)
-    end
+class AndroidArtifactSwitcher
+  def directories
+    [
+      FilePath.android_project_root_artifacts,
+      FilePath.android_project_main_artifacts,
+      FilePath.android_project_java_artifacts,
+      FilePath.android_project_assets_artifacts
+    ]
+  end
+end
 
-    def update_strings_xml(config)
-        switcher = AndroidStringsSwitcher.new
-        switcher.update(config)
-    end
+class ThemeSwitcher
+  def initialize(brand_key)
+    @brand_key = brand_key
+  end
 
-    def switch_ios
-        BrandConfigManager.new(@brand_key).generate_ios_xcconfig
-        generate_theme_swift
-        generate_app_config_swift
-        update_xcode_project
-        BrandResourcesManager.new(@brand_key).update_ios
+  def switch(language)
+        case language
+    when Language::Dart
+      generate_dart
+    when Language::Kotlin
+      generate_kotlin
+    when Language::Swift
+      generate_swift
+    else
+      raise ArgumentError, "Invalid language: #{language}"
     end
+  end
+
+  def generate_dart
+    generate_theme('brand_theme.dart', Language::Dart, Platform::Flutter)
+  end
+
+  def generate_kotlin
+    generate_theme('BrandTheme.kt', Language::Kotlin, Platform::Android)
+  end
+
+  def generate_swift
+    generate_theme('BrandTheme.swift', Language::Swift, Platform::IOS)
+  end
+
+  private
+
+  def generate_theme(name, language, platform)
+    Solara.logger.start_step("Generate #{name} for #{platform}")
 
-    def update_xcode_project
-        Solara.logger.start_step("Update Xcode project")
-        project_path = IOSFilePathManager.instance.xcode_project
-        switcher = XcodeProjectSwitcher.new(project_path, @brand_key)
-        switcher.switch
-        Solara.logger.end_step("Update Xcode project")
+    theme_manager = ThemeGeneratorManager.new(FilePath.brand_theme(@brand_key))
+    theme_manager.generate(language, FilePath.generated_config(name, platform))
+
+    Solara.logger.end_step("Generate #{name} for #{platform}")
+  end
+end
+
+class BrandConfigSwitcher
+  def initialize(brand_key)
+    @brand_key = brand_key
+  end
+
+  def switch(language)
+        case language
+    when Language::Dart
+      generate_dart
+    when Language::Kotlin
+      generate_kotlin
+    when Language::Swift
+      generate_swift
+    else
+      raise ArgumentError, "Invalid language: #{language}"
     end
+  end
+
+  def generate_dart
+    generate_brand_config('brand_config.dart', Language::Dart, Platform::Flutter)
+  end
+
+  def generate_kotlin
+    generate_brand_config('BrandConfig.kt', Language::Kotlin, Platform::Android)
+  end
+
+  def generate_swift
+    generate_brand_config('BrandConfig.swift', Language::Swift, Platform::IOS)
+  end
+
+  private
 
+  def generate_brand_config(name, language, platform)
+    BrandConfigManager.new(@brand_key).generate_brand_config(name, language, platform)
+  end
 end