solara 0.4.0 → 0.5.0

data/solara/lib/core/template/brands/json/Json-Manifest.md

@@ -0,0 +1,61 @@
+# JSON Structure and Usage
+
+JSON manifest enables the generation of platform-specific code based on the provided JSON files. This enhancement
+streamlines the development process and ensures better code organization for different platforms.
+
+Each JSON file will be transformed into a class within the `solara_artifacts` directory.
+
+You can place your JSON files in the following directories:
+
+- `brands/BRAND/android/json`
+- `brands/BRAND/ios/json`
+- `brands/BRAND/flutter/json`
+- `brands/global/json`
+
+## The Manifest File
+
+Each directory contains a `json_manifest.json` file with the following structure:
+
+```json
+{
+    "files": [
+        {
+            "fileName": "",
+            "generate": {
+                "enabled": true,
+                "className": "",
+                "customClassNames": [
+                    {
+                        "generatedName": "",
+                        "customName": ""
+                    }
+                ]
+            }
+        }
+    ]
+}
+```
+
+### Property Descriptions
+
+- **files**: An array containing objects that define the JSON files to be processed.
+
+    - **fileName**: The name of the JSON file. This should include the file extension (e.g., `config.json`).
+
+    - **generate**: An object that specifies whether to generate a class for the JSON file and the details for that
+      class.
+
+        - **enabled**: A boolean value that indicates if class generation is enabled for this file. If set to `true`, a
+          class will be created based on the JSON structure.
+
+        - **className**: The name of the class that will be generated from the JSON file. This is typically derived from
+          the `fileName`.
+
+        - **customClassNames**: An array of objects that allow you to specify custom names for generated classes.
+
+            - **generatedName**: The name of the class as it would be generated by default.
+
+            - **customName**: The custom name you want to assign to the generated class instead of the default
+              `generatedName`. This is useful for maintaining consistency or aligning with existing naming conventions
+              in your codebase.
+

data/solara/lib/core/template/brands/json/json_manifest.json

@@ -0,0 +1,18 @@
+{
+    "description": "This file specifies the JSON files that can be optionally generated for the target platform code.",
+    "files": [
+        {
+            "fileName": "",
+            "generate": {
+                "enabled": true,
+                "className": "",
+                "customClassNames": [
+                    {
+                        "generatedName": "",
+                        "customName": ""
+                    }
+                ]
+            }
+        }
+    ]
+}

data/solara/lib/core/template/brands/shared/theme.json

@@ -1,46 +1,230 @@
 {
   "name": "BrandTheme",
   "version": "1.0.0",
-  "colors": {
-    "primary": "#007AFF",
-    "secondary": "#5AC8FA",
-    "background": "#FFFFFF",
-    "surface": "#F2F2F7",
-    "error": "#FF3B30",
-    "onPrimary": "#FFFFFF",
-    "onSecondary": "#000000",
-    "onBackground": "#000000",
-    "onSurface": "#000000",
-    "onError": "#FFFFFF"
+  "colorSchemes": {
+    "light": {
+      "primary": "#6750A4",
+      "onPrimary": "#FFFFFF",
+      "primaryContainer": "#EADDFF",
+      "onPrimaryContainer": "#21005D",
+      "secondary": "#625B71",
+      "onSecondary": "#FFFFFF",
+      "secondaryContainer": "#E8DEF8",
+      "onSecondaryContainer": "#1D192B",
+      "tertiary": "#7D5260",
+      "onTertiary": "#FFFFFF",
+      "tertiaryContainer": "#FFD8E4",
+      "onTertiaryContainer": "#31111D",
+      "error": "#B3261E",
+      "onError": "#FFFFFF",
+      "errorContainer": "#F9DEDC",
+      "onErrorContainer": "#410E0B",
+      "background": "#FFFBFE",
+      "onBackground": "#1C1B1F",
+      "surface": "#FFFBFE",
+      "onSurface": "#1C1B1F",
+      "surfaceVariant": "#E7E0EC",
+      "onSurfaceVariant": "#49454F",
+      "outline": "#79747E",
+      "outlineVariant": "#CAC4D0",
+      "shadow": "#000000",
+      "scrim": "#000000",
+      "inverseSurface": "#313033",
+      "inverseOnSurface": "#F4EFF4",
+      "inversePrimary": "#D0BCFF",
+      "surfaceDim": "#DED8E1",
+      "surfaceBright": "#FFFBFE",
+      "surfaceTint": "#F0F0F0",
+      "surfaceContainerLowest": "#FFFFFF",
+      "surfaceContainerLow": "#F7F2FA",
+      "surfaceContainer": "#F3EDF7",
+      "surfaceContainerHigh": "#ECE6F0",
+      "surfaceContainerHighest": "#E6E0E9",
+      "primaryFixed": "#6A5ACD",
+      "primaryFixedDim": "#5B4B9A",
+      "onPrimaryFixed": "#FFFFFF",
+      "onPrimaryFixedVariant": "#21005D",
+      "secondaryFixed": "#7A6A8A",
+      "secondaryFixedDim": "#6B5B71",
+      "onSecondaryFixed": "#FFFFFF",
+      "onSecondaryFixedVariant": "#2C2735",
+      "tertiaryFixed": "#DA6A76",
+      "tertiaryFixedDim": "#C65B65",
+      "onTertiaryFixed": "#FFFFFF",
+      "onTertiaryFixedVariant": "#492532",
+      "onInverseSurface": "#FFFFFF"
+    },
+    "dark": {
+      "primary": "#D0BCFF",
+      "onPrimary": "#381E72",
+      "primaryContainer": "#4F378B",
+      "onPrimaryContainer": "#EADDFF",
+      "secondary": "#CCC2DC",
+      "onSecondary": "#332D41",
+      "secondaryContainer": "#4A4458",
+      "onSecondaryContainer": "#E8DEF8",
+      "tertiary": "#EFB8C8",
+      "onTertiary": "#492532",
+      "tertiaryContainer": "#633B48",
+      "onTertiaryContainer": "#FFD8E4",
+      "error": "#F2B8B5",
+      "onError": "#601410",
+      "errorContainer": "#8C1D18",
+      "onErrorContainer": "#F9DEDC",
+      "background": "#1C1B1F",
+      "onBackground": "#E6E1E5",
+      "surface": "#1C1B1F",
+      "onSurface": "#E6E1E5",
+      "surfaceVariant": "#49454F",
+      "onSurfaceVariant": "#CAC4D0",
+      "outline": "#938F99",
+      "outlineVariant": "#49454F",
+      "shadow": "#000000",
+      "scrim": "#000000",
+      "inverseSurface": "#E6E1E5",
+      "inverseOnSurface": "#313033",
+      "inversePrimary": "#6750A4",
+      "surfaceDim": "#141218",
+      "surfaceBright": "#3B383E",
+      "surfaceTint": "#121212",
+      "surfaceContainerLowest": "#0F0D13",
+      "surfaceContainerLow": "#1D1B20",
+      "surfaceContainer": "#211F26",
+      "surfaceContainerHigh": "#2B2930",
+      "surfaceContainerHighest": "#36343B",
+      "primaryFixed": "#B0A4E0",
+      "primaryFixedDim": "#A08DBE",
+      "onPrimaryFixed": "#381E72",
+      "onPrimaryFixedVariant": "#EADDFF",
+      "secondaryFixed": "#A69DB3",
+      "secondaryFixedDim": "#8C8A94",
+      "onSecondaryFixed": "#332D41",
+      "onSecondaryFixedVariant": "#E8DEF8",
+      "tertiaryFixed": "#EFB8C8",
+      "tertiaryFixedDim": "#C65B65",
+      "onTertiaryFixed": "#492532",
+      "onTertiaryFixedVariant": "#FFD8E4",
+      "onInverseSurface": "#1C1B1F"
+    }
   },
   "typography": {
     "fontFamily": {
-      "regular": "",
-      "medium": "",
-      "bold": ""
+      "regular": "Roboto, sans-serif",
+      "medium": "Roboto-Medium, sans-serif",
+      "bold": "Roboto-Bold, sans-serif"
     },
     "fontSize": {
-      "small": 12,
-      "medium": 16,
-      "large": 20,
-      "extraLarge": 24
+      "caption": 12,
+      "body1": 16,
+      "body2": 14,
+      "subtitle1": 16,
+      "subtitle2": 14,
+      "h6": 20,
+      "h5": 24,
+      "h4": 34,
+      "h3": 48,
+      "h2": 60,
+      "h1": 96
+    },
+    "fontWeight": {
+      "light": 300,
+      "regular": 400,
+      "medium": 500,
+      "bold": 700
+    },
+    "lineHeight": {
+      "tight": 1.2,
+      "normal": 1.5,
+      "relaxed": 1.8
+    },
+    "letterSpacing": {
+      "tight": -0.5,
+      "normal": 0,
+      "wide": 0.5
     }
   },
   "spacing": {
-    "small": 8,
-    "medium": 16,
-    "large": 24,
-    "extraLarge": 32
+    "xxs": 4,
+    "xs": 8,
+    "sm": 12,
+    "md": 16,
+    "lg": 24,
+    "xl": 32,
+    "xxl": 48
   },
   "borderRadius": {
-    "small": 4,
-    "medium": 8,
-    "large": 12
+    "none": 0,
+    "sm": 4,
+    "md": 8,
+    "lg": 12,
+    "full": 9999
   },
   "elevation": {
-    "none": 0,
-    "low": 2,
-    "medium": 4,
-    "high": 8
+    "none": {
+      "shadowColor": "#000000",
+      "shadowOffset": {
+        "width": 0,
+        "height": 0
+      },
+      "shadowOpacity": 0,
+      "shadowRadius": 0,
+      "elevation": 0
+    },
+    "low": {
+      "shadowColor": "#000000",
+      "shadowOffset": {
+        "width": 0,
+        "height": 2
+      },
+      "shadowOpacity": 0.1,
+      "shadowRadius": 4,
+      "elevation": 2
+    },
+    "medium": {
+      "shadowColor": "#000000",
+      "shadowOffset": {
+        "width": 0,
+        "height": 4
+      },
+      "shadowOpacity": 0.15,
+      "shadowRadius": 8,
+      "elevation": 4
+    },
+    "high": {
+      "shadowColor": "#000000",
+      "shadowOffset": {
+        "width": 0,
+        "height": 8
+      },
+      "shadowOpacity": 0.2,
+      "shadowRadius": 16,
+      "elevation": 8
+    }
+  },
+  "opacity": {
+    "disabled": 0.38,
+    "hovered": 0.08,
+    "focused": 0.12,
+    "pressed": 0.16,
+    "dragged": 0.24
+  },
+  "animation": {
+    "duration": {
+      "short": 200,
+      "medium": 300,
+      "long": 400
+    },
+    "easing": {
+      "standard": "cubic-bezier(0.4, 0.0, 0.2, 1)",
+      "accelerate": "cubic-bezier(0.4, 0.0, 1, 1)",
+      "decelerate": "cubic-bezier(0.0, 0.0, 0.2, 1)"
+    }
+  },
+  "breakpoints": {
+    "xs": 0,
+    "sm": 600,
+    "md": 960,
+    "lg": 1280,
+    "xl": 1920
   }
 }

data/solara/lib/core/template/config/android_template_config.json

@@ -59,6 +59,56 @@
             "source": "shared/brand_config.json",
             "target": "shared/brand_config.json",
             "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "global/resources_manifest.json",
+            "target": "../../global/resources_manifest.json",
+            "condition": "true"
         }
     ],
     "variables": {

data/solara/lib/core/template/config/flutter_template_config.json

@@ -64,6 +64,41 @@
             "source": "shared/brand_config.json",
             "target": "shared/brand_config.json",
             "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "flutter/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "flutter/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "flutter/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "global/resources_manifest.json",
+            "target": "../../global/resources_manifest.json",
+            "condition": "true"
         }
     ],
     "variables": {

data/solara/lib/core/template/config/ios_template_config.json

@@ -59,6 +59,56 @@
             "source": "shared/brand_config.json",
             "target": "shared/brand_config.json",
             "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "android/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "ios/json/",
+            "condition": "true"
+        },
+        {
+            "source": "json/",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/json_manifest.json",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "json/Json-Manifest.md",
+            "target": "../../global/json",
+            "condition": "true"
+        },
+        {
+            "source": "global/resources_manifest.json",
+            "target": "../../global/resources_manifest.json",
+            "condition": "true"
         }
     ],
     "variables": {

data/solara/lib/core/template/configurations.json

@@ -0,0 +1,46 @@
+{
+    "configurations": [
+        {
+            "key": "brand_config.json",
+            "name": "Brand Configuration",
+            "filePath": "shared/brand_config.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/shared/brand_config.json"
+        },
+        {
+            "key": "theme.json",
+            "name": "Theme Configuration",
+            "filePath": "shared/theme.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/shared/theme.json"
+        },
+        {
+            "key": "android_config.json",
+            "name": "Android Configuration",
+            "filePath": "android/android_config.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/android/android_config.json"
+        },
+        {
+            "key": "android_signing.json",
+            "name": "Android Signing",
+            "filePath": "android/android_signing.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/android/android_signing.json"
+        },
+        {
+            "key": "ios_config.json",
+            "name": "iOS Configuration",
+            "filePath": "ios/ios_config.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/ios_config.json"
+        },
+        {
+            "key": "ios_signing.json",
+            "name": "iOS Signing",
+            "filePath": "ios/ios_signing.json",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/ios_signing.json"
+        },
+        {
+            "key": "InfoPlist.xcstrings",
+            "name": "InfoPlist.xcstrings",
+            "filePath": "ios/InfoPlist.xcstrings",
+            "url": "https://raw.githubusercontent.com/Solara-Kit/Solara/refs/heads/develop/solara/lib/core/template/brands/ios/InfoPlist.xcstrings"
+        }
+    ]
+}

data/solara/lib/core/template/project_template_generator.rb

@@ -46,6 +46,8 @@ class ProjectTemplateGenerator
       end
     else
       FileUtils.mkdir_p(File.dirname(target))
+      return if File.exist?(target)
+
       if File.exist?(source) && copy_content
         FileUtils.cp(source, target)
       else

data/solara/lib/solara/version.rb

@@ -1,3 +1,3 @@
 module Solara
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/solara/lib/solara.rb

@@ -153,6 +153,25 @@ module Solara
 
         end
 
+        desc "`sync", "Sync the changes of the current brand through switching."
+        def sync
+            check_project_health
+
+            current_brand = BrandsManager.instance.current_brand
+            unless current_brand
+                Solara.logger.fatal("Please switch a brand first in order to enable synchronization.")
+                exit 1
+            end
+            brand_key = current_brand['key']
+
+            begin
+                SolaraManager.new.switch(brand_key)
+            rescue Issue => e
+                Solara.logger.fatal("Switching to #{brand_key} failed.")
+                exit 1
+            end
+        end
+
         desc "dashboard -k YOUR_OPTIONAL_BRAND_KEY", "Open the dashboard for a brand if brank_key is provided."
         method_option :brand_key, :type => :string, :aliases => "-k"
         method_option :port, :type => :numeric, :aliases => "-p"