Skip to content

Commit

Permalink
fix: switch gurmukhi font to sant lipi (#308)
Browse files Browse the repository at this point in the history
  • Loading branch information
bhajneet authored Aug 2, 2022
1 parent a6bcf74 commit 8a20192
Show file tree
Hide file tree
Showing 26 changed files with 36 additions and 91 deletions.
Binary file removed assets/fonts/MuktaMahee-Bold.ttf
Binary file not shown.
Binary file removed assets/fonts/MuktaMahee-ExtraBold.ttf
Binary file not shown.
Binary file removed assets/fonts/MuktaMahee-ExtraLight.ttf
Binary file not shown.
Binary file removed assets/fonts/MuktaMahee-Light.ttf
Binary file not shown.
Binary file removed assets/fonts/MuktaMahee-Medium.ttf
Binary file not shown.
Binary file removed assets/fonts/MuktaMahee-Regular.ttf
Binary file not shown.
Binary file removed assets/fonts/MuktaMahee-SemiBold.ttf
Binary file not shown.
Binary file removed assets/fonts/NotoSans-Bold.ttf
Binary file not shown.
Binary file removed assets/fonts/NotoSans-Light.ttf
Binary file not shown.
Binary file removed assets/fonts/NotoSans-Regular.ttf
Binary file not shown.
Binary file removed assets/fonts/NotoSansGurmukhiUI-Bold.ttf
Binary file not shown.
Binary file removed assets/fonts/NotoSansGurmukhiUI-Regular.ttf
Binary file not shown.
Binary file removed assets/fonts/OpenGurbaniAkhar-Black.otf
Binary file not shown.
Binary file added assets/fonts/SantLipi-Medium.ttf
Binary file not shown.
Binary file added assets/fonts/SantLipi-Regular.ttf
Binary file not shown.
Binary file added assets/fonts/SantLipi-SemiBold.ttf
Binary file not shown.
64 changes: 12 additions & 52 deletions ios/Mobile.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

18 changes: 4 additions & 14 deletions ios/Mobile/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -36,15 +36,9 @@
</dict>
</dict>
<key>NSLocationWhenInUseUsageDescription</key>
<string></string>
<string/>
<key>UIAppFonts</key>
<array>
<string>NotoSans-Bold.ttf</string>
<string>NotoSans-Light.ttf</string>
<string>NotoSans-Regular.ttf</string>
<string>NotoSansGurmukhiUI-Bold.ttf</string>
<string>NotoSansGurmukhiUI-Regular.ttf</string>
<string>OpenGurbaniAkhar-Black.otf</string>
<string>ShabadOsIcons.ttf</string>
<string>AntDesign.ttf</string>
<string>Entypo.ttf</string>
Expand All @@ -62,13 +56,9 @@
<string>Octicons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Zocial.ttf</string>
<string>MuktaMahee-Bold.ttf</string>
<string>MuktaMahee-ExtraBold.ttf</string>
<string>MuktaMahee-ExtraLight.ttf</string>
<string>MuktaMahee-Light.ttf</string>
<string>MuktaMahee-Medium.ttf</string>
<string>MuktaMahee-Regular.ttf</string>
<string>MuktaMahee-SemiBold.ttf</string>
<string>SantLipi-Medium.ttf</string>
<string>SantLipi-Regular.ttf</string>
<string>SantLipi-SemiBold.ttf</string>
</array>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
Expand Down
6 changes: 3 additions & 3 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -641,13 +641,13 @@ SPEC CHECKSUMS:
Flipper-RSocket: d9d9ade67cbecf6ac10730304bf5607266dd2541
FlipperKit: d8d346844eca5d9120c17d441a2f38596e8ed2b9
fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
glog: 85ecdd10ee8d8ec362ef519a6a45ff9aa27b2e85
glog: 5337263514dd6f09803962437687240c5dc39aa4
hermes-engine: bf7577d12ac6ccf53ab8b5af3c6ccf0dd8458c5c
libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
MMKV: f281020c9d9be5eb7a03ae746dc4deb570e46c23
MMKVCore: df0565f6b58463604731a68ba6cd89bc0b2d1d55
OpenSSL-Universal: 1aa4f6a6ee7256b83db99ec1ccdaa80d10f9af9b
RCT-Folly: 803a9cfd78114b2ec0f140cfa6fa2a6bafb2d685
RCT-Folly: a21c126816d8025b547704b777a2ba552f3d9fa9
RCTRequired: 3c77b683474faf23920fbefc71c4e13af21470c0
RCTTypeSafety: 720b1841260dac692444c2822b27403178da8b28
React: 25970dd74abbdac449ca66dec4107652cacc606d
Expand Down Expand Up @@ -693,4 +693,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 5f4b430c92044121a36fdd0478d2d88e9b3ff143

COCOAPODS: 1.11.2
COCOAPODS: 1.11.3
14 changes: 7 additions & 7 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"@sentry/react-native": "^3.3.3",
"@splitsoftware/splitio-react-native": "^0.1.0",
"env-var": "^7.1.1",
"gurmukhi-utils": "^3.2.1",
"gurmukhi-utils": "^3.2.2",
"i18next": "^21.6.13",
"jotai": "^1.6.0",
"lodash": "^4.17.21",
Expand Down
3 changes: 1 addition & 2 deletions src/components/GurmukhiLine.tsx
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
import { stripVishraams, toUnicode } from 'gurmukhi-utils'
import { StyleSheet } from 'react-native'

import OS from '../helpers/os'
import Fonts from '../themes/fonts'
import Units from '../themes/units'
import Typography, { TypographyProps } from './Typography'

const styles = StyleSheet.create( {
root: {
...( OS.android && { fontFamily: Fonts.MuktaMahee } ),
fontFamily: Fonts.SantLipiRegular,
},
} )

Expand Down
4 changes: 2 additions & 2 deletions src/helpers/transliterators.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import { toEnglish, toHindi, toShamukhi } from 'gurmukhi-utils'
import { toEnglish, toHindi, toShahmukhi } from 'gurmukhi-utils'

import Languages from './languages'

const transliterators = {
[ Languages.English ]: toEnglish,
[ Languages.Hindi ]: toHindi,
[ Languages.Urdu ]: toShamukhi,
[ Languages.Urdu ]: toShahmukhi,
}

export default transliterators
3 changes: 1 addition & 2 deletions src/screens/Collections/Item.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Pressable, PressableProps, StyleSheet } from 'react-native'
import Icon from 'react-native-vector-icons/MaterialCommunityIcons'

import Typography from '../../components/Typography'
import OS from '../../helpers/os'
import Colors from '../../themes/colors'
import Fonts from '../../themes/fonts'
import Units from '../../themes/units'
Expand All @@ -21,9 +20,9 @@ const styles = StyleSheet.create( {
},
title: {
color: Colors.PrimaryText,
fontFamily: Fonts.SantLipiRegular,
fontSize: Units.Base * Units.GurmukhiLatinRatio,
lineHeight: Units.Base * Units.GurmukhiLineHeightMultiplier,
...( OS.android && { fontFamily: Fonts.MuktaMahee } ),
},
} )

Expand Down
4 changes: 2 additions & 2 deletions src/screens/Search/Result.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ import { px, py } from '../../themes/utils'

const styles = StyleSheet.create( {
gurbani: {
fontFamily: Fonts.SantLipiRegular,
fontSize: Units.Base * Units.GurmukhiLatinRatio,
lineHeight: Units.Base * Units.GurmukhiLineHeightMultiplier,
...( OS.android && {
paddingBottom: 6,
fontFamily: Fonts.MuktaMahee,
} ),
},
header: {
Expand All @@ -29,9 +29,9 @@ const styles = StyleSheet.create( {
justifyContent: 'space-between',
},
headerGurmukhi: {
fontFamily: Fonts.SantLipiRegular,
fontSize: Units.Footnote * Units.GurmukhiLatinRatio,
lineHeight: Units.Footnote * Units.GurmukhiLineHeightMultiplier,
...( OS.android && { fontFamily: Fonts.MuktaMahee } ),
},
root: {
...px( Units.HorizontalLayoutMargin ),
Expand Down
9 changes: 3 additions & 6 deletions src/themes/fonts.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
enum Fonts {
OpenGurbaniAkharBlack = 'OpenGurbaniAkhar-Black',
NotoSansRegular = 'NotoSans-Regular',
NotoSansLight = 'NotoSans-Light',
NotoSansGurmukhiRegular = 'NotoSansGurmukhiUI-Regular',
NotoSansGurmukhiBold = 'NotoSansGurmukhiUI-Bold',
MuktaMahee = 'MuktaMahee-Regular',
SantLipiRegular = 'SantLipi-Regular',
SantLipiMedium = 'SantLipi-Medium',
SantLipiSemiBold = 'SantLipi-SemiBold',
}

export default Fonts

0 comments on commit 8a20192

Please sign in to comment.