Solara

Solara-Kit · Sep 22, 2024 · 6530f37 · 6530f37
1 parent f2f75a5
commit 6530f37
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 3 deletions.
diff --git a/solara/lib/core/scripts/brand_resources_manager.rb b/solara/lib/core/scripts/brand_resources_manager.rb
@@ -29,14 +29,14 @@ def initialize(brand_key)
     def switch
       Solara.logger.log_step("Switch iOS resources") do
         add_to_asset_catalog
-        copy_directories(FilePath.ios_brand_assets(@brand_key), FilePath.ios_project_assets_artifacts)
+        copy_directories(FilePath.ios_brand_xcassets(@brand_key), FilePath.ios_project_assets_artifacts)
       end
     end
 
     private
 
     def add_to_asset_catalog
-      source = FilePath.ios_brand_assets(@brand_key)
+      source = FilePath.ios_brand_xcassets(@brand_key)
       destination = FilePath.ios_project_assets_artifacts
       asset_manager = XcodeAssetManager.new(destination)
       asset_manager.add(source)

diff --git a/solara/lib/core/scripts/file_path.rb b/solara/lib/core/scripts/file_path.rb
@@ -329,7 +329,7 @@ def self.launcher_icon(brand_key)
     end
 
     def self.ios_brand_app_icon(brand_key)
-        File.join(brands, brand_key, ios, 'assets', 'AppIcon.appiconset')
+        File.join(ios_brand_xcassets(brand_key), 'AppIcon.appiconset')
     end
 
     def self.ios_brand_app_icon_image(brand_key)
@@ -379,6 +379,11 @@ def self.xcode_project
         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

diff --git a/solara/lib/core/template/config/android_template_config.json b/solara/lib/core/template/config/android_template_config.json
@@ -25,6 +25,11 @@
             "target": "android/android_signing.json",
             "condition": "true"
         },
+        {
+            "source": "ios/xcassets/",
+            "target": "ios/xcassets/",
+            "condition": "true"
+        },
         {
             "source": "ios/assets/",
             "target": "ios/assets/",

diff --git a/solara/lib/core/template/config/flutter_template_config.json b/solara/lib/core/template/config/flutter_template_config.json
@@ -25,6 +25,11 @@
             "target": "android/android_signing.json",
             "condition": "true"
         },
+        {
+            "source": "ios/xcassets/",
+            "target": "ios/xcassets/",
+            "condition": "true"
+        },
         {
             "source": "ios/assets/",
             "target": "ios/assets/",

diff --git a/solara/lib/core/template/config/ios_template_config.json b/solara/lib/core/template/config/ios_template_config.json
@@ -25,6 +25,11 @@
             "target": "android/android_signing.json",
             "condition": "true"
         },
+        {
+            "source": "ios/xcassets/",
+            "target": "ios/xcassets/",
+            "condition": "true"
+        },
         {
             "source": "ios/assets/",
             "target": "ios/assets/",