diff --git a/.storybook/main.ts b/.storybook/main.ts index b5955d95..8942da85 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -37,6 +37,7 @@ const config: StorybookConfig = { staticDirs: [ "../example/assets/css", "../example/assets/fonts/TitilliumWeb", + "../example/assets/fonts/TitilliumSansPro", "../example/assets/fonts/ReadexPro", "../example/assets/fonts/DMMono", "../repo-assets", diff --git a/example/android/app/src/main/assets/custom/LICENSE.txt b/example/android/app/src/main/assets/custom/LICENSE.txt new file mode 100644 index 00000000..5ffcfe18 --- /dev/null +++ b/example/android/app/src/main/assets/custom/LICENSE.txt @@ -0,0 +1,92 @@ +Copyright (c) 2024 The Titillium Pro Project Authors (https://github.com/chialab/titillium_pro) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION AND CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Black-Italic.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Black-Italic.otf new file mode 100644 index 00000000..9f1a8163 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Black-Italic.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Black.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Black.otf new file mode 100644 index 00000000..531b3834 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Black.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Bold-Italic.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Bold-Italic.otf new file mode 100644 index 00000000..cfc31e85 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Bold-Italic.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Bold.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Bold.otf new file mode 100644 index 00000000..bde7e6af Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Bold.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Light-Italic.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Light-Italic.otf new file mode 100644 index 00000000..2ab74054 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Light-Italic.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Light.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Light.otf new file mode 100644 index 00000000..45598b7d Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Light.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Regular-Italic.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Regular-Italic.otf new file mode 100644 index 00000000..c3d1dc2b Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Regular-Italic.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Regular.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Regular.otf new file mode 100644 index 00000000..61d067ed Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Regular.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Semibold-Italic.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Semibold-Italic.otf new file mode 100644 index 00000000..5784b0bb Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Semibold-Italic.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Semibold.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Semibold.otf new file mode 100644 index 00000000..43abd769 Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Semibold.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Thin-Italic.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Thin-Italic.otf new file mode 100644 index 00000000..6921362b Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Thin-Italic.otf differ diff --git a/example/android/app/src/main/assets/fonts/TitilliumSansPro-Thin.otf b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Thin.otf new file mode 100644 index 00000000..bd0a146e Binary files /dev/null and b/example/android/app/src/main/assets/fonts/TitilliumSansPro-Thin.otf differ diff --git a/example/android/link-assets-manifest.json b/example/android/link-assets-manifest.json index ea25fdcf..88ef8333 100644 --- a/example/android/link-assets-manifest.json +++ b/example/android/link-assets-manifest.json @@ -45,6 +45,58 @@ "path": "assets/fonts/TitilliumWeb/TitilliumWeb-SemiBoldItalic.ttf", "sha1": "f81d3a5f38c6bda1fb3547bf91fe0b68b54066c5" }, + { + "path": "assets/fonts/TitilliumSansPro/LICENSE.txt", + "sha1": "e06911034a1618d5e4c791bc3eac8b2cbda28886" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Black-Italic.otf", + "sha1": "e1e51c2d7edc1c2b43bbcb86a3de0ffc2c858cf7" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Black.otf", + "sha1": "fd7404b8829b3fc36a57ab59e30d260e47bfa1bf" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold-Italic.otf", + "sha1": "0adf67e1f483383193604444a87f170cdb6ced3c" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold.otf", + "sha1": "ec9f41a68e3b4946a818c960a53b4f8a7cdb4ee0" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Light-Italic.otf", + "sha1": "8c2abf6f862d0f44284f8efa1bd1f2ebdd4895f3" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Light.otf", + "sha1": "35164c371f7e0d85a5dca00d755b2e6f9bf6f65d" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular-Italic.otf", + "sha1": "e34eedd18ae48fb951bfc4463fe6565ca5ce3292" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular.otf", + "sha1": "8b19b197587a854f46bac052e209cb0c2d6466ba" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold-Italic.otf", + "sha1": "6822815ea0c71b7be9a46932f08b6cb8ffcf1d7a" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold.otf", + "sha1": "a3c3077d7fb9bb4704ecf110f910107fd901599b" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin-Italic.otf", + "sha1": "eb91f1c768495d4f8731c14e92eb4944d6afa465" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin.otf", + "sha1": "384fd5c2b6a58114a19c0e61ccaa9abe8251ee04" + }, { "path": "assets/fonts/ReadexPro/ReadexPro-Regular.ttf", "sha1": "93e4080794b725f216a94b57ed62a51bc77bce91" diff --git a/example/assets/css/fonts.css b/example/assets/css/fonts.css index 49a53177..206209b1 100644 --- a/example/assets/css/fonts.css +++ b/example/assets/css/fonts.css @@ -93,6 +93,76 @@ font-style: italic; } +/* TITILLIUM SANS PRO */ +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Thin.otf') format("opentype"); + font-weight: 200; + font-style: normal; +} + +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Thin-Italic.otf') format("opentype"); + font-weight: 200; + font-style: italic; +} + +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Light.otf') format("opentype"); + font-weight: 300; + font-style: normal; +} + +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Light-Italic.otf') format("opentype"); + font-weight: 300; + font-style: italic; +} + +@font-face { + font-family: 'TitilliumSansPro'; + src: url('TitilliumSansPro-Regular.otf') format("opentype"); + font-weight: 400; + font-style: normal; +} + +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Regular-Italic.otf') format("opentype"); + font-weight: 400; + font-style: italic; +} + +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Semibold.otf') format("opentype"); + font-weight: 600; + font-style: normal; +} + +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Semibold-Italic.otf') format("opentype"); + font-weight: 600; + font-style: italic; +} + +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Bold.otf') format("opentype"); + font-weight: 700; + font-style: normal; +} + +@font-face { + font-family: "TitilliumSansPro"; + src: url('TitilliumSansPro-Bold-Italic.otf') format("opentype"); + font-weight: 700; + font-style: italic; +} /* Add to fix text-input focus UI on story */ input:focus-visible { diff --git a/example/assets/fonts/TitilliumSansPro/LICENSE.txt b/example/assets/fonts/TitilliumSansPro/LICENSE.txt new file mode 100644 index 00000000..5ffcfe18 --- /dev/null +++ b/example/assets/fonts/TitilliumSansPro/LICENSE.txt @@ -0,0 +1,92 @@ +Copyright (c) 2024 The Titillium Pro Project Authors (https://github.com/chialab/titillium_pro) + +This Font Software is licensed under the SIL Open Font License, Version 1.1. +This license is copied below, and is also available with a FAQ at: +http://scripts.sil.org/OFL + +----------------------------------------------------------- +SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007 +----------------------------------------------------------- + +PREAMBLE +The goals of the Open Font License (OFL) are to stimulate worldwide +development of collaborative font projects, to support the font creation +efforts of academic and linguistic communities, and to provide a free and +open framework in which fonts may be shared and improved in partnership +with others. + +The OFL allows the licensed fonts to be used, studied, modified and +redistributed freely as long as they are not sold by themselves. The +fonts, including any derivative works, can be bundled, embedded, +redistributed and/or sold with any software provided that any reserved +names are not used by derivative works. The fonts and derivatives, +however, cannot be released under any other type of license. The +requirement for fonts to remain under this license does not apply +to any document created using the fonts or their derivatives. + +DEFINITIONS +"Font Software" refers to the set of files released by the Copyright +Holder(s) under this license and clearly marked as such. This may +include source files, build scripts and documentation. + +"Reserved Font Name" refers to any names specified as such after the +copyright statement(s). + +"Original Version" refers to the collection of Font Software components as +distributed by the Copyright Holder(s). + +"Modified Version" refers to any derivative made by adding to, deleting, +or substituting -- in part or in whole -- any of the components of the +Original Version, by changing formats or by porting the Font Software to a +new environment. + +"Author" refers to any designer, engineer, programmer, technical +writer or other person who contributed to the Font Software. + +PERMISSION AND CONDITIONS +Permission is hereby granted, free of charge, to any person obtaining +a copy of the Font Software, to use, study, copy, merge, embed, modify, +redistribute, and sell modified and unmodified copies of the Font +Software, subject to the following conditions: + +1) Neither the Font Software nor any of its individual components, +in Original or Modified Versions, may be sold by itself. + +2) Original or Modified Versions of the Font Software may be bundled, +redistributed and/or sold with any software, provided that each copy +contains the above copyright notice and this license. These can be +included either as stand-alone text files, human-readable headers or +in the appropriate machine-readable metadata fields within text or +binary files as long as those fields can be easily viewed by the user. + +3) No Modified Version of the Font Software may use the Reserved Font +Name(s) unless explicit written permission is granted by the corresponding +Copyright Holder. This restriction only applies to the primary font name as +presented to the users. + +4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font +Software shall not be used to promote, endorse or advertise any +Modified Version, except to acknowledge the contribution(s) of the +Copyright Holder(s) and the Author(s) or with their explicit written +permission. + +5) The Font Software, modified or unmodified, in part or in whole, +must be distributed entirely under this license, and must not be +distributed under any other license. The requirement for fonts to +remain under this license does not apply to any document created +using the Font Software. + +TERMINATION +This license becomes null and void if any of the above conditions are +not met. + +DISCLAIMER +THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT +OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE +COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL +DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM +OTHER DEALINGS IN THE FONT SOFTWARE. diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Black-Italic.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Black-Italic.otf new file mode 100644 index 00000000..9f1a8163 Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Black-Italic.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Black.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Black.otf new file mode 100644 index 00000000..531b3834 Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Black.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold-Italic.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold-Italic.otf new file mode 100644 index 00000000..cfc31e85 Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold-Italic.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold.otf new file mode 100644 index 00000000..bde7e6af Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Light-Italic.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Light-Italic.otf new file mode 100644 index 00000000..2ab74054 Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Light-Italic.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Light.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Light.otf new file mode 100644 index 00000000..45598b7d Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Light.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular-Italic.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular-Italic.otf new file mode 100644 index 00000000..c3d1dc2b Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular-Italic.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular.otf new file mode 100644 index 00000000..61d067ed Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold-Italic.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold-Italic.otf new file mode 100644 index 00000000..5784b0bb Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold-Italic.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold.otf new file mode 100644 index 00000000..43abd769 Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin-Italic.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin-Italic.otf new file mode 100644 index 00000000..6921362b Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin-Italic.otf differ diff --git a/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin.otf b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin.otf new file mode 100644 index 00000000..bd0a146e Binary files /dev/null and b/example/assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin.otf differ diff --git a/example/ios/ExampleApp.xcodeproj/project.pbxproj b/example/ios/ExampleApp.xcodeproj/project.pbxproj index d9a8959d..dd2f7c93 100644 --- a/example/ios/ExampleApp.xcodeproj/project.pbxproj +++ b/example/ios/ExampleApp.xcodeproj/project.pbxproj @@ -8,25 +8,38 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* ExampleAppTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* ExampleAppTests.m */; }; + 012F89592C924DF0A0A3D1FE /* TitilliumSansPro-Semibold-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5FFF0789FC014263B13FD9D5 /* TitilliumSansPro-Semibold-Italic.otf */; }; 0C80B921A6F3F58F76C31292 /* libPods-ExampleApp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 5DCACB8F33CDC322A6C60F78 /* libPods-ExampleApp.a */; }; + 116E6480B9914941A6254F71 /* TitilliumSansPro-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 4FC6145EC4A14796982CAE22 /* TitilliumSansPro-Thin.otf */; }; 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 */; }; + 1496A8B0A02F4D198C6837DB /* TitilliumSansPro-Bold-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6D875C01023D4429A74DBB0A /* TitilliumSansPro-Bold-Italic.otf */; }; + 18D8B5E73B2B4973B758990E /* TitilliumSansPro-Black-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = D5C8F0FAB4AC4DE99E947795 /* TitilliumSansPro-Black-Italic.otf */; }; 1BC0A570344341E6987FD8D9 /* TitilliumWeb-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DE7209C9D8E04B9A9E908DC6 /* TitilliumWeb-Italic.ttf */; }; 2A76089ABE4E4D1E8E88ECFE /* TitilliumWeb-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9AB3748E146C445A8EDEBF6B /* TitilliumWeb-BoldItalic.ttf */; }; 3347048F785740F8889D46E8 /* TitilliumWeb-SemiBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A0DECA6E14564D48A132C4F2 /* TitilliumWeb-SemiBoldItalic.ttf */; }; + 346BED8DBF064AC6A83A1DE8 /* TitilliumSansPro-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 828AB8F6DBFA4CE19BF7EA31 /* TitilliumSansPro-Semibold.otf */; }; 3A6683997CAE4FFA8D2C4C17 /* TitilliumWeb-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2AC7977FFCF2471A93B6E66B /* TitilliumWeb-Light.ttf */; }; 427A1C8E8E514AF7813C8D13 /* TitilliumWeb-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2D62B8E69F8B41E6B8432E86 /* TitilliumWeb-Bold.ttf */; }; + 493FA456AB57478891021E84 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */; }; 4E8CD033CE644E80B2738918 /* TitilliumWeb-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EC225F8C27DC4CB7A37B9FF3 /* TitilliumWeb-SemiBold.ttf */; }; 4EA634FC85514B5EB08F6FBE /* TitilliumWeb-ExtraLight.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 52245BEC136D4B7189736F1B /* TitilliumWeb-ExtraLight.ttf */; }; 5CF5F4DBD1B145F487CED1AB /* DMMono-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1E50F38389644583B83DCCCA /* DMMono-Medium.ttf */; }; + 67A7D054C1EF476989BCF696 /* TitilliumSansPro-Regular-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 56B17FD365F04ADEA27EC63C /* TitilliumSansPro-Regular-Italic.otf */; }; 753895DFE39C460D8291988D /* TitilliumWeb-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 514A5F0E1EE74CC6AA04FC6C /* TitilliumWeb-Black.ttf */; }; 7699B88040F8A987B510C191 /* libPods-ExampleApp-ExampleAppTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 19F6CBCC0A4E27FBF8BF4A61 /* libPods-ExampleApp-ExampleAppTests.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; 84F6CD4A5A94452FB9F5E168 /* TitilliumWeb-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D58B501378304394BB6037C1 /* TitilliumWeb-LightItalic.ttf */; }; + 8A8D714B361541D18DA836F8 /* TitilliumSansPro-Light-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 98BB483F88C6469C924652BD /* TitilliumSansPro-Light-Italic.otf */; }; 9035C01744844CC1A61F0E05 /* TitilliumWeb-ExtraLightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3FA9D674B18F4716B5D60080 /* TitilliumWeb-ExtraLightItalic.ttf */; }; + 915396DA687B431889015FE0 /* TitilliumSansPro-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = EB4D07DCCD694459A3F838EC /* TitilliumSansPro-Bold.otf */; }; + C425D15E88DC43EAA9E49F04 /* TitilliumSansPro-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = 8F95F2A4E98F4BAC8B2A7648 /* TitilliumSansPro-Black.otf */; }; + CD6D4064A59548B5804CB0D6 /* TitilliumSansPro-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = 1A640F5E715149C2821B1867 /* TitilliumSansPro-Light.otf */; }; DD2EDEE079464A559B3FE549 /* ReadexPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AE4AAA66E1BA4DC2947ADEF7 /* ReadexPro-Regular.ttf */; }; E8EF3336542140A88B10BFF7 /* TitilliumWeb-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 16CF61663EAF4B46B3B81980 /* TitilliumWeb-Regular.ttf */; }; + EC846EA2DBCB4719B953F423 /* TitilliumSansPro-Thin-Italic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 3DE40C756739486AA1D51FCE /* TitilliumSansPro-Thin-Italic.otf */; }; + ECADF86EA3F140C6A74EFA09 /* TitilliumSansPro-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = FBA458C5509E42A59CD6F632 /* TitilliumSansPro-Regular.otf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -51,25 +64,38 @@ 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = ExampleApp/main.m; sourceTree = ""; }; 16CF61663EAF4B46B3B81980 /* TitilliumWeb-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-Regular.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-Regular.ttf"; sourceTree = ""; }; 19F6CBCC0A4E27FBF8BF4A61 /* libPods-ExampleApp-ExampleAppTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleApp-ExampleAppTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 1A640F5E715149C2821B1867 /* TitilliumSansPro-Light.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Light.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Light.otf"; sourceTree = ""; }; + 1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = LICENSE.txt; path = ../assets/fonts/TitilliumSansPro/LICENSE.txt; sourceTree = ""; }; 1E50F38389644583B83DCCCA /* DMMono-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "DMMono-Medium.ttf"; path = "../assets/fonts/DMMono/DMMono-Medium.ttf"; sourceTree = ""; }; 2AC7977FFCF2471A93B6E66B /* TitilliumWeb-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-Light.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-Light.ttf"; sourceTree = ""; }; 2D62B8E69F8B41E6B8432E86 /* TitilliumWeb-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-Bold.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-Bold.ttf"; sourceTree = ""; }; 3B4392A12AC88292D35C810B /* Pods-ExampleApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp.debug.xcconfig"; path = "Target Support Files/Pods-ExampleApp/Pods-ExampleApp.debug.xcconfig"; sourceTree = ""; }; + 3DE40C756739486AA1D51FCE /* TitilliumSansPro-Thin-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Thin-Italic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin-Italic.otf"; sourceTree = ""; }; 3FA9D674B18F4716B5D60080 /* TitilliumWeb-ExtraLightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-ExtraLightItalic.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-ExtraLightItalic.ttf"; sourceTree = ""; }; + 4FC6145EC4A14796982CAE22 /* TitilliumSansPro-Thin.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Thin.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin.otf"; sourceTree = ""; }; 514A5F0E1EE74CC6AA04FC6C /* TitilliumWeb-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-Black.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-Black.ttf"; sourceTree = ""; }; 52245BEC136D4B7189736F1B /* TitilliumWeb-ExtraLight.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-ExtraLight.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-ExtraLight.ttf"; sourceTree = ""; }; + 56B17FD365F04ADEA27EC63C /* TitilliumSansPro-Regular-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Regular-Italic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular-Italic.otf"; sourceTree = ""; }; 5709B34CF0A7D63546082F79 /* Pods-ExampleApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp.release.xcconfig"; path = "Target Support Files/Pods-ExampleApp/Pods-ExampleApp.release.xcconfig"; sourceTree = ""; }; 5B7EB9410499542E8C5724F5 /* Pods-ExampleApp-ExampleAppTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp-ExampleAppTests.debug.xcconfig"; path = "Target Support Files/Pods-ExampleApp-ExampleAppTests/Pods-ExampleApp-ExampleAppTests.debug.xcconfig"; sourceTree = ""; }; 5DCACB8F33CDC322A6C60F78 /* libPods-ExampleApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleApp.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + 5FFF0789FC014263B13FD9D5 /* TitilliumSansPro-Semibold-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Semibold-Italic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold-Italic.otf"; sourceTree = ""; }; + 6D875C01023D4429A74DBB0A /* TitilliumSansPro-Bold-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Bold-Italic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold-Italic.otf"; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ExampleApp/LaunchScreen.storyboard; sourceTree = ""; }; + 828AB8F6DBFA4CE19BF7EA31 /* TitilliumSansPro-Semibold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Semibold.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold.otf"; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-ExampleApp-ExampleAppTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-ExampleApp-ExampleAppTests.release.xcconfig"; path = "Target Support Files/Pods-ExampleApp-ExampleAppTests/Pods-ExampleApp-ExampleAppTests.release.xcconfig"; sourceTree = ""; }; + 8F95F2A4E98F4BAC8B2A7648 /* TitilliumSansPro-Black.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Black.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Black.otf"; sourceTree = ""; }; + 98BB483F88C6469C924652BD /* TitilliumSansPro-Light-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Light-Italic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Light-Italic.otf"; sourceTree = ""; }; 9AB3748E146C445A8EDEBF6B /* TitilliumWeb-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-BoldItalic.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-BoldItalic.ttf"; sourceTree = ""; }; A0DECA6E14564D48A132C4F2 /* TitilliumWeb-SemiBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-SemiBoldItalic.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-SemiBoldItalic.ttf"; sourceTree = ""; }; AE4AAA66E1BA4DC2947ADEF7 /* ReadexPro-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ReadexPro-Regular.ttf"; path = "../assets/fonts/ReadexPro/ReadexPro-Regular.ttf"; sourceTree = ""; }; D58B501378304394BB6037C1 /* TitilliumWeb-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-LightItalic.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-LightItalic.ttf"; sourceTree = ""; }; + D5C8F0FAB4AC4DE99E947795 /* TitilliumSansPro-Black-Italic.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Black-Italic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Black-Italic.otf"; sourceTree = ""; }; DE7209C9D8E04B9A9E908DC6 /* TitilliumWeb-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-Italic.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-Italic.ttf"; sourceTree = ""; }; + EB4D07DCCD694459A3F838EC /* TitilliumSansPro-Bold.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Bold.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold.otf"; sourceTree = ""; }; EC225F8C27DC4CB7A37B9FF3 /* TitilliumWeb-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumWeb-SemiBold.ttf"; path = "../assets/fonts/TitilliumWeb/TitilliumWeb-SemiBold.ttf"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; + FBA458C5509E42A59CD6F632 /* TitilliumSansPro-Regular.otf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "TitilliumSansPro-Regular.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular.otf"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -180,6 +206,19 @@ A0DECA6E14564D48A132C4F2 /* TitilliumWeb-SemiBoldItalic.ttf */, AE4AAA66E1BA4DC2947ADEF7 /* ReadexPro-Regular.ttf */, 1E50F38389644583B83DCCCA /* DMMono-Medium.ttf */, + D5C8F0FAB4AC4DE99E947795 /* TitilliumSansPro-Black-Italic.otf */, + 8F95F2A4E98F4BAC8B2A7648 /* TitilliumSansPro-Black.otf */, + 6D875C01023D4429A74DBB0A /* TitilliumSansPro-Bold-Italic.otf */, + EB4D07DCCD694459A3F838EC /* TitilliumSansPro-Bold.otf */, + 98BB483F88C6469C924652BD /* TitilliumSansPro-Light-Italic.otf */, + 1A640F5E715149C2821B1867 /* TitilliumSansPro-Light.otf */, + 56B17FD365F04ADEA27EC63C /* TitilliumSansPro-Regular-Italic.otf */, + FBA458C5509E42A59CD6F632 /* TitilliumSansPro-Regular.otf */, + 5FFF0789FC014263B13FD9D5 /* TitilliumSansPro-Semibold-Italic.otf */, + 828AB8F6DBFA4CE19BF7EA31 /* TitilliumSansPro-Semibold.otf */, + 3DE40C756739486AA1D51FCE /* TitilliumSansPro-Thin-Italic.otf */, + 4FC6145EC4A14796982CAE22 /* TitilliumSansPro-Thin.otf */, + 1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */, ); name = Resources; path = ""; @@ -305,6 +344,19 @@ 3347048F785740F8889D46E8 /* TitilliumWeb-SemiBoldItalic.ttf in Resources */, DD2EDEE079464A559B3FE549 /* ReadexPro-Regular.ttf in Resources */, 5CF5F4DBD1B145F487CED1AB /* DMMono-Medium.ttf in Resources */, + 18D8B5E73B2B4973B758990E /* TitilliumSansPro-Black-Italic.otf in Resources */, + C425D15E88DC43EAA9E49F04 /* TitilliumSansPro-Black.otf in Resources */, + 1496A8B0A02F4D198C6837DB /* TitilliumSansPro-Bold-Italic.otf in Resources */, + 915396DA687B431889015FE0 /* TitilliumSansPro-Bold.otf in Resources */, + 8A8D714B361541D18DA836F8 /* TitilliumSansPro-Light-Italic.otf in Resources */, + CD6D4064A59548B5804CB0D6 /* TitilliumSansPro-Light.otf in Resources */, + 67A7D054C1EF476989BCF696 /* TitilliumSansPro-Regular-Italic.otf in Resources */, + ECADF86EA3F140C6A74EFA09 /* TitilliumSansPro-Regular.otf in Resources */, + 012F89592C924DF0A0A3D1FE /* TitilliumSansPro-Semibold-Italic.otf in Resources */, + 346BED8DBF064AC6A83A1DE8 /* TitilliumSansPro-Semibold.otf in Resources */, + EC846EA2DBCB4719B953F423 /* TitilliumSansPro-Thin-Italic.otf in Resources */, + 116E6480B9914941A6254F71 /* TitilliumSansPro-Thin.otf in Resources */, + 493FA456AB57478891021E84 /* LICENSE.txt in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/example/ios/ExampleApp/Info.plist b/example/ios/ExampleApp/Info.plist index d4f14d80..310cbaa9 100644 --- a/example/ios/ExampleApp/Info.plist +++ b/example/ios/ExampleApp/Info.plist @@ -1,73 +1,85 @@ - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ExampleApp - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - $(PRODUCT_BUNDLE_IDENTIFIER) - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - $(MARKETING_VERSION) - CFBundleSignature - ???? - CFBundleVersion - $(CURRENT_PROJECT_VERSION) - LSRequiresIPhoneOS - - NSAppTransportSecurity - - NSExceptionDomains - - localhost - - NSExceptionAllowsInsecureHTTPLoads - - - - - NSLocationWhenInUseUsageDescription - - UILaunchStoryboardName - LaunchScreen - UIRequiredDeviceCapabilities - - armv7 - - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationLandscapeLeft - UIInterfaceOrientationLandscapeRight - - UIViewControllerBasedStatusBarAppearance - - CADisableMinimumFrameDurationOnPhone - - UIAppFonts - - TitilliumWeb-Black.ttf - TitilliumWeb-Bold.ttf - TitilliumWeb-BoldItalic.ttf - TitilliumWeb-ExtraLight.ttf - TitilliumWeb-ExtraLightItalic.ttf - TitilliumWeb-Italic.ttf - TitilliumWeb-Light.ttf - TitilliumWeb-LightItalic.ttf - TitilliumWeb-Regular.ttf - TitilliumWeb-SemiBold.ttf - TitilliumWeb-SemiBoldItalic.ttf - ReadexPro-Regular.ttf - DMMono-Medium.ttf - - + + CFBundleDevelopmentRegion + en + CFBundleDisplayName + ExampleApp + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(MARKETING_VERSION) + CFBundleSignature + ???? + CFBundleVersion + $(CURRENT_PROJECT_VERSION) + LSRequiresIPhoneOS + + NSAppTransportSecurity + + NSExceptionDomains + + localhost + + NSExceptionAllowsInsecureHTTPLoads + + + + + NSLocationWhenInUseUsageDescription + + UILaunchStoryboardName + LaunchScreen + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UIViewControllerBasedStatusBarAppearance + + CADisableMinimumFrameDurationOnPhone + + UIAppFonts + + TitilliumWeb-Black.ttf + TitilliumWeb-Bold.ttf + TitilliumWeb-BoldItalic.ttf + TitilliumWeb-ExtraLight.ttf + TitilliumWeb-ExtraLightItalic.ttf + TitilliumWeb-Italic.ttf + TitilliumWeb-Light.ttf + TitilliumWeb-LightItalic.ttf + TitilliumWeb-Regular.ttf + TitilliumWeb-SemiBold.ttf + TitilliumWeb-SemiBoldItalic.ttf + ReadexPro-Regular.ttf + DMMono-Medium.ttf + TitilliumSansPro-Black-Italic.otf + TitilliumSansPro-Black.otf + TitilliumSansPro-Bold-Italic.otf + TitilliumSansPro-Bold.otf + TitilliumSansPro-Light-Italic.otf + TitilliumSansPro-Light.otf + TitilliumSansPro-Regular-Italic.otf + TitilliumSansPro-Regular.otf + TitilliumSansPro-Semibold-Italic.otf + TitilliumSansPro-Semibold.otf + TitilliumSansPro-Thin-Italic.otf + TitilliumSansPro-Thin.otf + + diff --git a/example/ios/link-assets-manifest.json b/example/ios/link-assets-manifest.json index ea25fdcf..88ef8333 100644 --- a/example/ios/link-assets-manifest.json +++ b/example/ios/link-assets-manifest.json @@ -45,6 +45,58 @@ "path": "assets/fonts/TitilliumWeb/TitilliumWeb-SemiBoldItalic.ttf", "sha1": "f81d3a5f38c6bda1fb3547bf91fe0b68b54066c5" }, + { + "path": "assets/fonts/TitilliumSansPro/LICENSE.txt", + "sha1": "e06911034a1618d5e4c791bc3eac8b2cbda28886" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Black-Italic.otf", + "sha1": "e1e51c2d7edc1c2b43bbcb86a3de0ffc2c858cf7" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Black.otf", + "sha1": "fd7404b8829b3fc36a57ab59e30d260e47bfa1bf" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold-Italic.otf", + "sha1": "0adf67e1f483383193604444a87f170cdb6ced3c" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Bold.otf", + "sha1": "ec9f41a68e3b4946a818c960a53b4f8a7cdb4ee0" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Light-Italic.otf", + "sha1": "8c2abf6f862d0f44284f8efa1bd1f2ebdd4895f3" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Light.otf", + "sha1": "35164c371f7e0d85a5dca00d755b2e6f9bf6f65d" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular-Italic.otf", + "sha1": "e34eedd18ae48fb951bfc4463fe6565ca5ce3292" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Regular.otf", + "sha1": "8b19b197587a854f46bac052e209cb0c2d6466ba" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold-Italic.otf", + "sha1": "6822815ea0c71b7be9a46932f08b6cb8ffcf1d7a" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Semibold.otf", + "sha1": "a3c3077d7fb9bb4704ecf110f910107fd901599b" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin-Italic.otf", + "sha1": "eb91f1c768495d4f8731c14e92eb4944d6afa465" + }, + { + "path": "assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin.otf", + "sha1": "384fd5c2b6a58114a19c0e61ccaa9abe8251ee04" + }, { "path": "assets/fonts/ReadexPro/ReadexPro-Regular.ttf", "sha1": "93e4080794b725f216a94b57ed62a51bc77bce91" diff --git a/example/react-native.config.js b/example/react-native.config.js index 9c5b9e23..b5858f3e 100644 --- a/example/react-native.config.js +++ b/example/react-native.config.js @@ -12,6 +12,7 @@ module.exports = { }, assets: [ "./assets/fonts/TitilliumWeb", + "./assets/fonts/TitilliumSansPro", "./assets/fonts/ReadexPro", "./assets/fonts/DMMono" ] diff --git a/example/src/pages/Typography.tsx b/example/src/pages/Typography.tsx index 6aa62033..83e13ca9 100644 --- a/example/src/pages/Typography.tsx +++ b/example/src/pages/Typography.tsx @@ -1,5 +1,6 @@ import { Body, + BodyMonospace, ButtonText, Caption, Chip, @@ -9,13 +10,13 @@ import { H4, H5, H6, - Hero, HSpacer, + Hero, IOColors, Label, - LabelSmall, LabelLink, - BodyMonospace, + LabelSmall, + LabelSmallAlt, VSpacer } from "@pagopa/io-app-design-system"; import * as React from "react"; @@ -59,6 +60,7 @@ export const Typography = () => ( + Alert.alert("onPress LabelLink!")}> LabelLink @@ -223,6 +225,21 @@ export const LabelSmallRow = () => ( ); +export const LabelSmallAltRow = () => ( + <> + + Label small alt + + Label small alt + + + Label small alt + + + + +); + export const LabelRow = () => ( <> diff --git a/src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap b/src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap index 30770cc9..571be52f 100644 --- a/src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap +++ b/src/components/Advice/__test__/__snapshots__/advice.test.tsx.snap @@ -82,7 +82,7 @@ exports[`Test Advice Components - Experimental Enabled Advice Snapshot 1`] = ` color="bluegrey" defaultColor="bluegrey" defaultWeight="Regular" - font="TitilliumWeb" + font="TitilliumSansPro" fontStyle={ { "fontSize": 16, @@ -97,7 +97,7 @@ exports[`Test Advice Components - Experimental Enabled Advice Snapshot 1`] = ` }, { "color": "#475A6D", - "fontFamily": "Titillium Web", + "fontFamily": "Titillium Sans Pro", "fontStyle": "normal", "fontWeight": "400", }, diff --git a/src/components/accordion/AccordionItem.tsx b/src/components/accordion/AccordionItem.tsx index 45a22987..8b49fb27 100644 --- a/src/components/accordion/AccordionItem.tsx +++ b/src/components/accordion/AccordionItem.tsx @@ -174,7 +174,7 @@ const styles = StyleSheet.create({ fontSize: 14, lineHeight: 21, color: IOColors["grey-700"], - ...makeFontStyleObject("Regular", undefined, "TitilliumWeb") + ...makeFontStyleObject("Regular", undefined, "TitilliumSansPro") }, textContainer: { padding: accordionBodySpacing, diff --git a/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap b/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap index 8a7257c7..cd8cee3b 100644 --- a/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap +++ b/src/components/listitems/__test__/__snapshots__/listitem.test.tsx.snap @@ -233,7 +233,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemInfo Snapshot color="grey-700" defaultColor="blue" defaultWeight="Bold" - font="TitilliumWeb" + font="TitilliumSansPro" fontStyle={ { "fontSize": 14, @@ -248,7 +248,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemInfo Snapshot }, { "color": "#555C70", - "fontFamily": "Titillium Web", + "fontFamily": "Titillium Sans Pro", "fontStyle": "normal", "fontWeight": "400", }, @@ -373,7 +373,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemInfoCopy Snap color="grey-700" defaultColor="blue" defaultWeight="Bold" - font="TitilliumWeb" + font="TitilliumSansPro" fontStyle={ { "fontSize": 14, @@ -388,7 +388,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemInfoCopy Snap }, { "color": "#555C70", - "fontFamily": "Titillium Web", + "fontFamily": "Titillium Sans Pro", "fontStyle": "normal", "fontWeight": "400", }, @@ -1076,7 +1076,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou color="hanPurple-500" defaultColor="blue" defaultWeight="Bold" - font="TitilliumWeb" + font="TitilliumSansPro" fontStyle={ { "fontSize": 14, @@ -1091,7 +1091,7 @@ exports[`Test List Item Components - Experimental Enabled ListItemRadioWithAmou }, { "color": "#5517E3", - "fontFamily": "Titillium Web", + "fontFamily": "Titillium Sans Pro", "fontStyle": "normal", "fontWeight": "400", }, diff --git a/src/components/modules/ModulePaymentNotice.tsx b/src/components/modules/ModulePaymentNotice.tsx index ee75787a..900b2f44 100644 --- a/src/components/modules/ModulePaymentNotice.tsx +++ b/src/components/modules/ModulePaymentNotice.tsx @@ -1,18 +1,18 @@ import * as React from "react"; import { GestureResponderEvent, StyleSheet, View } from "react-native"; import Placeholder from "rn-placeholder"; -import { WithTestID } from "../../utils/types"; -import { getAccessibleAmountText } from "../../utils/accessibility"; -import { H6, LabelSmall } from "../typography"; -import { Badge } from "../badge"; -import { Icon } from "../icons"; import { IOListItemVisualParams, IOModuleStyles, IOStyles, useIOExperimentalDesign } from "../../core"; +import { getAccessibleAmountText } from "../../utils/accessibility"; +import { WithTestID } from "../../utils/types"; +import { Badge } from "../badge"; +import { Icon } from "../icons"; import { VSpacer } from "../spacer"; +import { H6, LabelSmall, LabelSmallAlt } from "../typography"; import { PressableModuleBase } from "./PressableModuleBase"; export type PaymentNoticeStatus = @@ -97,14 +97,15 @@ const ModulePaymentNoticeContent = ({ {title} )} - - {subtitle} - + {isExperimental ? ( + + {subtitle} + + ) : ( + + {subtitle} + + )} diff --git a/src/components/typography/Body.tsx b/src/components/typography/Body.tsx index ae477114..d8e22e83 100644 --- a/src/components/typography/Body.tsx +++ b/src/components/typography/Body.tsx @@ -1,4 +1,4 @@ -import { IOColors, IOTheme } from "../../core"; +import { IOColors, IOTheme, useIOExperimentalDesign } from "../../core"; import { FontFamily, IOFontWeight } from "../../utils/fonts"; import { useTypographyFactory } from "./Factory"; import { ExternalTypographyProps, TypographyProps } from "./common"; @@ -14,7 +14,9 @@ type BodyProps = ExternalTypographyProps< TypographyProps >; -const fontName: FontFamily = "TitilliumWeb"; +const fontName: FontFamily = "TitilliumSansPro"; +const legacyFontName: FontFamily = "TitilliumWeb"; + export const bodyFontSize = 16; export const bodyLineHeight = 24; export const bodyDefaultColor: AllowedColors = "bluegrey"; @@ -23,11 +25,14 @@ export const bodyDefaultWeight: AllowedWeight = "Regular"; /** * `Body` typographic style */ -export const Body = (props: BodyProps) => - useTypographyFactory({ +export const Body = (props: BodyProps) => { + const { isExperimental } = useIOExperimentalDesign(); + + return useTypographyFactory({ ...props, defaultWeight: bodyDefaultWeight, defaultColor: bodyDefaultColor, - font: fontName, + font: isExperimental ? fontName : legacyFontName, fontStyle: { fontSize: bodyFontSize, lineHeight: bodyLineHeight } }); +}; diff --git a/src/components/typography/H3.tsx b/src/components/typography/H3.tsx index ee7653fe..0e975ea4 100644 --- a/src/components/typography/H3.tsx +++ b/src/components/typography/H3.tsx @@ -28,6 +28,7 @@ const legacyH3LineHeight = 34; */ export const H3 = (props: H3Props) => { const { isExperimental } = useIOExperimentalDesign(); + return useTypographyFactory({ ...props, defaultWeight: isExperimental ? defaultWeight : legacyDefaultWeight, diff --git a/src/components/typography/H5.tsx b/src/components/typography/H5.tsx index 9027215c..7fd1a282 100644 --- a/src/components/typography/H5.tsx +++ b/src/components/typography/H5.tsx @@ -1,4 +1,4 @@ -import { IOTheme } from "../../core/IOColors"; +import { IOTheme, useIOExperimentalDesign } from "../../core"; import { FontFamily, IOFontWeight } from "../../utils/fonts"; import { useTypographyFactory } from "./Factory"; import { ExternalTypographyProps, TypographyProps } from "./common"; @@ -12,19 +12,22 @@ type H5Props = ExternalTypographyProps< export const h5FontSize = 14; export const h5LineHeight = 16; -const font: FontFamily = "TitilliumWeb"; +const font: FontFamily = "TitilliumSansPro"; +const legacyFont: FontFamily = "TitilliumWeb"; const defaultColor: AllowedColors = "black"; const defaultWeight: AllowedWeight = "SemiBold"; /** * `H5` typographic style */ -export const H5 = (props: H5Props) => - useTypographyFactory({ +export const H5 = (props: H5Props) => { + const { isExperimental } = useIOExperimentalDesign(); + + return useTypographyFactory({ ...props, defaultWeight, defaultColor, - font, + font: isExperimental ? font : legacyFont, fontStyle: { fontSize: h5FontSize, lineHeight: h5LineHeight, @@ -32,3 +35,4 @@ export const H5 = (props: H5Props) => letterSpacing: 0.5 } }); +}; diff --git a/src/components/typography/Label.tsx b/src/components/typography/Label.tsx index 517f50c0..d2bb113a 100644 --- a/src/components/typography/Label.tsx +++ b/src/components/typography/Label.tsx @@ -1,4 +1,8 @@ -import type { IOColors, IOColorsStatusForeground } from "../../core/IOColors"; +import { + IOColors, + IOColorsStatusForeground, + useIOExperimentalDesign +} from "../../core"; import { FontFamily, IOFontWeight } from "../../utils/fonts"; import { useTypographyFactory } from "./Factory"; import { @@ -16,19 +20,22 @@ type LabelProps = ExternalTypographyProps< TypographyProps > & { fontSize?: FontSize }; -const fontName: FontFamily = "TitilliumWeb"; +const fontName: FontFamily = "TitilliumSansPro"; +const legacyFontName: FontFamily = "TitilliumWeb"; const labelDefaultWeight = "Bold"; const labelDefaultcolor = "black"; /** * `Label` typographic style */ -export const Label = ({ fontSize, ...props }: LabelProps) => - useTypographyFactory({ +export const Label = ({ fontSize, ...props }: LabelProps) => { + const { isExperimental } = useIOExperimentalDesign(); + + return useTypographyFactory({ ...props, defaultWeight: labelDefaultWeight, defaultColor: labelDefaultcolor, - font: fontName, + font: isExperimental ? fontName : legacyFontName, fontStyle: { fontSize: fontSize ? fontSizeMapping[fontSize] : fontSizeMapping.regular, lineHeight: fontSize @@ -36,3 +43,4 @@ export const Label = ({ fontSize, ...props }: LabelProps) => : lineHeightMapping.regular } }); +}; diff --git a/src/components/typography/LabelLink.tsx b/src/components/typography/LabelLink.tsx index 972b68d1..df0bada7 100644 --- a/src/components/typography/LabelLink.tsx +++ b/src/components/typography/LabelLink.tsx @@ -1,5 +1,6 @@ -import { IOFontFamily, IOFontWeight } from "../../utils/fonts"; import { useIOExperimentalDesign, type IOColors } from "../../core"; +import { IOFontFamily, IOFontWeight } from "../../utils/fonts"; +import { useTypographyFactory } from "./Factory"; import { ExternalTypographyProps, FontSize, @@ -7,7 +8,6 @@ import { fontSizeMapping, lineHeightMapping } from "./common"; -import { useTypographyFactory } from "./Factory"; type AllowedColors = IOColors; type AllowedWeight = Extract; @@ -18,7 +18,8 @@ type LinkProps = ExternalTypographyProps< > & AllowedFontSize; -const fontName: IOFontFamily = "TitilliumWeb"; +const fontName: IOFontFamily = "TitilliumSansPro"; +const legacyFontName: IOFontFamily = "TitilliumWeb"; export const linkLegacyDefaultColor: AllowedColors = "blue"; @@ -36,7 +37,7 @@ export const LabelLink = (props: LinkProps) => { ...props, defaultWeight: linkDefaultWeight, defaultColor: isExperimental ? linkDefaultColor : linkLegacyDefaultColor, - font: fontName, + font: isExperimental ? fontName : legacyFontName, fontStyle: { fontSize: props.fontSize ? fontSizeMapping[props.fontSize] diff --git a/src/components/typography/LabelSmall.tsx b/src/components/typography/LabelSmall.tsx index ddf82b4a..30b4633c 100644 --- a/src/components/typography/LabelSmall.tsx +++ b/src/components/typography/LabelSmall.tsx @@ -1,5 +1,4 @@ -import { useIOExperimentalDesign } from "../../core"; -import type { IOColors, IOTheme } from "../../core/IOColors"; +import { IOColors, IOTheme, useIOExperimentalDesign } from "../../core"; import { FontFamily, IOFontWeight } from "../../utils/fonts"; import { useTypographyFactory } from "./Factory"; import { ExternalTypographyProps, FontType, TypographyProps } from "./common"; @@ -26,7 +25,8 @@ type LabelSmallProps = ExternalTypographyProps< AllowedFontSize & FontType; -const defaultFontName: FontFamily = "TitilliumWeb"; +const fontName: FontFamily = "TitilliumSansPro"; +const legacyFontName: FontFamily = "TitilliumWeb"; const fontSizeMapping: Record = { regular: 14, small: 12 @@ -48,8 +48,7 @@ export const LabelSmall = (props: LabelSmallProps) => { ...props, defaultWeight: labelDefaultWeight, defaultColor: labelDefaultcolor, - font: - isExperimental && props.font !== undefined ? props.font : defaultFontName, + font: isExperimental ? fontName : legacyFontName, fontStyle: { fontSize: props.fontSize ? fontSizeMapping[props.fontSize] diff --git a/src/utils/fonts.ts b/src/utils/fonts.ts index 14c1a545..1a3d54ba 100644 --- a/src/utils/fonts.ts +++ b/src/utils/fonts.ts @@ -15,6 +15,11 @@ const fonts = { web: "TitilliumWeb", ios: "Titillium Web" }), + TitilliumSansPro: Platform.select({ + android: "TitilliumSansPro", + web: "TitilliumSansPro", + ios: "Titillium Sans Pro" + }), ReadexPro: Platform.select({ android: "ReadexPro", web: "ReadexPro",