solara 0.2.0 → 0.2.2

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

@@ -6,6 +6,14 @@ module FilePath
         SolaraSettingsManager.instance.project_root
     end
 
+    def self.artifacts_dir_name
+        'solara_artifacts'
+    end
+
+    def self.artifacts_dir_name_ios
+        'SolaraArtifacts'
+    end
+
     def self.root
         SolaraSettingsManager.instance.root
     end
@@ -14,6 +22,14 @@ module FilePath
         "android"
     end
 
+    def self.test_lab
+        File.join(ENV['HOME'], '.solara', 'testlab', 'src')
+    end
+
+    def self.test_lab_cache
+        File.join(ENV['HOME'], '.solara', 'testlab', 'cache')
+    end
+
     def self.android_project_root
         case SolaraSettingsManager.instance.platform
         when Platform::Flutter
@@ -63,20 +79,20 @@ module FilePath
         File.join(brands, brand_key, platform)
     end
 
-    def self.solara
-        File.join(Dir.pwd, 'solara')
-    end
-
     def self.dot_solara
-        File.join(project_root, 'solara', '.solara')
+        File.join(project_root, '.solara')
     end
 
     def self.ios
         "ios"
     end
 
+    def self.solara_brand
+        File.join(project_root, 'solara', 'brand')
+    end
+
     def self.brands
-        File.join(project_root, 'solara', 'brands')
+        File.join(project_root, 'solara', 'brand', 'brands')
     end
 
     def self.brand(brand_key)
@@ -91,6 +107,18 @@ module FilePath
         File.join(ios_brand_root(brand_key), 'ios_config.json')
     end
 
+    def self.project_infoplist_string_catalog
+        File.join(project_info_plist_directory, 'InfoPlist.xcstrings')
+    end
+
+    def self.brand_infoplist_string_catalog(brand_key)
+        File.join(ios_brand_root(brand_key), 'InfoPlist.xcstrings')
+    end
+
+    def self.brand_fonts
+        File.join(solara_brand, 'global', 'fonts')
+    end
+
     def self.brand_config(brand_key)
         File.join(brands, brand_key, 'shared', 'brand_config.json')
     end
@@ -127,26 +155,26 @@ module FilePath
     def self.generated_config(name, platform)
         case platform
         when Platform::Flutter
-            File.join(flutter_artifacts, name)
+            File.join(flutter_lib_artifacts, name)
         when Platform::Android
-            File.join(android_main_artifacts, name)
+            File.join(android_project_java_artifacts, name)
         when Platform::IOS
-            File.join(IOSFilePathManager.instance.artifacts, name)
+            File.join(ios_project_root_artifacts, name)
         else
             raise ArgumentError, "Invalid platform: #{SolaraSettingsManager.instance.platform}"
         end
     end
 
-    def self.flutter_artifacts
-        File.join(project_root, 'lib', 'artifacts')
+    def self.flutter_lib_artifacts
+        File.join(project_root, 'lib', artifacts_dir_name)
     end
 
-    def self.android_artifacts
-        File.join(android_project_root, 'artifacts')
+    def self.android_project_root_artifacts
+        File.join(android_project_root, artifacts_dir_name)
     end
 
-    def self.android_main_artifacts
-        File.join(android_project_root, 'app', 'src', 'main', 'java', 'artifacts')
+    def self.android_project_java_artifacts
+        File.join(android_project_root, 'app', 'src', 'main', 'java', artifacts_dir_name)
     end
 
     def self.android_brand_config(brand_key)
@@ -177,28 +205,32 @@ module FilePath
         File.join(android_project_root, 'app', 'src', 'main', 'assets')
     end
 
+    def self.android_project_assets_artifacts
+        File.join(android_project_assets, artifacts_dir_name)
+    end
+
     def self.android_brand_assets(brand_key)
         File.join(android_brand_root(brand_key), 'assets')
     end
 
     def self.android_generated_properties
-        File.join(android_artifacts, 'brand.properties')
+        File.join(android_project_root_artifacts, 'brand.properties')
     end
 
-    def self.android_res
+    def self.android_project_res
         File.join(android_project_root, 'app', 'src', 'main', 'res')
     end
 
-    def self.android_res_artifacts
-        File.join(android_project_root, 'app', 'src', 'main', 'artifacts')
+    def self.android_project_main_artifacts
+        File.join(android_project_root, 'app', 'src', 'main', artifacts_dir_name)
     end
 
     def self.android_artifacts_strings
-        File.join(android_res_artifacts, 'values', 'strings.xml')
+        File.join(android_project_main_artifacts, 'values', 'strings.xml')
     end
 
     def self.android_strings
-        File.join(android_project_root, 'app', 'src', 'main', 'res', 'values', 'strings.xml')
+        File.join(android_project_res, 'values', 'strings.xml')
     end
 
     def self.android_brand_res(brand_key)
@@ -206,19 +238,19 @@ module FilePath
     end
 
     def self.brand_flutter_assets(brand_key)
-        File.join(brands, brand_key, 'shared', 'assets')
+        File.join(brands, brand_key, 'flutter', 'assets')
     end
 
     def self.flutter_assets_artifacts
-        File.join(project_root, 'assets', 'artifacts')
+        File.join(project_root, 'assets', artifacts_dir_name)
     end
 
     def self.pub_spec_yaml
         File.join(project_root, 'pubspec.yaml')
     end
 
-    def self.flutter_artifacts_config
-        File.join(flutter_artifacts, 'app_config.dart')
+    def self.flutter_lib_artifacts_config
+        File.join(flutter_lib_artifacts, 'app_config.dart')
     end
 
     def self.dashboard
@@ -233,10 +265,6 @@ module FilePath
         File.join(brands, 'current_brand.json')
     end
 
-    def self.solara_template_brands(platform)
-        File.join(solara_template, 'brands', platform)
-    end
-
     def self.template_brands
         File.join(solara_template, 'brands')
     end
@@ -301,13 +329,130 @@ module FilePath
         when Platform::Android
             return android_launcher_icon(brand_key)
         when Platform::IOS
-            path = IOSFilePathManager.instance.brand_app_icon_image(brand_key)
+            path = ios_brand_app_icon_image(brand_key)
             return path
         else
             raise ArgumentError, "Invalid platform: #{SolaraSettingsManager.instance.platform}"
         end
     end
 
+    def self.ios_brand_app_icon(brand_key)
+        File.join(ios_brand_xcassets(brand_key), 'AppIcon.appiconset')
+    end
+
+    def self.ios_brand_app_icon_image(brand_key)
+        appicon_set_path = ios_brand_app_icon(brand_key)
+
+        if appicon_set_path.nil?
+            raise "Error: AppIcon.appiconset not found for brand #{brand_key}"
+        end
+
+        contents_json_path = File.join(appicon_set_path, 'Contents.json')
+
+        unless File.exist?(contents_json_path)
+            raise "Error: Contents.json not found in AppIcon.appiconset for brand #{brand_key}"
+        end
+
+        contents = JSON.parse(File.read(contents_json_path))
+
+        largest_image = contents['images'].max_by do |img|
+            size = img['size'].scan(/(\d+)x(\d+)/).first&.map(&:to_i)
+            size ? size[0] * size[1] : 0
+        end
+
+        if largest_image
+            File.join(appicon_set_path, largest_image['filename'])
+        else
+            raise "No images found in Contents.json for brand #{brand_key}"
+        end
+    end
+
+    def self.app_xcconfig(name)
+        case SolaraSettingsManager.instance.platform
+        when Platform::Flutter
+            return File.join(project_root, ios, 'Flutter', name)
+        when Platform::IOS
+            return File.join(xcode_project_directory, 'XCConfig', name)
+        else
+            raise ArgumentError, "Invalid platform: #{SolaraSettingsManager.instance.platform}"
+        end
+    end
+
+    def self.xcode_project_directory
+        Pathname.new(xcode_project).parent.to_s
+    end
+
+    def self.xcode_project
+        path = ProjectSettingsManager.instance.value('xcodeproj', Platform::IOS)
+        File.join(project_root, path)
+    end
+
+    def self.ios_brand_xcassets(brand_key)
+        File.join(brands, brand_key, ios, 'xcassets')
+    end
+
+
+    def self.ios_brand_assets(brand_key)
+        File.join(brands, brand_key, ios, 'assets')
+    end
+
+    def self.brand_xcconfig
+        File.join(ios_project_root_artifacts, 'Brand.xcconfig')
+    end
+
+    def self.ios_project_fonts
+        File.join(ios_project_root_artifacts, 'Fonts')
+    end
+
+    def self.android_project_fonts
+        File.join(android_project_main_artifacts, 'font')
+    end
+
+    def self.flutter_project_fonts
+        File.join(project_root, 'assets', 'solara_fonts')
+    end
+
+    def self.ios_project_root_artifacts
+        case SolaraSettingsManager.instance.platform
+        when Platform::Flutter
+            return File.join(project_root, ios, 'Flutter', artifacts_dir_name_ios)
+        when Platform::IOS
+            return File.join(xcode_project_directory, artifacts_dir_name_ios)
+        else
+            raise ArgumentError, "Invalid platform: #{SolaraSettingsManager.instance.platform}"
+        end
+    end
+
+    def self.project_info_plist_directory
+        Pathname.new(info_plist).parent.to_s
+    end
+
+    def self.info_plist
+        path = ProjectSettingsManager.instance.value('Info.plist', Platform::IOS)
+        File.join(project_root, path)
+    end
+
+    def self.ios_project_assets_artifacts
+        File.join(File.dirname(ios_project_xcassets), 'Assets.xcassets', artifacts_dir_name_ios)
+    end
+
+    def self.ios_project_xcassets
+        path = ProjectSettingsManager.instance.value('Assets.xcassets', Platform::IOS)
+        File.join(project_root, path)
+    end
+
+    def self.ios_project_original_app_icon
+        File.join(ios_project_xcassets, 'AppIcon.appiconset')
+    end
+
+    def self.ios_project_artifacts_assets
+        File.join(ios_project_root_artifacts, 'Assets')
+    end
+
+    def self.app_xcconfig_directory
+        Pathname.new(app_xcconfig('Debug.xcconfig')).parent.to_s
+    end
+
     def self.schema
         File.join(root, 'core', 'doctor', 'schema')
     end

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

@@ -6,14 +6,10 @@ class FolderCopier
         @destination_path = destination_path
     end
 
-    def copy(delete_if_exists: true)
-        if File.exist?(@destination_path)
-            if delete_if_exists
-                FileUtils.rm_rf(@destination_path)
-            end
-        end
-        FileUtils.mkdir_p(@destination_path)
+    def copy
+        FileUtils.mkdir_p(@destination_path) unless File.exist?(@destination_path)
         copy_files_and_folders(@source_path, @destination_path)
+        Solara.logger.debug("🚗 Copied\n\t↑ From: #{@source_path} \n\t↓ To:   #{@destination_path}")
     end
 
     private

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

@@ -4,16 +4,27 @@ class GitignoreManager
         create_gitignore_if_not_exists
     end
 
-    def self.ignore_redundant_files
-        GitignoreManager.new(FilePath.project_root)
-        .add_items([
-                       "# Generated by Solara. Ignore redundant brand specific changes.",
-                       "**/artifacts/",
-                       "**/Artifacts/",
-                       "solara/brands/current_app.json",
-                       "solara/.solara/aliases/",
-                       "solara/.solara/solara_settings.json",
-                   ])
+    def self.ignore
+        Solara.logger.start_step("Exclude Brand-Generated Files and Folders from Git")
+
+        items = [
+            "# Generated by Solara. Ignore redundant brand specific changes.",
+            "**/#{FilePath.artifacts_dir_name}/",
+            "**/#{FilePath.artifacts_dir_name_ios}/",
+            "solara/brand/brands/current_brand.json",
+            ".solara/aliases/",
+            ".solara/solara_settings.json",
+            "solara_fonts",
+         ]
+
+        if Platform.is_flutter || Platform.is_ios
+            items << FileManager.get_relative_path_to_root(FilePath.project_infoplist_string_catalog)
+            # The excluded InfoPlist.xcstrings maybe at the root. In this case we have to avoid ignoring the brands files.
+            items << '!solara/brand/brands/**/InfoPlist.xcstrings'
+        end
+
+        GitignoreManager.new(FilePath.project_root).add_items(items)
+        Solara.logger.end_step("Exclude Brand-Generated Files and Folders from Git")
     end
         
     def add_items(items)

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

@@ -34,13 +34,19 @@ class InteractiveFileSystemValidator
                     validate_required_item(item)
                 end
             else
-                ignored = %w[solara/ Artifacts/ Pods/ build/]
+                ignored = [
+                'macos/',
+                'solara/',
+                "#{FilePath.artifacts_dir_name}/",
+                "#{FilePath.artifacts_dir_name_ios}/",
+                'Pods/',
+                'build/']
 
                 root = File.join(@project_root, item_path)
                 paths = if recursive
                             FileManager.find_files_by_name(root, name)
                         else
-                            Dir.glob(File.join(root, name)).select { |path| File.file?(path) || File.directory?(path) }
+                            FileManager.find_files_and_directories(root, name)
                         end
 
                 paths = paths.map { |path| FileManager.get_relative_path(@project_root, path) }

data/solara/lib/core/scripts/platform/android/android_manifest_switcher.rb

@@ -2,8 +2,8 @@ class AndroidManifestSwitcher
     def initialize
     end
 
-    def update_manifest(config)
-        Solara.logger.start_step("Update AndroidManifest")
+    def switch(config)
+        Solara.logger.start_step("Switch AndroidManifest")
         manifest_file = FilePath.android_manifest
         if File.exist?(manifest_file)
             manifest_content = File.read(manifest_file)
@@ -13,7 +13,7 @@ class AndroidManifestSwitcher
         else
             Solara.logger.debug("❌ #{FilePath.android_manifest} not found. Skipping manifest update.")
         end
-        Solara.logger.end_step("Update AndroidManifest")
+        Solara.logger.end_step("Switch AndroidManifest")
     end
 
     private

data/solara/lib/core/scripts/platform/android/android_strings_switcher.rb

@@ -1,39 +1,41 @@
 class AndroidStringsSwitcher
-    def initialize
+    def initialize(brand_key)
+        @brand_key = brand_key
+      end
+
+    def switch
+        Solara.logger.log_step("Switch strings.xml") do
+            switch_brand_name
+            remove_original_app_name_from_strings
+        end
     end
 
-    def update(config)
-        Solara.logger.start_step("Generate artifacts/strings.xml")
-        strings_file = FilePath.android_artifacts_strings
+    private
 
-        # Create the file if it doesn't exist
-        unless File.exist?(strings_file)
-            FileUtils.mkdir_p(File.dirname(strings_file))
-        end
+    def switch_brand_name
+        brand_config_path = FilePath.brand_config(@brand_key)
+        brand_config = JSON.parse(File.read(brand_config_path))
+        strings_path = FilePath.android_artifacts_strings
+        manager = StringsXmlManager.new(strings_path)
+        app_name_value = manager.get_value('app_name')
 
-        strings_content = generate_strings_xml_content(config)
-        File.write(strings_file, strings_content)
-        Solara.logger.debug("Updated #{strings_file} with name: \"#{config['brandName']}\"")
+        # If user has specified a brandName in brand_config, we don't override it.
+        if !app_name_value.nil? && !app_name_value.empty?
+            Solara.logger.debug("App name is specified in #{strings_path}. Skipping updating from #{brand_config_path}!")
+            return
+        end
 
-        remove_app_name_from_strings
-        Solara.logger.end_step("Generate artifacts/strings.xml")
+        manager.update_string_value('app_name', brand_config['brandName'])
+        Solara.logger.debug("Updated app anme in #{strings_path} from #{brand_config_path}.")
     end
 
     # It's important to delete app_name to avoid duplicate resources
-    def remove_app_name_from_strings
+    def remove_original_app_name_from_strings
         file_path = FilePath.android_strings
+        return unless File.exist?(file_path)
+        
         manager = StringsXmlManager.new(file_path)
         manager.delete_app_name
     end
 
-    private
-
-    def generate_strings_xml_content(config)
-        <<-XML
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">#{config['brandName']}</string>
-</resources>
-        XML
-    end
 end

data/solara/lib/core/scripts/platform/android/gradle_switcher.rb

@@ -1,3 +1,4 @@
+Dir[File.expand_path('../../*.rb', __dir__)].each { |file| require_relative file }
 require 'fileutils'
 require 'json'
 
@@ -10,14 +11,14 @@ import java.util.Properties
 
     KOTLIN_PROPERTIES_LOADER = <<-KOTLIN
 val brandProperties = Properties().apply {
-    load(FileInputStream(file("../artifacts/brand.properties")))
+    load(FileInputStream(file("../#{FilePath.artifacts_dir_name}/brand.properties")))
 }
     KOTLIN
 
     GROOVY_PROPERTIES_LOADER = <<-GROOVY
 project.ext {
     brandProperties = new Properties()
-    brandProperties.load(new FileInputStream(file("../artifacts/brand.properties")))
+    brandProperties.load(new FileInputStream(file("../#{FilePath.artifacts_dir_name}/brand.properties")))
 }
     GROOVY
 
@@ -30,7 +31,7 @@ project.ext {
     KOTLIN_VERSION_CODE = 'versionCode = brandProperties.getProperty("versionCode").toInt()'
     GROOVY_VERSION_CODE = "versionCode = project.ext.brandProperties.getProperty('versionCode').toInteger()"
 
-    DEFAULT_SOURCE_SETS = %w[src/main/res src/main/artifacts]
+    DEFAULT_SOURCE_SETS = ['src/main/res', "src/main/#{FilePath.artifacts_dir_name}"]
 
     def initialize(brand_key)
         @brand_key = brand_key
@@ -39,15 +40,15 @@ project.ext {
         @source_sets = (@brand_config['sourceSets'] || []).concat(DEFAULT_SOURCE_SETS).uniq
     end
 
-    def update_build_gradle
-        Solara.logger.start_step("Update app/build.gradle")
+    def switch
+        Solara.logger.start_step("Switch app/build.gradle")
         gradle_file = FilePath.android_app_gradle
         gradle_content = File.read(gradle_file)
 
         update_gradle(gradle_file, gradle_content)
         add_source_sets(gradle_file)
         update_keystore_config(gradle_file)
-        Solara.logger.end_step("Update app/build.gradle")
+        Solara.logger.end_step("Switch app/build.gradle")
     end
 
     private

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

@@ -0,0 +1,123 @@
+require 'json'
+
+module StringCatalogUtils
+  def load_string_catalog(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]
+  end
+
+  def has_value?(data, key, language)
+    state = get_value(data, key, 'state', language)
+    value = get_value(data, key, 'value', language)
+    state != 'new' && value != ''
+  end
+end
+
+class InfoPListStringCatalogManager
+  include StringCatalogUtils
+
+  def initialize(string_catalog_path)
+    @string_catalog_path = string_catalog_path
+    @data = load_string_catalog(@string_catalog_path)
+  end
+
+  def update(result, can_remove_extra_values: true)
+
+    update_localizations(result)
+
+    remove_unused_localizations(result) if can_remove_extra_values
+
+    File.write(@string_catalog_path, JSON.pretty_generate(@data))
+  end
+
+  def source_language
+    @data['sourceLanguage']
+  end
+
+  def get(key, language: nil)
+    get_value(@data, key, 'value', language)
+  end
+
+  private
+
+  def update_localizations(result)
+    result.each do |base_key, languages|
+      next unless @data['strings'].key?(base_key)
+
+      languages.each do |lang_code, value|
+        initialize_localization(base_key, lang_code)
+        update_string_unit(base_key, lang_code, value)
+      end
+    end
+  end
+
+  def initialize_localization(base_key, lang_code)
+    @data['strings'][base_key]['localizations'][lang_code] ||= {
+      "stringUnit" => {
+        "state" => "new",
+        "value" => ""
+      }
+    }
+  end
+
+  def update_string_unit(base_key, lang_code, value)
+    state = value.empty? ? 'new' : 'translated'
+    @data['strings'][base_key]['localizations'][lang_code]['stringUnit'].merge!({
+      'state' => state,
+      'value' => value
+    })
+  end
+
+  def remove_unused_localizations(result)
+    @data['strings'].each do |base_key, data|
+      data['localizations'].each_key do |lang_code|
+        data['localizations'].delete(lang_code) unless result.dig(base_key, lang_code)
+      end
+    end
+  end
+end
+
+class InfoPListStringCatalogValidator
+  include StringCatalogUtils
+
+  def initialize(string_catalog_path)
+    @string_catalog_path = string_catalog_path
+    @data = load_string_catalog(@string_catalog_path)
+    @source_language = @data['sourceLanguage']
+  end
+
+  def validate
+    issues = []
+
+    @data['strings'].keys.each do |key|
+      languages = @data['strings'][key]['localizations'].keys
+      languages.each do |language|
+        validation_error = validate_key(key, language)
+        if validation_error
+          issues << (language == @source_language ? Issue.error(validation_error) : Issue.warning(validation_error))
+        end
+      end
+    end
+
+    issues
+  end
+
+  private
+
+  def validate_key(key, language)
+    return nil if has_value?(@data, key, language)
+
+    "The value for '#{key}' is not translated in #{@string_catalog_path}. " \
+    "To resolve this issue, please open the dashboard and update the entry for '#{key}.#{@source_language}' in section 'iOS InfoPlist.xcstrings Configuration'. " \
+    "If you prefer, you can manually add a value and mark its state as 'translated'."
+  end
+end
+
+module InfoPListKey
+  BUNDLE_NAME = 'CFBundleName'
+  BUNDLE_DISPLAY_NAME = 'CFBundleDisplayName'
+end