SW/mattermost-mobile
2
0
Fork 0
forked from Ivasoft/mattermost-mobile
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Writing OpenSans properly

Browse Source
This commit is contained in:
Avinash Lingaloo
2021-09-09 19:26:12 +04:00
parent ba077dc399
commit d948d1208e
9 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
android/app/src/main/assets/fonts/OpenSans-Regular.ttf → android/app/src/main/assets/fonts/OpenSans.ttf
View File

0
android/app/src/main/assets/fonts/OpenSans-LightItalic.ttf → android/app/src/main/assets/fonts/OpenSansLight-Italic.ttf
View File

2
app/components/post_list/post/body/files/image_file_overlay.tsx
View File

@@ -24,7 +24,7 @@ const getStyleSheet = (scale: number, th: Theme) => {
moreImagesText: {
color: theme.sidebarHeaderTextColor,
fontSize: Math.round(PixelRatio.roundToNearestPixel(24 * scale)),
fontFamily: 'Open Sans',
fontFamily: 'OpenSans',
textAlign: 'center',
},
};

2
app/screens/home/tab_bar/home.tsx
View File

@@ -45,7 +45,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
mentions: {
fontSize: 10,
fontWeight: 'bold',
fontFamily: 'Open Sans',
fontFamily: 'OpenSans',
lineHeight: Platform.select({android: 15, ios: 12.6}),
borderColor: theme.centerChannelBg,
borderWidth: 2,

2
app/utils/font_family.ts
View File

@@ -14,7 +14,7 @@ import {StyleSheet, Text} from 'react-native';
const setFontFamily = () => {
const styles = StyleSheet.create({
defaultText: {
fontFamily: 'Open Sans',
fontFamily: 'OpenSans',
fontSize: 16,
},
});

0
assets/fonts/OpenSans-Regular.ttf → assets/fonts/OpenSans.ttf
View File

0
assets/fonts/OpenSans-LightItalic.ttf → assets/fonts/OpenSansLight-Italic.ttf
View File

18
ios/Mattermost.xcodeproj/project.pbxproj
View File

@@ -12,6 +12,8 @@
13B07FBC1A68108700A75B9A /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.m */; };
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; };
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2746AF7026EA5646002C3C37 /* OpenSans.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2746AF6E26EA5646002C3C37 /* OpenSans.ttf */; };
2746AF7126EA5646002C3C37 /* OpenSansLight-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2746AF6F26EA5646002C3C37 /* OpenSansLight-Italic.ttf */; };
274DCD9F26E9249800C145AC /* Metropolis-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 274DCD9C26E9249800C145AC /* Metropolis-SemiBold.ttf */; };
274DCDA026E9249800C145AC /* Metropolis-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 274DCD9D26E9249800C145AC /* Metropolis-Regular.ttf */; };
274DCDA126E9249800C145AC /* Metropolis-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 274DCD9E26E9249800C145AC /* Metropolis-Light.ttf */; };
@@ -49,9 +51,7 @@
7FEB109D1F61019C0039A015 /* MattermostManaged.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEB109A1F61019C0039A015 /* MattermostManaged.m */; };
84E3264B229834C30055068A /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E325FF229834C30055068A /* Config.swift */; };
9358B95F95184EE0A4DCE629 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */; };
A08D512E7ADC40CCAD055A9E /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC977883E2624E05975CA65B /* OpenSans-Regular.ttf */; };
D719A67137964F08BE47A5FC /* OpenSans-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */; };
F083DB472349411A8E6E7AAD /* OpenSans-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE17F630DB5D41FD93F32D22 /* OpenSans-LightItalic.ttf */; };
/* End PBXBuildFile section */
/* Begin PBXContainerItemProxy section */
@@ -139,6 +139,8 @@
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Mattermost/main.m; sourceTree = "<group>"; };
182D203F539AF68F1647EFAF /* Pods-Mattermost-MattermostTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost-MattermostTests.release.xcconfig"; path = "Target Support Files/Pods-Mattermost-MattermostTests/Pods-Mattermost-MattermostTests.release.xcconfig"; sourceTree = "<group>"; };
25BF2BACE89201DE6E585B7E /* Pods-Mattermost.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost.release.xcconfig"; path = "Target Support Files/Pods-Mattermost/Pods-Mattermost.release.xcconfig"; sourceTree = "<group>"; };
2746AF6E26EA5646002C3C37 /* OpenSans.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = OpenSans.ttf; path = ../assets/fonts/OpenSans.ttf; sourceTree = "<group>"; };
2746AF6F26EA5646002C3C37 /* OpenSansLight-Italic.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "OpenSansLight-Italic.ttf"; path = "../assets/fonts/OpenSansLight-Italic.ttf"; sourceTree = "<group>"; };
274DCD9C26E9249800C145AC /* Metropolis-SemiBold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-SemiBold.ttf"; path = "../assets/fonts/Metropolis-SemiBold.ttf"; sourceTree = "<group>"; };
274DCD9D26E9249800C145AC /* Metropolis-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Regular.ttf"; path = "../assets/fonts/Metropolis-Regular.ttf"; sourceTree = "<group>"; };
274DCD9E26E9249800C145AC /* Metropolis-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Light.ttf"; path = "../assets/fonts/Metropolis-Light.ttf"; sourceTree = "<group>"; };
@@ -273,6 +275,11 @@
0156F464626F49C2977D7982 /* Resources */ = {
isa = PBXGroup;
children = (
2746AF6E26EA5646002C3C37 /* OpenSans.ttf */,
2746AF6F26EA5646002C3C37 /* OpenSansLight-Italic.ttf */,
274DCD9E26E9249800C145AC /* Metropolis-Light.ttf */,
274DCD9D26E9249800C145AC /* Metropolis-Regular.ttf */,
274DCD9C26E9249800C145AC /* Metropolis-SemiBold.ttf */,
D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */,
32AC3D4EA79E44738A6E9766 /* OpenSans-BoldItalic.ttf */,
3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */,
@@ -429,9 +436,6 @@
83CBB9F61A601CBA00E9B192 = {
isa = PBXGroup;
children = (
274DCD9E26E9249800C145AC /* Metropolis-Light.ttf */,
274DCD9D26E9249800C145AC /* Metropolis-Regular.ttf */,
274DCD9C26E9249800C145AC /* Metropolis-SemiBold.ttf */,
4953BF5F2368AE8600593328 /* SwimeProxy.swift */,
13B07FAE1A68108700A75B9A /* Mattermost */,
7F240A1A220D3A2300637665 /* MattermostShare */,
@@ -629,6 +633,8 @@
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
2746AF7026EA5646002C3C37 /* OpenSans.ttf in Resources */,
2746AF7126EA5646002C3C37 /* OpenSansLight-Italic.ttf in Resources */,
274DCD9F26E9249800C145AC /* Metropolis-SemiBold.ttf in Resources */,
274DCDA026E9249800C145AC /* Metropolis-Regular.ttf in Resources */,
274DCDA126E9249800C145AC /* Metropolis-Light.ttf in Resources */,
@@ -642,8 +648,6 @@
0111A42B7F264BCF8CBDE3ED /* OpenSans-ExtraBoldItalic.ttf in Resources */,
0C0D24F53F254F75869E5951 /* OpenSans-Italic.ttf in Resources */,
2D5296A8926B4D7FBAF2D6E2 /* OpenSans-Light.ttf in Resources */,
F083DB472349411A8E6E7AAD /* OpenSans-LightItalic.ttf in Resources */,
A08D512E7ADC40CCAD055A9E /* OpenSans-Regular.ttf in Resources */,
62A8448264674B4D95A5A7C2 /* OpenSans-Semibold.ttf in Resources */,
69AC753E496743BABB7A7124 /* OpenSans-SemiboldItalic.ttf in Resources */,
);

4
ios/Mattermost/Info.plist
View File

@@ -91,8 +91,8 @@
<string>OpenSans-ExtraBoldItalic.ttf</string>
<string>OpenSans-Italic.ttf</string>
<string>OpenSans-Light.ttf</string>
<string>OpenSans-LightItalic.ttf</string>
<string>OpenSans-Regular.ttf</string>
<string>OpenSansLight-Italic.ttf</string>
<string>OpenSans.ttf</string>
<string>OpenSans-Semibold.ttf</string>
<string>OpenSans-SemiboldItalic.ttf</string>
<string>Roboto-Black.ttf</string>