solara 0.2.0 → 0.2.2

data/solara/lib/solara_manager.rb

@@ -15,7 +15,7 @@ class SolaraManager
     def initialize
     end
 
-    def init(platform, brand_key, brand_name)
+    def init(brand_key, brand_name)
         SolaraInitializer.new(brand_key, brand_name).init
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solara
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Malek Kamel
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.1
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -152,6 +166,7 @@ files:
 - solara/lib/core/aliases/alias_generator.rb
 - solara/lib/core/aliases/alias_generator_manager.rb
 - solara/lib/core/aliases/solara_terminal_setup.rb
+- solara/lib/core/brands/brand_font_switcher.rb
 - solara/lib/core/brands/brand_onboarder.rb
 - solara/lib/core/brands/brand_switcher.rb
 - solara/lib/core/brands/brands_manager.rb
@@ -161,6 +176,7 @@ files:
 - solara/lib/core/dashboard/brand/BrandDetailController.js
 - solara/lib/core/dashboard/brand/BrandDetailModel.js
 - solara/lib/core/dashboard/brand/BrandDetailView.js
+- solara/lib/core/dashboard/brand/InfoPlistStringCatalogManager.js
 - solara/lib/core/dashboard/brand/brand.html
 - solara/lib/core/dashboard/brand/source/BrandLocalSource.js
 - solara/lib/core/dashboard/brand/source/BrandRemoteSource.js
@@ -179,10 +195,9 @@ files:
 - solara/lib/core/dashboard/dashboard_server.rb
 - solara/lib/core/dashboard/handler/base_handler.rb
 - solara/lib/core/dashboard/handler/brand_alisases_handler.rb
-- solara/lib/core/dashboard/handler/brand_configurations_handler.rb
 - solara/lib/core/dashboard/handler/brand_configurations_manager.rb
+- solara/lib/core/dashboard/handler/brand_details_handler.rb
 - solara/lib/core/dashboard/handler/brand_icon_handler.rb
-- solara/lib/core/dashboard/handler/brand_section_handler.rb
 - solara/lib/core/dashboard/handler/brands_handler.rb
 - solara/lib/core/dashboard/handler/current_brand_handler.rb
 - solara/lib/core/dashboard/handler/doctor_handler.rb
@@ -207,13 +222,13 @@ files:
 - solara/lib/core/doctor/schema/brand_configurations.json
 - solara/lib/core/doctor/schema/platform/android/android_config.json
 - solara/lib/core/doctor/schema/platform/android/android_signing.json
+- solara/lib/core/doctor/schema/platform/ios/InfoPlist.xcstrings
 - solara/lib/core/doctor/schema/platform/ios/ios_config.json
 - solara/lib/core/doctor/schema/platform/ios/ios_signing.json
+- solara/lib/core/doctor/schema/platform/shared/brand_config.json
 - solara/lib/core/doctor/schema/platform/shared/theme.json
 - solara/lib/core/doctor/validator/brand_settings_validator.rb
 - solara/lib/core/doctor/validator/brand_settings_validator_manager.rb
-- solara/lib/core/doctor/validator/directory_structure_validator.rb
-- solara/lib/core/doctor/validator/file_structure_validator.rb
 - solara/lib/core/doctor/validator/json_file_validator.rb
 - solara/lib/core/doctor/validator/json_schema_validator.rb
 - solara/lib/core/doctor/validator/project_filesystem_validator.rb
@@ -238,8 +253,10 @@ files:
 - solara/lib/core/scripts/platform/android/android_strings_switcher.rb
 - solara/lib/core/scripts/platform/android/gradle_switcher.rb
 - solara/lib/core/scripts/platform/android/properties_generator.rb
-- solara/lib/core/scripts/platform/ios/ios_file_path_manager.rb
+- solara/lib/core/scripts/platform/ios/infoplist_string_catalog_manager.rb
+- solara/lib/core/scripts/platform/ios/infoplist_switcher.rb
 - solara/lib/core/scripts/platform/ios/ios_plist_manager.rb
+- solara/lib/core/scripts/platform/ios/plist_font_manager.rb
 - solara/lib/core/scripts/platform/ios/xcconfig_generator.rb
 - solara/lib/core/scripts/platform/ios/xcode_asset_manager.rb
 - solara/lib/core/scripts/platform/ios/xcode_project_manager.rb
@@ -267,45 +284,47 @@ files:
 - solara/lib/core/template/brands/android/res/mipmap-xxhdpi/ic_launcher_round.png
 - solara/lib/core/template/brands/android/res/mipmap-xxxhdpi/ic_launcher.png
 - solara/lib/core/template/brands/android/res/mipmap-xxxhdpi/ic_launcher_round.png
+- solara/lib/core/template/brands/android/res/values/strings.xml
 - solara/lib/core/template/brands/brands.json
-- solara/lib/core/template/brands/ios/assets/.DS_Store
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/100.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/102.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/1024.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/114.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/120.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/128.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/144.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/152.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/16.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/167.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/172.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/180.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/196.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/20.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/216.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/256.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/29.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/32.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/40.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/48.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/50.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/512.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/55.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/57.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/58.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/60.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/64.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/66.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/72.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/76.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/80.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/87.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/88.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/92.png
-- solara/lib/core/template/brands/ios/assets/AppIcon.appiconset/Contents.json
+- solara/lib/core/template/brands/ios/InfoPlist.xcstrings
 - solara/lib/core/template/brands/ios/ios_config.json
 - solara/lib/core/template/brands/ios/ios_signing.json
+- solara/lib/core/template/brands/ios/xcassets/.DS_Store
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/100.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/102.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/1024.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/114.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/120.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/128.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/144.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/152.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/16.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/167.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/172.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/180.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/196.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/20.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/216.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/256.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/29.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/32.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/40.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/48.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/50.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/512.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/55.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/57.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/58.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/60.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/64.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/66.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/72.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/76.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/80.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/87.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/88.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/92.png
+- solara/lib/core/template/brands/ios/xcassets/AppIcon.appiconset/Contents.json
 - solara/lib/core/template/brands/shared/.DS_Store
 - solara/lib/core/template/brands/shared/brand_config.json
 - solara/lib/core/template/brands/shared/theme.json

data/solara/lib/core/dashboard/handler/brand_section_handler.rb

@@ -1,20 +0,0 @@
-class BrandSectionHandler < BaseHandler
-    def mount
-        @server.mount_proc("/section") do |req, res|
-            begin
-                query = CGI.parse(req.query_string)
-                path = query['path']&.first
-                if File.exist?(path)
-                    res.body = File.read(path)
-                    res['Content-Type'] = 'application/json'
-                else
-                    res.status = 404
-                    res.body = JSON.generate({ error: "Config file not found: #{path}" })
-                    res['Content-Type'] = 'application/json'
-                end
-            rescue StandardError => e
-                handle_error(res, e, "Error in brand section handler")
-            end
-        end
-    end
-end

data/solara/lib/core/doctor/validator/directory_structure_validator.rb

@@ -1,38 +0,0 @@
-Dir[File.expand_path('*.rb', __dir__)].each { |file| require_relative file }
-
-class DirectoryStructure
-    attr_reader :path, :use_glob
-
-    def initialize(path, use_glob: true)
-        @path = path
-        @use_glob = use_glob
-    end
-
-    def self.expand(pattern, use_glob: true)
-        if use_glob
-            Dir.glob(pattern).select { |path| File.directory?(path) }.map do |path|
-                DirectoryStructure.new(path, use_glob: use_glob)
-            end
-        else
-            [DirectoryStructure.new(pattern, use_glob: use_glob)]
-        end
-    end
-end
-
-class DirectoryStructureValidator < ValidationStrategy
-    def initialize(dir)
-        @dir = dir
-    end
-
-    def validate(project_path)
-        full_path = File.join(project_path, @dir.path)
-        paths = @dir.use_glob ? DirectoryStructure.expand(full_path) : [@dir]
-
-        if paths.any? { |path| File.directory?(path.path) }
-            Solara.logger.passed("Directory exists: '#{@dir.path}'")
-        else
-            raise ValidationError, "Directory missing: '#{@dir.path}'"
-        end
-    end
-
-end

data/solara/lib/core/doctor/validator/file_structure_validator.rb

@@ -1,37 +0,0 @@
-Dir[File.expand_path('*.rb', __dir__)].each { |file| require_relative file }
-
-class FileStructure
-    attr_reader :path, :use_glob
-
-    def initialize(path, use_glob: true)
-        @path = path
-        @use_glob = use_glob
-    end
-
-    def self.expand(pattern, use_glob: true)
-        if use_glob
-            Dir.glob(pattern).select { |path| File.file?(path) }.map do |path|
-                FileStructure.new(path, use_glob: use_glob)
-            end
-        else
-            [FileStructure.new(pattern, use_glob: use_glob)]
-        end
-    end
-end
-
-class FileStructureValidator < ValidationStrategy
-    def initialize(file)
-        @file = file
-    end
-
-    def validate(project_path)
-        full_path = File.join(project_path, @file.path)
-        paths = @file.use_glob ? FileStructure.expand(full_path) : [@file]
-
-        if paths.any? { |path| File.file?(path.path) }
-            Solara.logger.passed("File exists: '#{@file.path}'")
-        else
-            raise ValidationError, "File missing: '#{@file.path}'"
-        end
-    end
-end

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

@@ -1,109 +0,0 @@
-Dir.glob("#{__dir__}/*.rb").each { |file| require file }
-require 'singleton'
-require 'pathname'
-
-class IOSFilePathManager
-    include Singleton
-
-    def initialize
-        @platform = SolaraSettingsManager.instance.platform
-        @project_root = SolaraSettingsManager.instance.project_root
-    end
-
-    def xcode_project
-        path = ProjectSettingsManager.instance.value('xcodeproj', Platform::IOS)
-        File.join(@project_root, path)
-    end
-
-    def xcode_project_directory
-        Pathname.new(xcode_project).parent.to_s
-    end
-
-    def brand_assets(brand_key)
-        File.join(FilePath.brands, brand_key, FilePath.ios, 'assets')
-    end
-
-    def brand_xcconfig
-        File.join(artifacts, 'Brand.xcconfig')
-    end
-
-    def artifacts
-        case @platform
-        when Platform::Flutter
-            return File.join(@project_root, FilePath.ios, 'Flutter', 'Artifacts')
-        when Platform::IOS
-            return File.join(xcode_project_directory, 'Artifacts')
-        else
-            raise ArgumentError, "Invalid platform: #{@platform}"
-        end
-    end
-
-    def info_plist
-        path = ProjectSettingsManager.instance.value('Info.plist', Platform::IOS)
-        File.join(@project_root, path)
-    end
-
-    def assets
-        path = ProjectSettingsManager.instance.value('Assets.xcassets', Platform::IOS)
-        File.join(@project_root, path)
-    end
-
-    def assets_directory
-        File.dirname(assets)
-    end
-
-    def assets_artifacts
-        File.join(assets_directory, 'Assets.xcassets', 'Artifacts')
-    end
-
-    def assets_artifcats
-        File.join(assets, 'Artifacts')
-    end
-
-    def app_xcconfig(name)
-        case @platform
-        when Platform::Flutter
-            return File.join(@project_root, FilePath.ios, 'Flutter', name)
-        when Platform::IOS
-            return File.join(xcode_project_directory, 'XCConfig', name)
-        else
-            raise ArgumentError, "Invalid platform: #{@platform}"
-        end
-    end
-
-    def app_xcconfig_directory
-        Pathname.new(app_xcconfig('Debug.xcconfig')).parent.to_s
-    end
-
-    def brand_app_icon(brand_key)
-        File.join(FilePath.brands, brand_key, FilePath.ios, 'assets', 'AppIcon.appiconset')
-    end
-
-    def brand_app_icon_image(brand_key)
-        appicon_set_path = 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
-
-end