Skip to content

Commit

Permalink
Merge pull request #66 from Zenklub/refactor/new-theme
Browse files Browse the repository at this point in the history 
refactor(ThemeProvider): theme structure v2
  • Loading branch information
@erick-martins
erick-martins authored Nov 12, 2024
2 parents fbf05a6 + 32d0f65 commit bd8de79
Show file tree
Hide file tree
Showing 239 changed files with 8,200 additions and 8,299 deletions.
4 changes: 2 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@
"@semantic-release/release-notes-generator": "^11.0.4",
"@storybook/addon-links": "^6.3.8",
"@storybook/react-native": "^5.3.25",
"@testing-library/jest-native": "^5.4.2",
"@testing-library/jest-native": "^5.4.3",
"@testing-library/react-hooks": "^8.0.0",
"@testing-library/react-native": "^8.0.0",
"@testing-library/react-native": "^12.8.1",
"@types/jest": "^24.0.24",
"@types/node": "^16.9.6",
"@types/react": "^17.0.24",
Expand Down
72 changes: 18 additions & 54 deletions preview/ios/FreudDSPreview.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@
13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
5E14CF79053246C988A4E1DA /* SourceSansPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */; };
6132EF182BDFF13200BBE14D /* PrivacyInfo.xcprivacy in Resources */ = {isa = PBXBuildFile; fileRef = 6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */; };
7699B88040F8A987B510C191 /* libPods-FreudDSPreview-FreudDSPreviewTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-FreudDSPreview-FreudDSPreviewTests.a */; };
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; };
89CB6AA84EBA462483B67C54 /* freud-icon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 20C3BD67812B45C3B2B40511 /* freud-icon.ttf */; };
9EB3C73129F1412F9762B323 /* SourceSansPro-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */; };
5E14CF79053246C988A4E1DA /* SourceSansPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */; };
F93CCC72A3D14EDEA12BC001 /* SourceSansPro-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */; };
89CB6AA84EBA462483B67C54 /* freud-icon.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 20C3BD67812B45C3B2B40511 /* freud-icon.ttf */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -35,25 +35,25 @@
00E356EE1AD99517003FC87E /* FreudDSPreviewTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = FreudDSPreviewTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* FreudDSPreviewTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FreudDSPreviewTests.m; sourceTree = "<group>"; };
0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "SourceSansPro-SemiBold.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-SemiBold.ttf"; sourceTree = "<group>"; };
13B07F961A680F5B00A75B9A /* FreudDSPreview.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FreudDSPreview.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = FreudDSPreview/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = AppDelegate.mm; path = FreudDSPreview/AppDelegate.mm; sourceTree = "<group>"; };
13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = FreudDSPreview/Images.xcassets; sourceTree = "<group>"; };
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = FreudDSPreview/Info.plist; sourceTree = "<group>"; };
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FreudDSPreview/main.m; sourceTree = "<group>"; };
19F6CBCC0A4E27FBF8BF4A61 /* libPods-FreudDSPreview-FreudDSPreviewTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FreudDSPreview-FreudDSPreviewTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
20C3BD67812B45C3B2B40511 /* freud-icon.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "freud-icon.ttf"; path = "../node_modules/@freud-ds/icons/fonts/freud-icon.ttf"; sourceTree = "<group>"; };
3B4392A12AC88292D35C810B /* Pods-FreudDSPreview.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreudDSPreview.debug.xcconfig"; path = "Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview.debug.xcconfig"; sourceTree = "<group>"; };
5709B34CF0A7D63546082F79 /* Pods-FreudDSPreview.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreudDSPreview.release.xcconfig"; path = "Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview.release.xcconfig"; sourceTree = "<group>"; };
584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "SourceSansPro-Bold.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-Bold.ttf"; sourceTree = "<group>"; };
5B7EB9410499542E8C5724F5 /* Pods-FreudDSPreview-FreudDSPreviewTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreudDSPreview-FreudDSPreviewTests.debug.xcconfig"; path = "Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests.debug.xcconfig"; sourceTree = "<group>"; };
5DCACB8F33CDC322A6C60F78 /* libPods-FreudDSPreview.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-FreudDSPreview.a"; sourceTree = BUILT_PRODUCTS_DIR; };
6132EF172BDFF13200BBE14D /* PrivacyInfo.xcprivacy */ = {isa = PBXFileReference; lastKnownFileType = text.xml; name = PrivacyInfo.xcprivacy; path = FreudDSPreview/PrivacyInfo.xcprivacy; sourceTree = "<group>"; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = FreudDSPreview/LaunchScreen.storyboard; sourceTree = "<group>"; };
89C6BE57DB24E9ADA2F236DE /* Pods-FreudDSPreview-FreudDSPreviewTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FreudDSPreview-FreudDSPreviewTests.release.xcconfig"; path = "Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests.release.xcconfig"; sourceTree = "<group>"; };
C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "SourceSansPro-Regular.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-Regular.ttf"; sourceTree = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */ = {isa = PBXFileReference; name = "SourceSansPro-Bold.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-Bold.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */ = {isa = PBXFileReference; name = "SourceSansPro-Regular.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */ = {isa = PBXFileReference; name = "SourceSansPro-SemiBold.ttf"; path = "../node_modules/@freud-ds/tokens/assets/fonts/SourceSansPro-SemiBold.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
20C3BD67812B45C3B2B40511 /* freud-icon.ttf */ = {isa = PBXFileReference; name = "freud-icon.ttf"; path = "../node_modules/@freud-ds/icons/fonts/freud-icon.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -106,6 +106,18 @@
name = FreudDSPreview;
sourceTree = "<group>";
};
1644104D66FC405F91A82E6B /* Resources */ = {
isa = PBXGroup;
children = (
584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */,
C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */,
0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */,
20C3BD67812B45C3B2B40511 /* freud-icon.ttf */,
);
name = Resources;
path = "";
sourceTree = "<group>";
};
2D16E6871FA4F8E400B85C8A /* Frameworks */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -160,18 +172,6 @@
path = Pods;
sourceTree = "<group>";
};
1644104D66FC405F91A82E6B /* Resources */ = {
isa = "PBXGroup";
children = (
584E02E7031849B7A3C53356 /* SourceSansPro-Bold.ttf */,
C3272E2BFFAA43C7BB476244 /* SourceSansPro-Regular.ttf */,
0100D59E9B7F451BA9C16142 /* SourceSansPro-SemiBold.ttf */,
20C3BD67812B45C3B2B40511 /* freud-icon.ttf */,
);
name = Resources;
sourceTree = "<group>";
path = "";
};
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
Expand All @@ -183,7 +183,6 @@
00E356EA1AD99517003FC87E /* Sources */,
00E356EB1AD99517003FC87E /* Frameworks */,
00E356EC1AD99517003FC87E /* Resources */,
C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */,
F6A41C54EA430FDDC6A6ED99 /* [CP] Copy Pods Resources */,
);
buildRules = (
Expand All @@ -206,7 +205,6 @@
13B07F8C1A680F5B00A75B9A /* Frameworks */,
13B07F8E1A680F5B00A75B9A /* Resources */,
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */,
E235C05ADACE081382539298 /* [CP] Copy Pods Resources */,
);
buildRules = (
Expand Down Expand Up @@ -295,23 +293,6 @@
shellPath = /bin/sh;
shellScript = "set -e\n\nWITH_ENVIRONMENT=\"../node_modules/react-native/scripts/xcode/with-environment.sh\"\nREACT_NATIVE_XCODE=\"../node_modules/react-native/scripts/react-native-xcode.sh\"\n\n/bin/sh -c \"$WITH_ENVIRONMENT $REACT_NATIVE_XCODE\"\n";
};
00EEFC60759A1932668264C0 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview/Pods-FreudDSPreview-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
A55EABD7B0C7F3A422A6CC61 /* [CP] Check Pods Manifest.lock */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down Expand Up @@ -356,23 +337,6 @@
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
showEnvVarsInLog = 0;
};
C59DA0FBD6956966B86A3779 /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
files = (
);
inputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests-frameworks-${CONFIGURATION}-input-files.xcfilelist",
);
name = "[CP] Embed Pods Frameworks";
outputFileListPaths = (
"${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests-frameworks-${CONFIGURATION}-output-files.xcfilelist",
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FreudDSPreview-FreudDSPreviewTests/Pods-FreudDSPreview-FreudDSPreviewTests-frameworks.sh\"\n";
showEnvVarsInLog = 0;
};
E235C05ADACE081382539298 /* [CP] Copy Pods Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
Expand Down
4 changes: 2 additions & 2 deletions preview/ios/Podfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ prepare_react_native_project!
# dependencies: {
# ...(process.env.NO_FLIPPER ? { 'react-native-flipper': { platforms: { ios: null } } } : {}),
# ```
flipper_config = ENV['NO_FLIPPER'] == "1" ? FlipperConfiguration.disabled : FlipperConfiguration.enabled
flipper_config = FlipperConfiguration.disabled

linkage = ENV['USE_FRAMEWORKS']
if linkage != nil
Expand All @@ -34,7 +34,7 @@ target 'FreudDSPreview' do
use_react_native!(
:path => config[:reactNativePath],
# Hermes is now enabled by default. Disable by setting this flag to false.
:hermes_enabled => flags[:hermes_enabled],
:hermes_enabled => false,
:fabric_enabled => flags[:fabric_enabled],
# Enables Flipper.
#
Expand Down
Loading

0 comments on commit bd8de79

Please sign in to comment.