Improve typography exporting support for UIKit, add typography export…

…ing for SwiftUI
RedMadRobot · Sep 14, 2020 · a31b892 · a31b892
1 parent 1a079b0
commit a31b892
Show file tree

Hide file tree

Showing 51 changed files with 1,422 additions and 105 deletions.
diff --git a/Example/Example.xcodeproj/project.pbxproj b/Example/Example.xcodeproj/project.pbxproj
@@ -95,17 +95,9 @@
 		0F20187C24D1B60A002068B4 /* Source */ = {
 			isa = PBXGroup;
 			children = (
-				0FEA0948250CB7AE0065EB81 /* UIColor+extension.swift */,
+				0FF26037250F4C7100D890E1 /* UI */,
 				0F8F6C6A25090F4900879906 /* AppDelegate.swift */,
 				0F8F6C6C25090F4900879906 /* SceneDelegate.swift */,
-				0F8F6C6D25090F4900879906 /* SolidButton.swift */,
-				0FEA094C250CB7DF0065EB81 /* Label.swift */,
-				0FEA094A250CB7DF0065EB81 /* LabelStyle.swift */,
-				0FEA094B250CB7DF0065EB81 /* UIFont+extension.swift */,
-				0FEA0952250CB9300065EB81 /* IconsViewController.swift */,
-				0FEA0958250CC1F30065EB81 /* IllustrationsViewController.swift */,
-				0FEA0954250CC0D30065EB81 /* UIImage+extension_icons.swift */,
-				0FEA0956250CC1EA0065EB81 /* UIImage+extension_illustrations.swift */,
 			);
 			path = Source;
 			sourceTree = "<group>";
@@ -120,6 +112,38 @@
 			path = Resource;
 			sourceTree = "<group>";
 		};
+		0FF26037250F4C7100D890E1 /* UI */ = {
+			isa = PBXGroup;
+			children = (
+				0FF2603A250F4CA000D890E1 /* ViewControllers */,
+				0FF26038250F4C8200D890E1 /* Common */,
+			);
+			path = UI;
+			sourceTree = "<group>";
+		};
+		0FF26038250F4C8200D890E1 /* Common */ = {
+			isa = PBXGroup;
+			children = (
+				0FEA094C250CB7DF0065EB81 /* Label.swift */,
+				0FEA094A250CB7DF0065EB81 /* LabelStyle.swift */,
+				0F8F6C6D25090F4900879906 /* SolidButton.swift */,
+				0FEA0948250CB7AE0065EB81 /* UIColor+extension.swift */,
+				0FEA094B250CB7DF0065EB81 /* UIFont+extension.swift */,
+				0FEA0954250CC0D30065EB81 /* UIImage+extension_icons.swift */,
+				0FEA0956250CC1EA0065EB81 /* UIImage+extension_illustrations.swift */,
+			);
+			path = Common;
+			sourceTree = "<group>";
+		};
+		0FF2603A250F4CA000D890E1 /* ViewControllers */ = {
+			isa = PBXGroup;
+			children = (
+				0FEA0952250CB9300065EB81 /* IconsViewController.swift */,
+				0FEA0958250CC1F30065EB81 /* IllustrationsViewController.swift */,
+			);
+			path = ViewControllers;
+			sourceTree = "<group>";
+		};
 		17C17A7C8D1AF845B2C30B13 /* Pods */ = {
 			isa = PBXGroup;
 			children = (

diff --git a/Example/Example/Source/Label.swift → Example/Example/Source/UI/Common/Label.swift b/Example/Example/Source/Label.swift → Example/Example/Source/UI/Common/Label.swift
diff --git a/Example/Example/Source/LabelStyle.swift → ...Example/Source/UI/Common/LabelStyle.swift b/Example/Example/Source/LabelStyle.swift → ...Example/Source/UI/Common/LabelStyle.swift
diff --git a/Example/Example/Source/SolidButton.swift → ...xample/Source/UI/Common/SolidButton.swift b/Example/Example/Source/SolidButton.swift → ...xample/Source/UI/Common/SolidButton.swift
diff --git a/...le/Example/Source/UIColor+extension.swift → .../Source/UI/Common/UIColor+extension.swift b/...le/Example/Source/UIColor+extension.swift → .../Source/UI/Common/UIColor+extension.swift
diff --git a/...ple/Example/Source/UIFont+extension.swift → ...e/Source/UI/Common/UIFont+extension.swift b/...ple/Example/Source/UIFont+extension.swift → ...e/Source/UI/Common/UIFont+extension.swift
diff --git a/...mple/Source/UIImage+extension_icons.swift → ...e/UI/Common/UIImage+extension_icons.swift b/...mple/Source/UIImage+extension_icons.swift → ...e/UI/Common/UIImage+extension_icons.swift
diff --git a/...rce/UIImage+extension_illustrations.swift → ...mon/UIImage+extension_illustrations.swift b/...rce/UIImage+extension_illustrations.swift → ...mon/UIImage+extension_illustrations.swift
diff --git a/.../Example/Source/IconsViewController.swift → ...ViewControllers/IconsViewController.swift b/.../Example/Source/IconsViewController.swift → ...ViewControllers/IconsViewController.swift
diff --git a/.../Source/IllustrationsViewController.swift → ...rollers/IllustrationsViewController.swift b/.../Source/IllustrationsViewController.swift → ...rollers/IllustrationsViewController.swift
diff --git a/Example/Podfile b/Example/Podfile
@@ -3,5 +3,5 @@ platform :ios, '11.0'
 target 'Example' do
   use_frameworks!
 
-  pod 'FigmaExport'
+  pod 'FigmaExport', :path => '../'
 end
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,16 +1,16 @@
 PODS:
-  - FigmaExport (0.11.0)
+  - FigmaExport (0.12.0)
 
 DEPENDENCIES:
-  - FigmaExport
+  - FigmaExport (from `../`)
 
-SPEC REPOS:
-  trunk:
-    - FigmaExport
+EXTERNAL SOURCES:
+  FigmaExport:
+    :path: "../"
 
 SPEC CHECKSUMS:
-  FigmaExport: 6e59632794da33bf1dfe98851ac1e976b75f085a
+  FigmaExport: 4ec620ebf1be3d4991df472c841a978d7f2c2a3b
 
-PODFILE CHECKSUM: 5f4def1cc7339d6f13a38b29b1a86d1548750fad
+PODFILE CHECKSUM: 78f2963caab7b28e3a6918925da2d1822763c200
 
 COCOAPODS: 1.9.3
diff --git a/Example/Pods/Local Podspecs/FigmaExport.podspec.json b/Example/Pods/Local Podspecs/FigmaExport.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock
diff --git a/Example/Pods/Pods.xcodeproj/project.pbxproj b/Example/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Example/Pods/Target Support Files/FigmaExport/FigmaExport.debug.xcconfig b/Example/Pods/Target Support Files/FigmaExport/FigmaExport.debug.xcconfig
diff --git a/Example/Pods/Target Support Files/FigmaExport/FigmaExport.release.xcconfig b/Example/Pods/Target Support Files/FigmaExport/FigmaExport.release.xcconfig
diff --git a/Example/figma-export.yaml b/Example/figma-export.yaml
@@ -29,7 +29,7 @@ ios:
     # Color name style: camelCase or snake_case
     nameStyle: camelCase
     # [optional] Absolute or relative path to swift file where to export UIKit colors (UIColor) for accessing from the code (e.g. UIColor.backgroundPrimary)
-    colorSwift: "./Example/Source/UIColor+extension.swift"
+    colorSwift: "./Example/Source/UI/Common/UIColor+extension.swift"
 
   # Parameters for exporting icons
   icons:
@@ -38,7 +38,7 @@ ios:
     # Icon name style: camelCase or snake_case
     nameStyle: camelCase
     # [optional] Absolute or relative path to swift file where to generate extension for UIImage for accessing icons from the code (e.g. UIImage.ic24ArrowRight)
-    imageSwift: "./Example/Source/UIImage+extension_icons.swift"
+    imageSwift: "./Example/Source/UI/Common/UIImage+extension_icons.swift"
 
   # Parameters for exporting images
   images:
@@ -47,14 +47,14 @@ ios:
     # Image name style: camelCase or snake_case
     nameStyle: camelCase
     # [optional] Absolute or relative path to swift file where to generate extension for UIImage for accessing illustrations from the code (e.g. UIImage.illZeroNoInternet)
-    imageSwift: "./Example/Source/UIImage+extension_illustrations.swift"
+    imageSwift: "./Example/Source/UI/Common/UIImage+extension_illustrations.swift"
 
   # Parameters for exporting typography
   typography:
     # Path to directory where to place UIFont+extension.swift file
-    fontExtensionDirectory: "./Example/Source/"
+    fontSwift: "./Example/Source/UI/Common/UIFont+extension.swift"
     # Will FigmaExport generate UILabel for each text style (font) e.g. HeaderLabel, BodyLabel, CaptionLabel.
     generateLabels: true
     # Path to directory where to place UILabel for each text style (font) (Requred if generateLabels = true)
-    labelsDirectory: "./Example/Source/"
+    labelsDirectory: "./Example/Source/UI/Common/"