solara 0.2.0 → 0.2.2

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

@@ -0,0 +1,59 @@
+$LOAD_PATH.unshift(File.expand_path(__dir__))
+
+class InfoPlistSwitcher
+    def initialize(project_path, brand_key)
+        @project_path = project_path
+        @brand_key = brand_key
+        @project = Xcodeproj::Project.open(@project_path)
+    end
+
+    def switch
+        copy_string_catalog
+        update_info_plist
+        @project.save
+        Solara.logger.debug("Switched #{FilePath.info_plist} successfully.")
+    end
+
+    private
+
+    def copy_string_catalog
+        # Remove from project before copying
+        project_infoplist_string_catalog = FilePath.project_infoplist_string_catalog
+        if File.exist?(project_infoplist_string_catalog)
+            FileManager.delete_if_exists(project_infoplist_string_catalog)
+            Solara.logger.debug("Deleted #{project_infoplist_string_catalog} successfully.")
+        end
+
+        source = FilePath.brand_infoplist_string_catalog(@brand_key)
+        destination = FilePath.project_info_plist_directory
+        FolderCopier.new(source, destination).copy
+
+        # Add reference to XcodeProject
+        XcodeProjectManager.add_file_near_info_plist(@project, project_infoplist_string_catalog)
+    end
+
+    def update_info_plist
+        info_plist_path = FilePath.info_plist
+        manager = IOSPlistManager.new(@project, info_plist_path)
+        manager.set_info_plist_in_build_settings
+
+        xcconfig_values = {
+            'CFBUNDLE_DISPLAY_NAME' => "$(CFBUNDLE_DISPLAY_NAME)",
+            'CFBUNDLE_NAME' => "$(CFBUNDLE_NAME)",
+            'PRODUCT_NAME' => "$(PRODUCT_NAME)",
+            'PRODUCT_BUNDLE_IDENTIFIER' => "$(PRODUCT_BUNDLE_IDENTIFIER)",
+            'MARKETING_VERSION' => "$(MARKETING_VERSION)",
+            'BUNDLE_VERSION' => "$(BUNDLE_VERSION)"
+        }
+
+        info_plist = Xcodeproj::Plist.read_from_path(info_plist_path)
+        info_plist[InfoPListKey::BUNDLE_DISPLAY_NAME] = xcconfig_values['CFBUNDLE_DISPLAY_NAME']
+        info_plist[InfoPListKey::BUNDLE_NAME] = xcconfig_values['CFBUNDLE_NAME']
+        info_plist['CFBundleIdentifier'] = xcconfig_values['PRODUCT_BUNDLE_IDENTIFIER']
+        info_plist['CFBundleShortVersionString'] = xcconfig_values['MARKETING_VERSION']
+        info_plist['CFBundleVersion'] = xcconfig_values['BUNDLE_VERSION']
+
+        Xcodeproj::Plist.write_to_path(info_plist, info_plist_path)
+    end
+
+end

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

@@ -1,4 +1,5 @@
 require 'xcodeproj'
+require 'plist'
 
 class IOSPlistManager
     def initialize(project, info_plist_path)
@@ -6,31 +7,20 @@ class IOSPlistManager
         @info_plist_path = info_plist_path
     end
 
-    def create_and_add_info_plist
-#         add_info_plist_to_project
-        set_info_plist_in_build_settings
-        save_project
-    end
-
-    private
-
-    def add_info_plist_to_project
-        file_ref = @project.files.select { |f| f.path == @info_plist_path }.first
-        if file_ref
-            Solara.logger.debug("Info.plist file reference already exists in the project. Skipping this step.")
-        else
-            file_ref = XcodeProjectManager.new.add_single_file_to_group(@project, @project.main_group, @info_plist_path)
-            Solara.logger.debug("Info.plist file created. file_ref = #{file_ref}")
-        end
-    end
-
     def set_info_plist_in_build_settings
-        path = FileManager.get_relative_path(IOSFilePathManager.instance.xcode_project_directory, @info_plist_path)
+        path = FileManager.get_relative_path(FilePath.xcode_project_directory, @info_plist_path)
         main_target.build_configurations.each do |config|
             config.build_settings['INFOPLIST_FILE'] = path
         end
     end
 
+    def add_fonts(font_names)
+        font_manager = PlistFontManager.new(FilePath.info_plist)
+        font_manager.add_fonts(font_names)
+    end
+
+    private
+
     def save_project
         @project.save
     end
@@ -39,4 +29,5 @@ class IOSPlistManager
         @project.targets.first
     end
 
-end
+end
+

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

@@ -0,0 +1,33 @@
+class PlistFontManager
+    def initialize(plist_path)
+      @plist_path = plist_path
+      load_plist
+    end
+
+    def load_plist
+      @plist = Plist.parse_xml(@plist_path)
+      @plist['UIAppFonts'] ||= []
+    end
+
+    def add_fonts(font_names)
+        font_names.each do |font_name|
+          add_font(font_name)
+        end
+    end
+
+    def add_font(font_name)
+      unless @plist['UIAppFonts'].include?(font_name)
+        @plist['UIAppFonts'] << font_name
+        save_plist
+        Solara.logger.debug("#{font_name} added to UIAppFonts.")
+      else
+        Solara.logger.debug("#{font_name} already exists in UIAppFonts.")
+      end
+    end
+
+    def save_plist
+      File.open(@plist_path, 'w') do |file|
+        file.write(Plist::Emit.dump(@plist))
+      end
+    end
+  end

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

@@ -6,10 +6,10 @@ class XcconfigGenerator
 
     def generate
         Solara.logger.start_step("Generate Brand.xcconfig for iOS")
-        destination = IOSFilePathManager.instance.brand_xcconfig
+        destination = FilePath.brand_xcconfig
         content = generate_xcconfig_content
         File.write(destination, content)
-        Solara.logger.debug("🎉 Generated #{IOSFilePathManager.instance.brand_xcconfig}. Content below ⬇️")
+        Solara.logger.debug("🎉 Generated #{FilePath.brand_xcconfig}. Content below ⬇️")
         Solara.logger.debug("--------------\n#{content}--------------")
         Solara.logger.end_step("Generate Brand.xcconfig for iOS")
     end
@@ -18,7 +18,10 @@ class XcconfigGenerator
 
     def generate_xcconfig_content
         content = <<~XCCONFIG
-          ASSETCATALOG_COMPILER_APPICON_NAME = Artifacts/AppIcon
+          APPICON_NAME = AppIcon
+          PRODUCT_NAME = #{get_value_of(InfoPListKey::BUNDLE_DISPLAY_NAME)}
+          CFBUNDLE_DISPLAY_NAME = #{get_value_of(InfoPListKey::BUNDLE_DISPLAY_NAME)}
+          CFBUNDLE_NAME = #{get_value_of(InfoPListKey::BUNDLE_NAME)}
           #{load_config.map { |key, value| "#{key.upcase} = #{value}" }.join("\n")}
         XCCONFIG
 
@@ -37,6 +40,15 @@ class XcconfigGenerator
         end
     end
 
+    def get_value_of(key)
+        infoplist_value = InfoPListStringCatalogManager.new(FilePath.brand_infoplist_string_catalog(@brand_key)).get(key)
+        return infoplist_value if !infoplist_value && !infoplist_value.empty?
+
+        brand_config_path = FilePath.brand_config(@brand_key)
+        brand_config = JSON.parse(File.read(brand_config_path))
+        brand_config['brandName']
+    end
+
     def load_config
         config_path = FilePath.ios_config(@brand_key)
         JSON.parse(File.read(config_path))

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

@@ -6,11 +6,10 @@ class XcodeAssetManager
     @asset_catalog_path = asset_catalog_path
   end
 
-  
   def add(source)
         # Fetches only files in the specified source directory
         Dir.glob(File.join(source, '*.{png,jpg,jpeg,svg,heic,pdf}')).each do |file_path|
-            if File.file?(file_path) # Ensure it's a file and not a directory
+          if File.file?(file_path) # Ensure it's a file and not a directory
                 filename_without_extension = File.basename(file_path, File.extname(file_path))
                 add_image(filename_without_extension, file_path, '1x')
             end
@@ -51,6 +50,6 @@ class XcodeAssetManager
     # Write the updated Contents.json
     File.write(contents_json_path, JSON.pretty_generate(contents))
 
-    puts "Image '#{image_name}' added successfully at scale #{scale}."
+    Solara.logger.debug("XcodeAssetManager: Image '#{image_name}' added successfully at scale #{scale}.")
   end
 end

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

@@ -64,7 +64,6 @@ class XcodeProjectManager
 
         Solara.logger.debug("Base XCConfig files have been set for all build configurations.")
     end
-
     def self.set_xcconfig(project, config, xcconfig)
         # Find the existing file reference or create a new one if it doesn't exist
         file_reference = project.reference_for_path(xcconfig[:path])
@@ -79,4 +78,84 @@ class XcodeProjectManager
         end
     end
 
+    def add_file_to_root(project, file_path)
+        Solara.logger.debug("Adding file to root: #{file_path}")
+
+        root_group = project.main_group
+        file_name = File.basename(file_path, File.extname(file_path))
+
+        existing_file = root_group.files.find { |f| File.basename(f.path, File.extname(f.path))&.downcase == file_name.downcase }
+
+        if existing_file
+            Solara.logger.debug("Ignoring file: #{file_path} (Existing file reference: #{existing_file.path})")
+            return nil
+        else
+            file_reference = root_group.new_file(file_path)
+            Solara.logger.debug("Added new file to root: #{file_path} (File reference: #{file_reference.uuid})")
+
+            # Add the file to the project's main target if it's a source file
+            if %w[.swift .m .mm .c .cpp].include?(File.extname(file_path).downcase)
+                target = project.targets.first
+                target.add_file_references([file_reference])
+                Solara.logger.debug("  Added to target: #{target.name}")
+            end
+
+            file_reference
+        end
+    end
+
+    def self.add_file_near_info_plist(project, file_path)
+        Solara.logger.debug("Adding file near Info.plist: #{file_path}")
+
+        # Find the Info.plist file path
+        info_plist_path = project.targets.first.build_configurations.first.build_settings['INFOPLIST_FILE']
+        return Solara.logger.warn("No Info.plist file found for the target") unless info_plist_path
+
+        # Get the directory of the Info.plist file
+        info_plist_dir = File.dirname(info_plist_path)
+
+        target_file_path = File.basename(file_path)
+        infoplist_group = info_plist_dir === '.' ? project.main_group : find_group_by_path(project, [info_plist_dir])
+
+        # Check if a file with the same name already exists in the target directory
+        existing_file = infoplist_group.files.find { |f| f.path == target_file_path }
+
+        if existing_file
+          Solara.logger.debug("Ignoring file: #{file_path} (Existing file reference: #{existing_file.path})")
+          return nil
+        else
+          # Add the file to the main group, which corresponds to the directory of Info.plist
+          file_reference = infoplist_group.new_file(target_file_path)
+          Solara.logger.debug("Added new file near Info.plist: #{file_path} (File reference: #{file_reference.uuid})")
+
+          # Add the file to the project's main target as a resource
+          target = project.targets.first
+
+          # Create a new build file
+          build_file = project.new(Xcodeproj::Project::Object::PBXBuildFile)
+          build_file.file_ref = file_reference
+
+          # Add the build file to the target's resources build phase
+          resources_build_phase = target.resources_build_phase
+          resources_build_phase.add_file_reference(file_reference)
+
+          Solara.logger.debug("  Added to target: #{target.name}")
+          Solara.logger.debug("  Added to PBXBuildFile section as a resource")
+
+          file_reference
+        end
+      end
+def self.find_group_by_path(project, paths)
+    current_group = project.main_group
+
+    paths.each do |path|
+        current_group = current_group.children.find { |child|
+            child.is_a?(Xcodeproj::Project::Object::PBXGroup) && child.path == path
+        }
+        return nil unless current_group
+    end
+    current_group
+  end
+
+
 end

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

@@ -11,11 +11,10 @@ class XcodeProjectSwitcher
 
     def switch
         update_xcode_target_settings
-        update_info_plist
         add_artifacts_group
         update_debug_and_release_xcconfig
         @project.save
-        Solara.logger.debug("Updated #{@project_path} to use the values of #{IOSFilePathManager.instance.brand_xcconfig}")
+        Solara.logger.debug("Switched #{@project_path} Successfully.")
     end
 
     private
@@ -23,8 +22,9 @@ class XcodeProjectSwitcher
     def update_xcode_target_settings
         @target.build_configurations.each do |config|
             config.build_settings['PRODUCT_BUNDLE_IDENTIFIER'] = '$(PRODUCT_BUNDLE_IDENTIFIER)'
-            config.build_settings['PRODUCT_NAME'] = '$(PRODUCT_NAME)'
             config.build_settings['MARKETING_VERSION'] = '$(MARKETING_VERSION)'
+            config.build_settings['ASSETCATALOG_COMPILER_APPICON_NAME'] = '$(APPICON_NAME)'
+            config.build_settings['PRODUCT_NAME'] = '$(PRODUCT_NAME)'
 
             # We need to apply code signing only if the user has provided its config
             path = FilePath.brand_signing(@brand_key, Platform::IOS)
@@ -47,30 +47,9 @@ class XcodeProjectSwitcher
         end
     end
 
-    def update_info_plist
-        info_plist_path = IOSFilePathManager.instance.info_plist
-        manager = IOSPlistManager.new(@project, info_plist_path)
-        manager.create_and_add_info_plist
-
-        xcconfig_values = {
-            'PRODUCT_NAME' => "$(PRODUCT_NAME)",
-            'PRODUCT_BUNDLE_IDENTIFIER' => "$(PRODUCT_BUNDLE_IDENTIFIER)",
-            'MARKETING_VERSION' => "$(MARKETING_VERSION)",
-            'BUNDLE_VERSION' => "$(BUNDLE_VERSION)"
-        }
-
-        info_plist = Xcodeproj::Plist.read_from_path(info_plist_path)
-        info_plist['CFBundleDisplayName'] = xcconfig_values['PRODUCT_NAME']
-        info_plist['CFBundleIdentifier'] = xcconfig_values['PRODUCT_BUNDLE_IDENTIFIER']
-        info_plist['CFBundleShortVersionString'] = xcconfig_values['MARKETING_VERSION']
-        info_plist['CFBundleVersion'] = xcconfig_values['BUNDLE_VERSION']
-
-        Xcodeproj::Plist.write_to_path(info_plist, info_plist_path)
-    end
-
     def update_debug_and_release_xcconfig
-        debug_xcconfig_path = IOSFilePathManager.instance.app_xcconfig('Debug.xcconfig')
-        release_xcconfig_path = IOSFilePathManager.instance.app_xcconfig('Release.xcconfig')
+        debug_xcconfig_path = FilePath.app_xcconfig('Debug.xcconfig')
+        release_xcconfig_path = FilePath.app_xcconfig('Release.xcconfig')
 
         create_xcconfigs_and_add_to_project(debug_xcconfig_path, release_xcconfig_path)
         set_base_xcconfigs(debug_xcconfig_path, release_xcconfig_path)
@@ -78,7 +57,7 @@ class XcodeProjectSwitcher
 
     def create_xcconfigs_and_add_to_project(debug_xcconfig_path, release_xcconfig_path)
         FileManager.create_files_if_not_exist([debug_xcconfig_path, release_xcconfig_path])
-        base_xcconfig_name = 'Artifacts/Brand.xcconfig'
+        base_xcconfig_name = "#{FilePath.artifacts_dir_name_ios}/Brand.xcconfig"
 
         case @platform
         when Platform::Flutter
@@ -87,7 +66,7 @@ class XcodeProjectSwitcher
             group_name = 'XCConfig'
             config_group = @project.groups.find { |group| group.name == group_name }
             config_group = @project.new_group(group_name) if config_group.nil?
-            add_files_to_group(config_group, IOSFilePathManager.instance.app_xcconfig_directory)
+            add_files_to_group(config_group, FilePath.app_xcconfig_directory)
         else
             raise ArgumentError, "Invalid platform: #{@platform}"
         end
@@ -108,16 +87,18 @@ class XcodeProjectSwitcher
     end
 
     def add_artifacts_group
+        artifacts_dir_name = FilePath.artifacts_dir_name_ios
+        
         case @platform
         when Platform::Flutter
             flutter_group = @project.groups.find { |group| group.name == 'Flutter' }
-            artifacts_group = flutter_group.groups.find { |group| group.name == 'Artifacts' }
-            artifacts_group = flutter_group.new_group("Artifacts") if artifacts_group.nil?
-            add_files_to_group(artifacts_group, IOSFilePathManager.instance.artifacts)
+            artifacts_group = flutter_group.groups.find { |group| group.name == artifacts_dir_name }
+            artifacts_group = flutter_group.new_group(artifacts_dir_name) if artifacts_group.nil?
+            add_files_to_group(artifacts_group, FilePath.ios_project_root_artifacts)
         when Platform::IOS
-            artifacts_group = @project.groups.find { |group| group.name == 'Artifacts' }
-            artifacts_group = @project.new_group("Artifacts") if artifacts_group.nil?
-            add_files_to_group(artifacts_group, IOSFilePathManager.instance.artifacts)
+            artifacts_group = @project.groups.find { |group| group.name == artifacts_dir_name }
+            artifacts_group = @project.new_group(artifacts_dir_name) if artifacts_group.nil?
+            add_files_to_group(artifacts_group, FilePath.ios_project_root_artifacts)
         else
             raise ArgumentError, "Invalid platform: #{@platform}"
         end

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

@@ -24,6 +24,10 @@ class SolaraLogger
         set_default_format
     end
 
+    def reset_steps
+        @step_count = 0
+    end
+
     def verbose=(value)
         @verbose = value
         @logger.level = @verbose ? Logger::DEBUG : Logger::INFO
@@ -43,6 +47,12 @@ class SolaraLogger
         line
     end
 
+    def log_step(step_name)
+        start_step(step_name)
+        yield
+        end_step(step_name)
+      end
+
     def title(message)
         @logger.info(message.green)
         line

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

@@ -6,7 +6,11 @@ require 'json'
 class SolaraSettingsManager
     include Singleton
 
-    attr_accessor :root, :project_root
+    attr_accessor :root, :project_root, :environment
+
+    def initialize
+        @environment = SolaraEnvironment::Production
+    end
 
     def platform
         settings['platform']
@@ -28,6 +32,10 @@ class SolaraSettingsManager
         save(json)
     end
 
+    def is_test_environment
+        @environment === 'test'
+    end
+
     private
 
     def settings
@@ -70,4 +78,21 @@ def init(platform)
     unless Platform.all.include?(platform)
         raise ArgumentError, "Invalid platform. Please use one of: #{Platform.all.join(', ')}"
     end
+end
+
+module SolaraEnvironment
+    Production = 'production'
+    Test = 'test'
+
+    def self.all
+        [Production, Test]
+    end
+
+    def self.is_production
+        SolaraSettingsManager.instance.environment.downcase == Production.downcase
+    end
+
+    def self.is_test
+        SolaraSettingsManager.instance.environment.downcase == Test.downcase
+    end
 end

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

@@ -3,7 +3,7 @@ require 'rexml/document'
 class StringsXmlManager
   def initialize(file_path)
     @file_path = file_path
-    @xml_content = File.read(@file_path)
+    @xml_content = File.read(@file_path, encoding: 'UTF-8')
     @doc = REXML::Document.new(@xml_content)
   end
 
@@ -11,7 +11,22 @@ class StringsXmlManager
     app_name_element = @doc.elements['resources/string[@name="app_name"]']
     app_name_element.remove if app_name_element
     save_changes
-    Solara.logger.debug("Removed app_name from #{@file_path} to avoid duplication with artifacts/strings.xml.")
+    Solara.logger.debug("Removed app_name from #{@file_path} to avoid duplication with #{FilePath.artifacts_dir_name}/strings.xml.")
+  end
+
+  def update_string_value(string_name, new_value)
+    string_element = @doc.elements["resources/string[@name=\"#{string_name}\"]"]
+    if string_element
+      string_element.text = new_value
+      save_changes
+      Solara.logger.debug("Updated string '#{string_name}' to '#{new_value}' in #{@file_path}.")
+    else
+      Solara.logger.warn("String '#{string_name}' not found in #{@file_path}. Update failed.")
+    end
+  end
+
+  def get_value(string_name)
+    @doc.elements["resources/string[@name=\"#{string_name}\"]"].text 
   end
 
   private