Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IOAPPX-352] Add the new IO typeface #314

Merged
merged 46 commits into from
Aug 27, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
46 commits
Select commit Hold shift + click to select a range
2996753
Simplify `fonts.ts` logic, add the new `IOText` starting from `BaseTy…
dmnplb Jul 17, 2024
586e104
Add new `H1` made with `IOText`
dmnplb Jul 18, 2024
ae929da
fixes fontStyle compilation
CrisTofani Jul 18, 2024
e72cb80
Add `useBoldTextEnabled` a11y hook
dmnplb Jul 18, 2024
d4fa673
Add dynamic font weight to `IOText` if bold text is enabled
dmnplb Jul 19, 2024
516cabd
Merge branch 'main' into IOAPPX-349-add-IOText-component
dmnplb Jul 19, 2024
dfdd871
Deprecate `BaseTypography` component
dmnplb Jul 22, 2024
ac97f23
Update `Hero` typographic style
dmnplb Jul 22, 2024
e595003
Update `H2` typographic style
dmnplb Jul 22, 2024
d4aa3a8
Update `H3` typographic style
dmnplb Jul 22, 2024
dd2891b
Update `H4` typographic style
dmnplb Jul 22, 2024
8db4427
Update `H5` typographic style
dmnplb Jul 22, 2024
eb3ad7d
Update `H6` typographic style
dmnplb Jul 22, 2024
4d3555f
Update `ButtonText` typographic style
dmnplb Jul 22, 2024
b90b65d
Update `Caption` typographic style
dmnplb Jul 22, 2024
558659a
Update `Chip` typographic style
dmnplb Jul 22, 2024
b607655
Improve code of all the typographic styles
dmnplb Jul 22, 2024
2435a3f
Update `Body` typographic style
dmnplb Jul 22, 2024
c29a176
Update `BodyMonospace` typographic style
dmnplb Jul 22, 2024
fd60a43
Add custom weight prop to `Body` style
dmnplb Jul 22, 2024
96dce07
Update `Label…` typographic styles, remove `LabelLink`
dmnplb Jul 23, 2024
ecdd67e
Add `asLink` prop to `Body`
dmnplb Jul 23, 2024
69a3b7d
Update all the MD-related styles, remove some ones
dmnplb Jul 23, 2024
14949fa
Update some DS pages to resolve TS errors
dmnplb Jul 23, 2024
7f2c6ab
Fix TS errors on some components
dmnplb Jul 23, 2024
591b219
Fix TS errors on some components, part II
dmnplb Jul 23, 2024
dc62017
Fix TS errors on some components, part III
dmnplb Jul 23, 2024
80e12a9
Add ability to overwrite the `color`prop
dmnplb Jul 23, 2024
374c794
Update `jest` snapshots
dmnplb Jul 23, 2024
86394c8
Replace `Readex` with `Titillio`
dmnplb Jul 24, 2024
b15beac
Replace `Readex` with the new typeface
dmnplb Jul 24, 2024
f8b9e6a
Fix font on Android
dmnplb Jul 24, 2024
a3bfc0c
Remove `LabelHeader`
dmnplb Jul 24, 2024
255c49b
Merge branch 'IOAPPX-349-add-IOText-component' into IOAPPX-352-add-ne…
dmnplb Jul 24, 2024
40cdf88
Update `IconViewerBox` to use the new typeface
dmnplb Jul 24, 2024
5628f11
Merge branch '2.x' into IOAPPX-352-add-new-titillium-typeface
dmnplb Jul 24, 2024
a7cfb4d
Update wrong `LabelSmallAlt` references
dmnplb Jul 24, 2024
5e6fed2
Update `jest` snapshots
dmnplb Jul 24, 2024
9ead8a4
Merge branch '2.x' into IOAPPX-352-add-new-titillium-typeface
CrisTofani Jul 31, 2024
a21bf7d
Merge branch '2.x' into IOAPPX-352-add-new-titillium-typeface
dmnplb Jul 31, 2024
ee982d1
Add missing font declarations for `storybook`
dmnplb Jul 31, 2024
b61baff
Set different default weight for `Label…` styles
dmnplb Jul 31, 2024
73dd6dd
Fix wrong autocomplete of `IOText`
dmnplb Jul 31, 2024
6601688
Merge branch '2.x' into IOAPPX-352-add-new-titillium-typeface
CrisTofani Aug 26, 2024
ba846ce
Exclude `web` platform from the `useBoldTextEnabled` hook
dmnplb Aug 27, 2024
a134b4d
Merge branch '2.x' into IOAPPX-352-add-new-titillium-typeface
CrisTofani Aug 27, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ const config: StorybookConfig = {
staticDirs: [
"../example/assets/css",
"../example/assets/fonts/TitilliumSansPro",
"../example/assets/fonts/ReadexPro",
"../example/assets/fonts/Titillio",
"../example/assets/fonts/DMMono",
"../repo-assets",
"../stories/assets"
Expand Down
7 changes: 6 additions & 1 deletion .storybook/preview-head.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,12 @@

<!-- Pull in static files served from your Static directory or the internet -->
<!-- Example: `main.js|ts` is configured with staticDirs: ['../public'] and your font is located in the `fonts` directory inside your `public` directory -->
<link rel="preload" href="ReadexPro-Regular.ttf" as="font" />
<link rel="preload" href="Titillio-Thin.ttf" as="font" />
<link rel="preload" href="Titillio-Light.ttf" as="font" />
<link rel="preload" href="Titillio-Regular.ttf" as="font" />
<link rel="preload" href="Titillio-Semibold.ttf" as="font" />
<link rel="preload" href="Titillio-Bold.ttf" as="font" />
<link rel="preload" href="Titillio-Black.ttf" as="font" />
<link rel="preload" href="DMMono-Medium.ttf" as="font" />
<link rel="preload" href="TitilliumSansPro-Black.otf" as="font" />
<link rel="preload" href="TitilliumSansPro-BlackItalic.otf" as="font" />
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
24 changes: 20 additions & 4 deletions example/android/link-assets-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,28 @@
"sha1": "6bb6bf0c5d7a7f50606cc276cc4ef1787f52a928"
},
{
"path": "assets/fonts/ReadexPro/ReadexPro-Regular.ttf",
"sha1": "93e4080794b725f216a94b57ed62a51bc77bce91"
"path": "assets/fonts/Titillio/Titillio-Black.otf",
"sha1": "8dfd8a6e9f8fadb290a346f1e66db4ad649b5d89"
},
{
"path": "assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf",
"sha1": "b4ec28a6b1ba6ed730beb37f06b1b81c5e2163a3"
"path": "assets/fonts/Titillio/Titillio-Bold.otf",
"sha1": "2d927e9c2e67e1998d2920134e030c6afb7e0186"
},
{
"path": "assets/fonts/Titillio/Titillio-Light.otf",
"sha1": "a45f2f9ab5d561d30ef0b56a9b768e0a2953da60"
},
{
"path": "assets/fonts/Titillio/Titillio-Regular.otf",
"sha1": "4e174fe900e7c80161a371500582d81c08d2c641"
},
{
"path": "assets/fonts/Titillio/Titillio-Semibold.otf",
"sha1": "d0b2a56269c66d5c99b9e0075091d7cc02cafe5f"
},
{
"path": "assets/fonts/Titillio/Titillio-Thin.otf",
"sha1": "91ac3f7e483eaaf0c3d6b65609b336a13ebf4730"
},
{
"path": "assets/fonts/DMMono/DMMono-Medium.ttf",
Expand Down
41 changes: 39 additions & 2 deletions example/assets/css/fonts.css
Original file line number Diff line number Diff line change
@@ -1,10 +1,47 @@
@font-face {
font-family: 'ReadexPro';
src: url('ReadexPro-Regular.ttf') format("truetype");
font-family: 'Titillio 3';
src: url('Titillio-Thin.otf') format("truetype");
font-weight: 200;
font-style: normal;
}

@font-face {
font-family: 'Titillio 3';
src: url('Titillio-Light.otf') format("truetype");
font-weight: 300;
font-style: normal;
}

@font-face {
font-family: 'Titillio 3';
src: url('Titillio-Regular.otf') format("truetype");
font-weight: 400;
font-style: normal;
}

@font-face {
font-family: 'Titillio 3';
src: url('Titillio-Semibold.otf') format("truetype");
font-weight: 600;
font-style: normal;
}

@font-face {
font-family: 'Titillio 3';
src: url('Titillio-Bold.otf') format("truetype");
font-weight: 700;
font-style: normal;
}

@font-face {
font-family: 'Titillio 3';
src: url('Titillio-Black.otf') format("truetype");
font-weight: 900;
font-style: normal;
}



/* DM MONO */
@font-face {
font-family: 'DMMono';
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file added example/assets/fonts/Titillio/Titillio-Thin.otf
Binary file not shown.
32 changes: 24 additions & 8 deletions example/ios/ExampleApp.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,10 @@
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 */; };
2097F76B68D349EFBD2A8A4C /* ReadexPro-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2473ADE2FEB04232B7E24471 /* ReadexPro-SemiBold.ttf */; };
493FA456AB57478891021E84 /* LICENSE.txt in Resources */ = {isa = PBXBuildFile; fileRef = 1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */; };
5CF5F4DBD1B145F487CED1AB /* DMMono-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 1E50F38389644583B83DCCCA /* DMMono-Medium.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 */; };
DD2EDEE079464A559B3FE549 /* ReadexPro-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = AE4AAA66E1BA4DC2947ADEF7 /* ReadexPro-Regular.ttf */; };
156FEFA162CE4118B7B0E409 /* TitilliumSansPro-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = 6C6D7476B139472CA35D0A7C /* TitilliumSansPro-Black.otf */; };
DBC2F57CBD33421CAAE5ECF2 /* TitilliumSansPro-BlackItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = B25A42218CA0455EB3DC54ED /* TitilliumSansPro-BlackItalic.otf */; };
5BE5117A57FA4A15A1780DF3 /* TitilliumSansPro-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 89F7AF8F0D5B498AA788BA72 /* TitilliumSansPro-Bold.otf */; };
Expand All @@ -30,6 +28,12 @@
516EE70168A44DD5BA34112C /* TitilliumSansPro-SemiboldItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = FF23D2E42775424F9E287256 /* TitilliumSansPro-SemiboldItalic.otf */; };
4E98DA23C9A74ABD815AA090 /* TitilliumSansPro-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 5FC82A404FE3426DAF4CC14B /* TitilliumSansPro-Thin.otf */; };
3A4D6DDAEE064A62BCB9E41C /* TitilliumSansPro-ThinItalic.otf in Resources */ = {isa = PBXBuildFile; fileRef = 2D914480BB10462696485089 /* TitilliumSansPro-ThinItalic.otf */; };
F202162BEDBF4EFA9725DB07 /* Titillio-Black.otf in Resources */ = {isa = PBXBuildFile; fileRef = 39686114A3A34738BB710A22 /* Titillio-Black.otf */; };
F9C0ED9A99C7437FBD4778D8 /* Titillio-Bold.otf in Resources */ = {isa = PBXBuildFile; fileRef = DD130FA537304F61B665495E /* Titillio-Bold.otf */; };
3D11B60599F144A3890A38E0 /* Titillio-Light.otf in Resources */ = {isa = PBXBuildFile; fileRef = B0BD34DD40394F79B4F2D808 /* Titillio-Light.otf */; };
87E3DCE22F794608A6962A07 /* Titillio-Regular.otf in Resources */ = {isa = PBXBuildFile; fileRef = FFAEF6D75A9C49B9A526D71A /* Titillio-Regular.otf */; };
0955C796B5F046E2853E8BD1 /* Titillio-Semibold.otf in Resources */ = {isa = PBXBuildFile; fileRef = 90F891E1358A4514B0AB02A4 /* Titillio-Semibold.otf */; };
ADCFCA9966004D4D81276190 /* Titillio-Thin.otf in Resources */ = {isa = PBXBuildFile; fileRef = 0F37C8794CE3484B8E10D4E3 /* Titillio-Thin.otf */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
Expand All @@ -55,14 +59,12 @@
19F6CBCC0A4E27FBF8BF4A61 /* libPods-ExampleApp-ExampleAppTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleApp-ExampleAppTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = LICENSE.txt; path = ../assets/fonts/TitilliumSansPro/LICENSE.txt; sourceTree = "<group>"; };
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 = "<group>"; };
2473ADE2FEB04232B7E24471 /* ReadexPro-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "ReadexPro-SemiBold.ttf"; path = "../assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf"; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
5DCACB8F33CDC322A6C60F78 /* libPods-ExampleApp.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-ExampleApp.a"; sourceTree = BUILT_PRODUCTS_DIR; };
81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = ExampleApp/LaunchScreen.storyboard; sourceTree = "<group>"; };
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 = "<group>"; };
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 = "<group>"; };
ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; };
6C6D7476B139472CA35D0A7C /* TitilliumSansPro-Black.otf */ = {isa = PBXFileReference; name = "TitilliumSansPro-Black.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Black.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
B25A42218CA0455EB3DC54ED /* TitilliumSansPro-BlackItalic.otf */ = {isa = PBXFileReference; name = "TitilliumSansPro-BlackItalic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-BlackItalic.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
Expand All @@ -76,6 +78,12 @@
FF23D2E42775424F9E287256 /* TitilliumSansPro-SemiboldItalic.otf */ = {isa = PBXFileReference; name = "TitilliumSansPro-SemiboldItalic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-SemiboldItalic.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
5FC82A404FE3426DAF4CC14B /* TitilliumSansPro-Thin.otf */ = {isa = PBXFileReference; name = "TitilliumSansPro-Thin.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-Thin.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
2D914480BB10462696485089 /* TitilliumSansPro-ThinItalic.otf */ = {isa = PBXFileReference; name = "TitilliumSansPro-ThinItalic.otf"; path = "../assets/fonts/TitilliumSansPro/TitilliumSansPro-ThinItalic.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
39686114A3A34738BB710A22 /* Titillio-Black.otf */ = {isa = PBXFileReference; name = "Titillio-Black.otf"; path = "../assets/fonts/Titillio/Titillio-Black.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
DD130FA537304F61B665495E /* Titillio-Bold.otf */ = {isa = PBXFileReference; name = "Titillio-Bold.otf"; path = "../assets/fonts/Titillio/Titillio-Bold.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
B0BD34DD40394F79B4F2D808 /* Titillio-Light.otf */ = {isa = PBXFileReference; name = "Titillio-Light.otf"; path = "../assets/fonts/Titillio/Titillio-Light.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
FFAEF6D75A9C49B9A526D71A /* Titillio-Regular.otf */ = {isa = PBXFileReference; name = "Titillio-Regular.otf"; path = "../assets/fonts/Titillio/Titillio-Regular.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
90F891E1358A4514B0AB02A4 /* Titillio-Semibold.otf */ = {isa = PBXFileReference; name = "Titillio-Semibold.otf"; path = "../assets/fonts/Titillio/Titillio-Semibold.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
0F37C8794CE3484B8E10D4E3 /* Titillio-Thin.otf */ = {isa = PBXFileReference; name = "Titillio-Thin.otf"; path = "../assets/fonts/Titillio/Titillio-Thin.otf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
Expand Down Expand Up @@ -173,10 +181,8 @@
8B89E994FF304D53907AB447 /* Resources */ = {
isa = PBXGroup;
children = (
AE4AAA66E1BA4DC2947ADEF7 /* ReadexPro-Regular.ttf */,
1E50F38389644583B83DCCCA /* DMMono-Medium.ttf */,
1CFF1D50D36F43F2BC0D124F /* LICENSE.txt */,
2473ADE2FEB04232B7E24471 /* ReadexPro-SemiBold.ttf */,
6C6D7476B139472CA35D0A7C /* TitilliumSansPro-Black.otf */,
B25A42218CA0455EB3DC54ED /* TitilliumSansPro-BlackItalic.otf */,
89F7AF8F0D5B498AA788BA72 /* TitilliumSansPro-Bold.otf */,
Expand All @@ -189,6 +195,12 @@
FF23D2E42775424F9E287256 /* TitilliumSansPro-SemiboldItalic.otf */,
5FC82A404FE3426DAF4CC14B /* TitilliumSansPro-Thin.otf */,
2D914480BB10462696485089 /* TitilliumSansPro-ThinItalic.otf */,
39686114A3A34738BB710A22 /* Titillio-Black.otf */,
DD130FA537304F61B665495E /* Titillio-Bold.otf */,
B0BD34DD40394F79B4F2D808 /* Titillio-Light.otf */,
FFAEF6D75A9C49B9A526D71A /* Titillio-Regular.otf */,
90F891E1358A4514B0AB02A4 /* Titillio-Semibold.otf */,
0F37C8794CE3484B8E10D4E3 /* Titillio-Thin.otf */,
);
name = Resources;
path = "";
Expand Down Expand Up @@ -301,10 +313,8 @@
files = (
81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */,
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
DD2EDEE079464A559B3FE549 /* ReadexPro-Regular.ttf in Resources */,
5CF5F4DBD1B145F487CED1AB /* DMMono-Medium.ttf in Resources */,
493FA456AB57478891021E84 /* LICENSE.txt in Resources */,
2097F76B68D349EFBD2A8A4C /* ReadexPro-SemiBold.ttf in Resources */,
156FEFA162CE4118B7B0E409 /* TitilliumSansPro-Black.otf in Resources */,
DBC2F57CBD33421CAAE5ECF2 /* TitilliumSansPro-BlackItalic.otf in Resources */,
5BE5117A57FA4A15A1780DF3 /* TitilliumSansPro-Bold.otf in Resources */,
Expand All @@ -317,6 +327,12 @@
516EE70168A44DD5BA34112C /* TitilliumSansPro-SemiboldItalic.otf in Resources */,
4E98DA23C9A74ABD815AA090 /* TitilliumSansPro-Thin.otf in Resources */,
3A4D6DDAEE064A62BCB9E41C /* TitilliumSansPro-ThinItalic.otf in Resources */,
F202162BEDBF4EFA9725DB07 /* Titillio-Black.otf in Resources */,
F9C0ED9A99C7437FBD4778D8 /* Titillio-Bold.otf in Resources */,
3D11B60599F144A3890A38E0 /* Titillio-Light.otf in Resources */,
87E3DCE22F794608A6962A07 /* Titillio-Regular.otf in Resources */,
0955C796B5F046E2853E8BD1 /* Titillio-Semibold.otf in Resources */,
ADCFCA9966004D4D81276190 /* Titillio-Thin.otf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down
8 changes: 6 additions & 2 deletions example/ios/ExampleApp/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,7 @@
<true/>
<key>UIAppFonts</key>
<array>
<string>ReadexPro-Regular.ttf</string>
<string>DMMono-Medium.ttf</string>
<string>ReadexPro-SemiBold.ttf</string>
<string>TitilliumSansPro-Black.otf</string>
<string>TitilliumSansPro-BlackItalic.otf</string>
<string>TitilliumSansPro-Bold.otf</string>
Expand All @@ -70,6 +68,12 @@
<string>TitilliumSansPro-SemiboldItalic.otf</string>
<string>TitilliumSansPro-Thin.otf</string>
<string>TitilliumSansPro-ThinItalic.otf</string>
<string>Titillio-Black.otf</string>
<string>Titillio-Bold.otf</string>
<string>Titillio-Light.otf</string>
<string>Titillio-Regular.otf</string>
<string>Titillio-Semibold.otf</string>
<string>Titillio-Thin.otf</string>
</array>
</dict>
</plist>
24 changes: 20 additions & 4 deletions example/ios/link-assets-manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,28 @@
"sha1": "6bb6bf0c5d7a7f50606cc276cc4ef1787f52a928"
},
{
"path": "assets/fonts/ReadexPro/ReadexPro-Regular.ttf",
"sha1": "93e4080794b725f216a94b57ed62a51bc77bce91"
"path": "assets/fonts/Titillio/Titillio-Black.otf",
"sha1": "8dfd8a6e9f8fadb290a346f1e66db4ad649b5d89"
},
{
"path": "assets/fonts/ReadexPro/ReadexPro-SemiBold.ttf",
"sha1": "b4ec28a6b1ba6ed730beb37f06b1b81c5e2163a3"
"path": "assets/fonts/Titillio/Titillio-Bold.otf",
"sha1": "2d927e9c2e67e1998d2920134e030c6afb7e0186"
},
{
"path": "assets/fonts/Titillio/Titillio-Light.otf",
"sha1": "a45f2f9ab5d561d30ef0b56a9b768e0a2953da60"
},
{
"path": "assets/fonts/Titillio/Titillio-Regular.otf",
"sha1": "4e174fe900e7c80161a371500582d81c08d2c641"
},
{
"path": "assets/fonts/Titillio/Titillio-Semibold.otf",
"sha1": "d0b2a56269c66d5c99b9e0075091d7cc02cafe5f"
},
{
"path": "assets/fonts/Titillio/Titillio-Thin.otf",
"sha1": "91ac3f7e483eaaf0c3d6b65609b336a13ebf4730"
},
{
"path": "assets/fonts/DMMono/DMMono-Medium.ttf",
Expand Down
2 changes: 1 addition & 1 deletion example/react-native.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
},
assets: [
"./assets/fonts/TitilliumSansPro",
"./assets/fonts/ReadexPro",
"./assets/fonts/Titillio",
"./assets/fonts/DMMono"
]
};
34 changes: 14 additions & 20 deletions example/src/components/IconViewerBox.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
import { IOColors, useIOTheme } from "@pagopa/io-app-design-system";
import {
IOColors,
IOFontSize,
IOText,
useIOTheme
} from "@pagopa/io-app-design-system";
import React from "react";
import { StyleSheet, Text, View } from "react-native";
import { StyleSheet, View } from "react-native";

export const iconItemGutter = 8;

Expand Down Expand Up @@ -41,15 +46,6 @@ const styles = StyleSheet.create({
iconItemLarger: {
padding: 12
},
iconLabelSmall: {
fontSize: 8
},
iconLabelMedium: {
fontSize: 10
},
iconLabelLarge: {
fontSize: 11
},
signalDot: {
position: "absolute",
right: 4,
Expand All @@ -72,17 +68,17 @@ const sizeMap = {
small: {
wrapper: styles.iconWrapperSmall,
item: styles.iconItemLarger,
label: styles.iconLabelSmall
label: 9 as IOFontSize
},
medium: {
wrapper: styles.iconWrapperMedium,
item: null,
label: styles.iconLabelMedium
label: 10 as IOFontSize
},
large: {
wrapper: styles.iconWrapperLarge,
item: styles.iconItemLarger,
label: styles.iconLabelLarge
label: 11 as IOFontSize
}
};

Expand Down Expand Up @@ -112,16 +108,14 @@ export const IconViewerBox = ({
</View>
<View style={styles.nameWrapper}>
{name && (
<Text
<IOText
numberOfLines={1}
ellipsizeMode="tail"
style={[
{ color: IOColors[theme["textBody-secondary"]] },
size ? sizeMap[size].label : styles.iconLabelMedium
]}
size={size ? sizeMap[size].label : sizeMap.medium.label}
style={{ color: IOColors[theme["textBody-tertiary"]] }}
>
{name}
</Text>
</IOText>
)}
</View>
</View>
Expand Down
Loading
Loading