solara 0.2.0 → 0.2.1

data/solara/lib/core/doctor/validator/template/flutter_template_validation_config.yml

@@ -2,10 +2,17 @@ structure:
     android:
         type: directory
         contents:
-            assets:
-                type: directory
             res:
                 type: directory
+                contents:
+                    values:
+                        type: directory
+                        contents:
+                            strings.xml:
+                                type: file
+                                validations:
+                                    - type: content_includes
+                                      value: <string name="app_name">
             android_config.json:
                 type: file
                 validations:
@@ -21,8 +28,6 @@ structure:
     ios:
         type: directory
         contents:
-            assets:
-                type: directory
             ios_config.json:
                 type: file
                 validations:
@@ -35,15 +40,26 @@ structure:
                     - type: valid_json
                     - type: json_schema
                       schema_path: platform/ios/ios_signing.json
+            InfoPlist.xcstrings:
+                type: file
+                validations:
+                    - type: valid_json
+                    - type: json_schema
+                      schema_path: platform/ios/InfoPlist.xcstrings
+            xcassets:
+                type: directory
+                contents:
+                    AppIcon.appiconset:
+                        type: directory
     shared:
         type: directory
         contents:
-            assets:
-                type: directory
             brand_config.json:
                 type: file
                 validations:
                     - type: valid_json
+                    - type: json_schema
+                      schema_path: platform/shared/brand_config.json
             theme.json:
                 type: file
                 validations:

data/solara/lib/core/doctor/validator/template/ios_template_validation_config.yml

@@ -2,10 +2,17 @@ structure:
     android:
         type: directory
         contents:
-            assets:
-                type: directory
             res:
                 type: directory
+                contents:
+                    values:
+                        type: directory
+                        contents:
+                            strings.xml:
+                                type: file
+                                validations:
+                                    - type: content_includes
+                                      value: <string name="app_name">
             android_config.json:
                 type: file
                 validations:
@@ -21,8 +28,6 @@ structure:
     ios:
         type: directory
         contents:
-            assets:
-                type: directory
             ios_config.json:
                 type: file
                 validations:
@@ -35,6 +40,17 @@ structure:
                     - type: valid_json
                     - type: json_schema
                       schema_path: platform/ios/ios_signing.json
+            InfoPlist.xcstrings:
+                type: file
+                validations:
+                    - type: valid_json
+                    - type: json_schema
+                      schema_path: platform/ios/InfoPlist.xcstrings
+            xcassets:
+                type: directory
+                contents:
+                    AppIcon.appiconset:
+                        type: directory
     shared:
         type: directory
         contents:
@@ -42,6 +58,8 @@ structure:
                 type: file
                 validations:
                     - type: valid_json
+                    - type: json_schema
+                      schema_path: platform/shared/brand_config.json
             theme.json:
                 type: file
                 validations:

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

@@ -184,6 +184,7 @@ class BrandConfigGenerator
             end
         when 'kotlin'
             case type
+            when 'Bool' then 'Boolean'
             when 'Array<String>' then 'List<String>'
             when 'Array<Int>' then 'List<Int>'
             when 'Array<Double>' then 'List<Double>'

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

@@ -10,7 +10,7 @@ class BrandConfigManager
         name,
         language,
         platform)
-        Solara.logger.start_step("Generate #{language} brand config for #{platform}")
+        Solara.logger.start_step("Generate #{name} for #{platform}")
         config = load_config(FilePath.brand_config(@brand_key))
         add_basic_brand_info(config, platform)
         config_generator = BrandConfigGenerator.new(
@@ -20,7 +20,7 @@ class BrandConfigManager
             platform
         )
         config_generator.generate
-        Solara.logger.end_step("Generate #{language} brand config for #{platform}")
+        Solara.logger.end_step("Generate #{name} for #{platform}")
     end
 
     def generate_android_properties
@@ -52,7 +52,6 @@ class BrandConfigManager
     def add_android_info(config, prefix: '')
         android_config = load_config(FilePath.android_config(@brand_key))
         config_mappings = {
-            'brandName' => 'BrandName',
             'applicationId' => 'ApplicationId',
             'versionName' => 'VersionName',
             'versionCode' => 'VersionCode'
@@ -64,7 +63,6 @@ class BrandConfigManager
     def add_ios_info(config, prefix: '')
         ios_config = load_config(FilePath.ios_config(@brand_key))
         config_mappings = {
-            'PRODUCT_NAME' => 'ProductName',
             'PRODUCT_BUNDLE_IDENTIFIER' => 'BundleIdentifier',
             'MARKETING_VERSION' => 'MarketingVersion',
             'BUNDLE_VERSION' => 'BundleVersion'

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

@@ -19,7 +19,7 @@ class BrandExporter
     private
 
     def export(brand_key, directory)
-        if BrandsManager.instance.find(brand_key).nil?
+        unless BrandsManager.instance.exists(brand_key)
             Solara.logger.failure("#{brand_key} doesn't exist!")
             return
         end

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

@@ -8,7 +8,6 @@ class BrandImporter
         configurations_paths.each do |path|
             import(path)
         end
-
     end
 
     private
@@ -46,14 +45,14 @@ class BrandImporter
         brand_path = FilePath.brand(brand_key)
 
         configurations_json['configurations'].each do |configuration|
-            file_name = "#{configuration['key']}.json"
+            file_name = configuration['key']
             file_path = find_file_in_subdirectories(brand_path, file_name)
 
             # Create or replace the contents of the configuration file
             if file_path
                 File.write(file_path, JSON.pretty_generate(configuration['content']))
             else
-                Solara.logger.failure("File #{file_name} not found in #{brand_path}, ignoring it!")
+                Solara.logger.failure("File #{file_name} not found in #{brand_path}, ignoring importing it!")
             end
         end
     end

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

@@ -1,6 +1,11 @@
 class BrandOffboarder
 
     def offboard(brand_key, confirm: true)
+        unless BrandsManager.instance.exists(brand_key)
+            Solara.logger.fatal("Brnad key #{brand_key} doesn't exist!")
+            return
+        end
+
         if confirm
             Solara.logger.warn("Are you sure you need to offboard #{brand_key} and delete all its configurations? (y/n)")
             confirmation = STDIN.gets.chomp.downcase

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

@@ -1,77 +1,150 @@
 require 'fileutils'
-require_relative 'file_manager'
-require_relative 'yaml_manager'
 
-class BrandResourcesManager
+  class BrandResourcesSwitcher
+
     def initialize(brand_key)
-        @brand_key = brand_key
+      @brand_key = brand_key
+    end
+
+    def switch(platform)
+      case platform
+      when Platform::Flutter
+        FlutterResourcesSwitcher.new(@brand_key).switch
+        AndroidResourcesSwitcher.new(@brand_key).switch
+        IOSResourcesSwitcher.new(@brand_key).switch
+      when Platform::Android
+        AndroidResourcesSwitcher.new(@brand_key).switch
+      when Platform::IOS
+        IOSResourcesSwitcher.new(@brand_key).switch
+      else
+          raise ArgumentError, "Invalid platform: #{platform}"
+      end
+    end
+  end
+
+  class IOSResourcesSwitcher
+
+    def initialize(brand_key)
+      @brand_key = brand_key
+    end
+
+    def switch
+        Solara.logger.log_step("Switch iOS resources") do
+          add_raw_assets_to_asset_catalog
+
+          copy_directories_not_files(FilePath.ios_brand_xcassets(@brand_key), FilePath.ios_project_assets_artifacts)
+
+          switch_brand_name
+
+          copy_solara_assets
+
+          remove_original_app_icon
+        end
+    end
+
+    private
+
+    def switch_brand_name
+      brand_config_path = FilePath.brand_config(@brand_key)
+      brand_config = JSON.parse(File.read(brand_config_path))
+      brand_name = brand_config['brandName']
+
+      manager = InfoPListStringCatalogManager.new(FilePath.project_infoplist_string_catalog)
+      source_language = manager.source_language
+      data = {
+        "CFBundleDisplayName" => {
+          source_language => brand_name
+        },
+        "CFBundleName" => {
+          source_language => brand_name
+        }
+      }
+      manager.update(data, can_remove_extra_values: false)
+
+      Solara.logger.debug("Updated app anme in #{FilePath.project_infoplist_string_catalog} from #{brand_config_path}.")
     end
 
-    require 'fileutils'
 
-    def update_ios
-        Solara.logger.start_step("Update iOS resources")
-        source = IOSFilePathManager.instance.brand_assets(@brand_key)
-        destination = IOSFilePathManager.instance.assets_artifacts
-        FileManager.delete_if_exists(destination)
+    def copy_solara_assets
+      source = FilePath.ios_brand_assets(@brand_key)
+      destination = FilePath.ios_project_artifacts_assets
 
-        # Copy images and set the Content.json for each one
-        add_to_asset_catalog
+      return unless File.exist?(source)
 
-        # Copy all folders only in source to destination
-        Dir.glob("#{source}/*").each do |item|
-            if File.directory?(item)
-                FileUtils.cp_r(item, destination)
-            end
+      FolderCopier.new(source, destination).copy
+    end
+
+    def add_raw_assets_to_asset_catalog
+      source = FilePath.ios_brand_xcassets(@brand_key)
+      destination = FilePath.ios_project_assets_artifacts
+      asset_manager = XcodeAssetManager.new(destination)
+      asset_manager.add(source)
+    end
+
+    def copy_directories_not_files(source, destination)
+      Dir.glob("#{source}/*").each do |item|
+        if File.directory?(item)
+          destination_path = File.join(destination, File.basename(item))
+          FolderCopier.new(item, destination_path).copy
         end
+      end
+    end
 
-        Solara.logger.end_step("Update iOS resources")
+    def remove_original_app_icon
+      FileManager.delete_if_exists(FilePath.ios_project_original_app_icon)
     end
+  end
 
-    def add_to_asset_catalog
-        source = IOSFilePathManager.instance.brand_assets(@brand_key)
-        destination = IOSFilePathManager.instance.assets_artifacts
-        asset_manager = XcodeAssetManager.new(destination)
-        asset_manager.add(source)
+  class AndroidResourcesSwitcher
+
+    def initialize(brand_key)
+      @brand_key = brand_key
     end
 
-    def update_android
-        Solara.logger.start_step("Update Android resources")
+    def switch
+      Solara.logger.log_step("Switch Android resources") do
         FileManager.new.copy_files_recursively(
-            FilePath.android_brand_res(@brand_key),
-            FilePath.android_res_artifacts)
+          FilePath.android_brand_res(@brand_key),
+          FilePath.android_project_main_artifacts
+        )
 
-        assets_artifacts = File.join(FilePath.android_project_assets, 'artifacts')
-        FileManager.delete_if_exists(assets_artifacts)
+        AndroidStringsSwitcher.new(@brand_key).switch
+
+        assets_artifacts = FilePath.android_project_assets_artifacts
 
         FileManager.new.copy_files_recursively(
-            FilePath.android_brand_assets(@brand_key),
-            assets_artifacts)
+          FilePath.android_brand_assets(@brand_key),
+          assets_artifacts
+        )
 
-        # Delete the original launcher icons to fix duplicate resources
-        FileManager.new.delete_folders_by_prefix(FilePath.android_res, 'mipmap')
-        Solara.logger.end_step("Update Android resources")
+        FileManager.new.delete_folders_by_prefix(FilePath.android_project_res, 'mipmap')
+      end
     end
 
-    def update_flutter
-        Solara.logger.start_step("Update Flutter resources")
-        case SolaraSettingsManager.instance.platform
-        when Platform::Flutter
-            YamlManager.new(FilePath.pub_spec_yaml).add_to_nested_array(
-                'flutter',
-                'assets',
-                'assets/artifacts/')
-
-            destination = FilePath.flutter_assets_artifacts
-            FileManager.delete_if_exists(destination)
-
-            FileManager.new.copy_files_recursively(
-                FilePath.brand_flutter_assets(@brand_key),
-                destination)
-        else
-            # Nothing
-        end
+  end
+
+  class FlutterResourcesSwitcher
+
+      def initialize(brand_key)
+        @brand_key = brand_key
+      end
 
-        Solara.logger.end_step("Update Flutter resources")
+    def switch
+      return unless Platform.is_flutter
+
+      Solara.logger.log_step("Switch Flutter resources") do
+        YamlManager.new(FilePath.pub_spec_yaml).add_to_nested_array(
+          'flutter',
+          'assets',
+          "assets/#{FilePath.artifacts_dir_name}/"
+        )
+
+        destination = FilePath.flutter_assets_artifacts
+
+        FileManager.new.copy_files_recursively(
+          FilePath.brand_flutter_assets(@brand_key),
+          destination
+        )
+      end
     end
-end
+  end

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

@@ -10,12 +10,12 @@ class DirectoryCreator
     def self.create_directory(dir, delete_if_exists)
         if Dir.exist?(dir)
             if delete_if_exists
-                FileUtils.rm_rf(dir)
+                FileManager.delete_if_exists(dir)
                 Solara.logger.debug("🧹 Deleted directory: #{dir}")
                 Dir.mkdir(dir)
             end
         else
-            Dir.mkdir(dir)
+            FileUtils.mkdir_p(dir)
         end
         Solara.logger.debug("✨  Created directory: #{dir}")
     end

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

@@ -2,34 +2,39 @@ require 'find'
 
 class FileManager
     def copy_files_recursively(source_dir, destination_dir)
-        if Dir.exist?(source_dir)
-            Dir.glob(File.join(source_dir, '*')).each do |item|
-                relative_path = Pathname.new(item).relative_path_from(Pathname.new(source_dir)).to_s
-                destination_path = File.join(destination_dir, relative_path)
-
-                if File.directory?(item)
-                    FileUtils.mkdir_p(destination_path)
-                    FileUtils.cp_r(File.join(item, '.'), destination_path)
-                else
-                    FileUtils.mkdir_p(File.dirname(destination_path))
-                    FileUtils.cp(item, destination_path)
-                end
-
-                Solara.logger.debug("🚗 Copied #{relative_path} \n\t↖️From: #{source_dir} \n\t↗️To: #{destination_dir}")
+        source_path = Pathname.new(source_dir).expand_path
+        destination_path = Pathname.new(destination_dir).expand_path
+
+        if Dir.exist?(source_path)
+          Dir.glob(source_path.join('*')).each do |item|
+            relative_path = Pathname.new(item).relative_path_from(source_path).to_s
+            destination_item_path = destination_path.join(relative_path)
+
+            if File.directory?(item)
+              FileUtils.mkdir_p(destination_item_path)
+              FileUtils.cp_r(item + '/.', destination_item_path) # Ensure to copy contents
+            else
+              FileUtils.mkdir_p(destination_item_path.dirname) # Create parent directory
+              FileUtils.cp(item, destination_item_path)
             end
+
+            Solara.logger.debug("🚗 Copied #{relative_path} \n\t↑ From: #{source_path} \n\t↓ To:   #{destination_path}")
+          end
         else
-            Solara.logger.failure("#{source_dir} not found in Solara")
+          Solara.logger.failure("#{source_path} not found!")
         end
-    end
+      end
 
     def delete_folders_by_prefix(directory, folder_prefix)
         # Get a list of all folders in the directory
-        folders = Dir.entries(directory).select { |entry| File.directory?(File.join(directory, entry)) && entry.start_with?(folder_prefix) }
+        folders = Dir.entries(directory).select { |entry|
+            File.directory?(File.join(directory, entry)) && entry.start_with?(folder_prefix)
+        }
 
         # Delete each folder
         folders.each do |folder|
             folder_path = File.join(directory, folder)
-            FileUtils.rm_rf(folder_path)
+            FileManager.delete_if_exists(folder_path)
             Solara.logger.debug("🧹 Deleted folder: #{folder_path}")
         end
     end
@@ -63,7 +68,36 @@ class FileManager
     end
 
     def self.find_files_by_name(directory, filename)
-        Dir.glob(File.join(directory, "**", filename)).to_a
+        # Ensure proper path formatting
+        directory = File.expand_path(directory)
+
+        # Generate the search pattern
+        pattern = File.join(directory, "**", filename)
+
+        # Output the pattern for debugging
+        Solara.logger.debug("Searching for: #{pattern}")
+
+        # Find and return matching files
+        Dir.glob(pattern).to_a
+      end
+
+    def self.find_files_and_directories(root, name)
+      # Ensure proper path formatting
+      root = File.expand_path(root)
+
+      # Generate the search pattern
+      pattern = File.join(root, name)
+
+      # Output the pattern for debugging
+      Solara.logger.debug("Searching for: #{pattern}")
+
+      # Use Dir.glob to find files and directories
+      results = Dir.glob(pattern).select { |path| File.file?(path) || File.directory?(path) }
+
+      # Output results for debugging
+      Solara.logger.debug("Found: #{results}")
+
+      results
     end
 
     def self.get_relative_path(root_dir, sub_dir)