Skip to content

bug on android for Bold typography #1200

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.

Sign up for GitHub

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

Merged
merged 4 commits into from
Feb 27, 2021
Merged

bug on android for Bold typography #1200

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
96bf1b4
bug on android for Bold typography
adxicible Feb 22, 2021
b3ff340
use === instead of ==
adxicible Feb 22, 2021
72c92ef
remove space before paren
adxicible Feb 22, 2021
128c338
Update src/style/typographyPresets.ts
adxicible Feb 27, 2021
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
12 changes: 6 additions & 6 deletions src/style/typographyPresets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,23 @@ const text30: TextStyle = {
// text40
const text40: TextStyle = {
fontSize: 28,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.HEAVY : undefined,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.HEAVY : 'bold',
lineHeight: 32,
fontFamily: 'System'
};

// text50
const text50: TextStyle = {
fontSize: 24,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.HEAVY : undefined,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.HEAVY : 'bold',
lineHeight: 28,
fontFamily: 'System'
};

// text60
const text60: TextStyle = {
fontSize: 20,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.HEAVY : undefined,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.HEAVY : 'bold',
lineHeight: 24,
fontFamily: 'System'
};
Expand Down Expand Up @@ -90,15 +90,15 @@ const text80: TextStyle = {
// text90
const text90: TextStyle = {
fontSize: 12,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.BOLD : undefined,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.BOLD : 'bold',
lineHeight: 16,
fontFamily: 'System'
};

// text100
const text100: TextStyle = {
fontSize: 10,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.BOLD : undefined,
fontWeight: Constants.isIOS ? WEIGHT_TYPES.BOLD : 'bold',
lineHeight: 16,
fontFamily: 'System'
};
Expand Down Expand Up @@ -225,7 +225,7 @@ _.forEach(keys, (key) => {
const fontWeightKey = `${fontKey}${weightValue}` as keyof TypographyKeys;
Typography[fontWeightKey] = {
...Typography[fontKey],
fontWeight: Constants.isIOS ? WEIGHT_TYPES[weightKey] : undefined
fontWeight: Constants.isIOS ? WEIGHT_TYPES[weightKey] : ['BO', 'H', 'BL'].includes(weightKey) ? 'bold' : undefined
};
});
});
Expand Down