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

fixed OpenSans, added Metropolis fonts & modified post text styles (#5728)

Browse Source
This commit is contained in:
Elias Nahum
2021-10-07 17:20:39 -03:00
committed by GitHub
parent 7f1f7110da
commit 0807a20946
46 changed files with 93 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
android/app/src/main/assets/fonts/Metropolis-Light.ttf Normal file
View File

Binary file not shown.

BIN
android/app/src/main/assets/fonts/Metropolis-SemiBold.ttf Normal file
View File

Binary file not shown.

BIN
android/app/src/main/assets/fonts/Metropolis.ttf Normal file
View File

Binary file not shown.

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

2
app/components/channel_icon/index.tsx
View File

@@ -59,7 +59,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
group: {
color: theme.sidebarText,
fontSize: 10,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
},
groupActive: {
color: theme.sidebarTextActiveColor,

2
app/components/failed_action/index.tsx
View File

@@ -32,7 +32,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
title: {
color: changeOpacity(theme.centerChannelColor, 0.8),
fontSize: 20,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
marginBottom: 15,
marginTop: 10,
},

3
app/components/post_list/combined_user_activity/combined_user_activity.tsx
View File

@@ -36,7 +36,8 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
return {
baseText: {
color: changeOpacity(theme.centerChannelColor, 0.6),
fontSize: 15,
fontSize: 16,
lineHeight: 20,
},
body: {
flex: 1,

6
app/components/post_list/combined_user_activity/last_users.tsx
View File

@@ -25,12 +25,14 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
baseText: {
color: theme.centerChannelColor,
opacity: 0.6,
fontSize: 15,
fontSize: 16,
lineHeight: 20,
},
linkText: {
color: theme.linkColor,
opacity: 0.8,
fontSize: 15,
fontSize: 16,
lineHeight: 20,
},
};
});

5
app/components/post_list/date_separator/index.tsx
View File

@@ -34,8 +34,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
},
date: {
color: theme.centerChannelColor,
fontSize: 14,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
fontSize: 12,
lineHeight: 16,
},
};
});

3
app/components/post_list/new_message_line/index.tsx
View File

@@ -64,7 +64,8 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
backgroundColor: theme.newMessageSeparator,
},
text: {
fontSize: 14,
lineHeight: 16,
fontSize: 12,
color: theme.newMessageSeparator,
},
};

2
app/components/post_list/post/body/add_members/index.tsx
View File

@@ -39,7 +39,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
return {
message: {
color: changeOpacity(theme.centerChannelColor, 0.6),
fontSize: 15,
fontSize: 16,
lineHeight: 20,
},
};

2
app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx
View File

@@ -50,7 +50,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
text: {
color: STATUS_COLORS.default,
fontSize: 15,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
lineHeight: 17,
},
};

2
app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx
View File

@@ -21,7 +21,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
},
title: {
color: theme.centerChannelColor,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
marginBottom: 5,
fontSize: 14,
lineHeight: 20,

2
app/components/post_list/post/body/content/message_attachments/action_button/index.tsx
View File

@@ -41,7 +41,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
text: {
color: STATUS_COLORS.default,
fontSize: 15,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
lineHeight: 17,
},
};

2
app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx
View File

@@ -35,7 +35,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
},
heading: {
color: theme.centerChannelColor,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
},
table: {
flex: 1,

2
app/components/post_list/post/body/content/message_attachments/attachment_title.tsx
View File

@@ -26,7 +26,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
title: {
color: theme.centerChannelColor,
fontSize: 14,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
lineHeight: 20,
marginBottom: 5,
},

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

@@ -32,7 +32,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
flexDirection: 'column',
flexWrap: 'wrap',
fontSize: 14,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
color: theme.centerChannelColor,
paddingRight: 10,
},

5
app/components/post_list/post/body/message/message.tsx
View File

@@ -42,8 +42,9 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
},
message: {
color: theme.centerChannelColor,
fontSize: 15,
lineHeight: 20,
fontFamily: 'OpenSans',
fontSize: 16,
lineHeight: 24,
},
pendingPost: {
opacity: 0.5,

7
app/components/post_list/post/header/display_name/index.tsx
View File

@@ -28,15 +28,14 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
return {
displayName: {
color: theme.centerChannelColor,
fontSize: 15,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
fontSize: 16,
lineHeight: 24,
flexGrow: 1,
paddingVertical: 2,
},
displayNameContainer: {
maxWidth: '60%',
marginRight: 5,
marginBottom: 3,
},
displayNameContainerBotReplyWidth: {
maxWidth: '50%',

1
app/components/post_list/post/header/header.tsx
View File

@@ -56,6 +56,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
time: {
color: theme.centerChannelColor,
fontSize: 12,
lineHeight: 16,
marginTop: 5,
opacity: 0.5,
flex: 1,

30
app/components/post_list/post/system_message/__snapshots__/system_message_helpers.test.js.snap
View File

@@ -18,7 +18,7 @@ exports[`renderSystemMessage uses renderer for Channel Display Name update 1`] =
Array [
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
},
Object {
@@ -37,7 +37,7 @@ exports[`renderSystemMessage uses renderer for Channel Display Name update 1`] =
style={
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
}
}
@@ -67,7 +67,7 @@ exports[`renderSystemMessage uses renderer for Channel Header update 1`] = `
Array [
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
},
Object {
@@ -86,7 +86,7 @@ exports[`renderSystemMessage uses renderer for Channel Header update 1`] = `
style={
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
}
}
@@ -103,7 +103,7 @@ exports[`renderSystemMessage uses renderer for Channel Purpose update 1`] = `
style={
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
}
}
@@ -130,7 +130,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 1
Array [
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
},
Object {
@@ -149,7 +149,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 1
style={
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
}
}
@@ -179,7 +179,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 2
Array [
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
},
Object {
@@ -198,7 +198,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 2
style={
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
}
}
@@ -211,7 +211,7 @@ exports[`renderSystemMessage uses renderer for Guest added and join to channel 2
Array [
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
},
Object {
@@ -247,7 +247,7 @@ exports[`renderSystemMessage uses renderer for OLD archived channel without a us
style={
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
}
}
@@ -277,7 +277,7 @@ exports[`renderSystemMessage uses renderer for archived channel 1`] = `
Array [
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
},
Object {
@@ -296,7 +296,7 @@ exports[`renderSystemMessage uses renderer for archived channel 1`] = `
style={
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
}
}
@@ -326,7 +326,7 @@ exports[`renderSystemMessage uses renderer for unarchived channel 1`] = `
Array [
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
},
Object {
@@ -345,7 +345,7 @@ exports[`renderSystemMessage uses renderer for unarchived channel 1`] = `
style={
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 15,
"fontSize": 16,
"lineHeight": 20,
}
}

2
app/components/post_list/post/system_message/system_message.tsx
View File

@@ -46,7 +46,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
return {
systemMessage: {
color: changeOpacity(theme.centerChannelColor, 0.6),
fontSize: 15,
fontSize: 16,
lineHeight: 20,
},
};

2
app/components/system_header/index.tsx
View File

@@ -40,7 +40,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
displayName: {
color: theme.centerChannelColor,
fontSize: 15,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
flexGrow: 1,
paddingVertical: 2,
},

2
app/components/tag/index.tsx
View File

@@ -32,8 +32,8 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
},
text: {
color: theme.centerChannelColor,
fontFamily: 'OpenSans-Semibold',
fontSize: 10,
fontWeight: '600',
},
title: {
backgroundColor: changeOpacity(theme.sidebarHeaderTextColor, 0.15),

2
app/screens/about/index.tsx
View File

@@ -320,7 +320,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
footerTitleText: {
color: changeOpacity(theme.centerChannelColor, 0.5),
fontSize: 11,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
lineHeight: 13,
},
footerText: {

2
app/screens/channel/channel_nav_bar/channel_title/channel_display_name/index.tsx
View File

@@ -46,7 +46,7 @@ const getStyle = makeStyleSheetFromTheme((theme) => {
text: {
color: theme.sidebarHeaderTextColor,
fontSize: 18,
fontWeight: 'bold',
fontFamily: 'OpenSans-Semibold',
textAlign: 'center',
flex: 0,
flexShrink: 1,

2
app/screens/channel/channel_nav_bar/channel_title/index.tsx
View File

@@ -141,7 +141,7 @@ const getStyle = makeStyleSheetFromTheme((theme) => {
text: {
color: theme.sidebarHeaderTextColor,
fontSize: 18,
fontWeight: 'bold',
fontFamily: 'OpenSans-Semibold',
textAlign: 'center',
flex: 0,
flexShrink: 1,

2
app/screens/channel/index.tsx
View File

@@ -45,7 +45,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
},
sectionTitle: {
fontSize: 16,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
color: theme.centerChannelColor,
},
}));

2
app/screens/forgot_password/index.tsx
View File

@@ -173,7 +173,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
borderColor: '#d6e9c6',
},
emailId: {
fontWeight: 'bold',
fontFamily: 'OpenSans-Semibold',
},
successTxtColor: {
color: '#3c763d',

2
app/screens/home/channel_list/index.tsx
View File

@@ -34,7 +34,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
},
sectionTitle: {
fontSize: 24,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
color: theme.centerChannelColor,
},
}));

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

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

2
app/screens/login/index.tsx
View File

@@ -466,7 +466,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
marginTop: 15,
marginBottom: 15,
fontSize: 32,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
},
}));

2
app/screens/login_options/index.tsx
View File

@@ -41,7 +41,7 @@ const getStyles = makeStyleSheetFromTheme((theme: Theme) => ({
marginTop: 15,
marginBottom: 15,
fontSize: 32,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
},
subheader: {
textAlign: 'center',

3
app/screens/mfa/__snapshots__/mfa.test.tsx.snap
View File

@@ -66,8 +66,8 @@ exports[`*** MFA Screen *** MFA screen should match snapshot 1`] = `
Array [
Object {
"color": "#3f4350",
"fontFamily": "OpenSans-Semibold",
"fontSize": 32,
"fontWeight": "600",
"marginBottom": 15,
"marginTop": 15,
"textAlign": "center",
@@ -75,7 +75,6 @@ exports[`*** MFA Screen *** MFA screen should match snapshot 1`] = `
Object {
"color": "rgba(63,67,80,0.6)",
"fontSize": 20,
"fontWeight": "400",
},
]
}

3
app/screens/mfa/index.tsx
View File

@@ -209,12 +209,11 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
marginTop: 15,
marginBottom: 15,
fontSize: 32,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
},
label: {
color: changeOpacity(theme.centerChannelColor, 0.6),
fontSize: 20,
fontWeight: '400',
},
container: {
flex: 1,

1
app/screens/server/index.tsx
View File

@@ -401,7 +401,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
marginTop: 15,
marginBottom: 15,
fontSize: 20,
fontWeight: '400',
},
connectText: {
textAlign: 'center',

2
app/screens/sso/sso_with_redirect_url.tsx
View File

@@ -146,7 +146,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
errorText: {
color: changeOpacity(theme.centerChannelColor, 0.6),
fontSize: 16,
fontWeight: '400',
lineHeight: 23,
textAlign: 'center',
},
@@ -159,7 +158,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
infoText: {
color: changeOpacity(theme.centerChannelColor, 0.6),
fontSize: 16,
fontWeight: '400',
lineHeight: 23,
marginBottom: 6,
},

1
app/screens/sso/sso_with_webview.tsx
View File

@@ -253,7 +253,6 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
errorText: {
color: changeOpacity(theme.centerChannelColor, 0.4),
fontSize: 16,
fontWeight: '400',
lineHeight: 23,
paddingHorizontal: 30,
},

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,
},
});

34
app/utils/markdown/index.ts
View File

@@ -14,60 +14,61 @@ export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme: Theme) => {
return {
emph: {
fontStyle: 'italic',
fontFamily: 'OpenSans-Italic',
},
strong: {
fontWeight: 'bold',
fontFamily: 'OpenSans-Semibold',
},
del: {
textDecorationLine: 'line-through',
},
link: {
color: theme.linkColor,
fontFamily: 'OpenSans',
},
heading1: {
fontSize: 22,
fontWeight: '700',
fontFamily: 'OpenSans-Bold',
fontSize: 24,
lineHeight: 25,
},
heading1Text: {
paddingBottom: 8,
},
heading2: {
fontSize: 20,
fontWeight: '700',
fontFamily: 'OpenSans-Bold',
fontSize: 22,
lineHeight: 25,
},
heading2Text: {
paddingBottom: 8,
},
heading3: {
fontSize: 19,
fontWeight: '700',
fontFamily: 'OpenSans-Bold',
fontSize: 21,
lineHeight: 25,
},
heading3Text: {
paddingBottom: 8,
},
heading4: {
fontSize: 18,
fontWeight: '700',
fontFamily: 'OpenSans-Bold',
fontSize: 20,
lineHeight: 25,
},
heading4Text: {
paddingBottom: 8,
},
heading5: {
fontSize: 17,
fontWeight: '700',
fontFamily: 'OpenSans-Bold',
fontSize: 19,
lineHeight: 25,
},
heading5Text: {
paddingBottom: 8,
},
heading6: {
fontSize: 16,
fontWeight: '700',
fontFamily: 'OpenSans-Bold',
fontSize: 18,
lineHeight: 25,
},
heading6Text: {
@@ -82,15 +83,18 @@ export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme: Theme) => {
fontFamily: codeFont,
},
mention: {
fontFamily: 'OpenSans',
color: theme.linkColor,
},
error: {
fontFamily: 'OpenSans',
color: theme.errorTextColor,
},
table_header_row: {
fontWeight: '700',
fontFamily: 'OpenSans-Bold',
},
mention_highlight: {
fontFamily: 'OpenSans',
backgroundColor: theme.mentionHighlightBg,
color: theme.mentionHighlightLink,
},

BIN
assets/fonts/Metropolis-Light.ttf Normal file
View File

Binary file not shown.

BIN
assets/fonts/Metropolis-Regular.ttf Normal file
View File

Binary file not shown.

BIN
assets/fonts/Metropolis-Semibold.ttf Normal file
View File

Binary file not shown.

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

@@ -31,6 +31,9 @@
7F240A23220D3A2300637665 /* MattermostShare.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7F240A19220D3A2300637665 /* MattermostShare.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
7F240ADB220E089300637665 /* Item.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F240ADA220E089300637665 /* Item.swift */; };
7F240ADD220E094A00637665 /* TeamsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F240ADC220E094A00637665 /* TeamsViewController.swift */; };
7F25B62D270F717F00F32373 /* Metropolis-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B626270F666D00F32373 /* Metropolis-Light.ttf */; };
7F25B62E270F718300F32373 /* Metropolis-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */; };
7F25B632270F825700F32373 /* Metropolis-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */; };
7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */ = {isa = PBXBuildFile; fileRef = 7F292A701E8AB73400A450A3 /* SplashScreenResource */; };
7F581D35221ED5C60099E66B /* NotificationService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F581D34221ED5C60099E66B /* NotificationService.swift */; };
7F581D39221ED5C60099E66B /* NotificationService.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 7F581D32221ED5C60099E66B /* NotificationService.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
@@ -124,10 +127,7 @@
/* Begin PBXFileReference section */
00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
00E356F21AD99517003FC87E /* MattermostTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MattermostTests.m; sourceTree = "<group>"; };
031EF04FB2D14EEFAACBAA1A /* Roboto-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Italic.ttf"; path = "../assets/fonts/Roboto-Italic.ttf"; sourceTree = "<group>"; };
09FA716C56874BDDA30FE8C4 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Medium.ttf"; path = "../assets/fonts/Roboto-Medium.ttf"; sourceTree = "<group>"; };
0E617BF0F36D4E738F51D169 /* OpenSans-SemiboldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-SemiboldItalic.ttf"; path = "../assets/fonts/OpenSans-SemiboldItalic.ttf"; sourceTree = "<group>"; };
12D0B0E475FD46E29907305E /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-ThinItalic.ttf"; path = "../assets/fonts/Roboto-ThinItalic.ttf"; sourceTree = "<group>"; };
13B07F961A680F5B00A75B9A /* Mattermost.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Mattermost.app; sourceTree = BUILT_PRODUCTS_DIR; };
13B07FAF1A68108700A75B9A /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Mattermost/AppDelegate.h; sourceTree = "<group>"; };
13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Mattermost/AppDelegate.m; sourceTree = "<group>"; };
@@ -138,7 +138,6 @@
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>"; };
297AAFCCF0BD99FC109DA2BC /* Pods-MattermostTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MattermostTests.release.xcconfig"; path = "Target Support Files/Pods-MattermostTests/Pods-MattermostTests.release.xcconfig"; sourceTree = "<group>"; };
32AC3D4EA79E44738A6E9766 /* OpenSans-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-BoldItalic.ttf"; path = "../assets/fonts/OpenSans-BoldItalic.ttf"; sourceTree = "<group>"; };
34B20A903038487E8D7DEA1E /* Roboto-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Light.ttf"; path = "../assets/fonts/Roboto-Light.ttf"; sourceTree = "<group>"; };
3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-ExtraBold.ttf"; path = "../assets/fonts/OpenSans-ExtraBold.ttf"; sourceTree = "<group>"; };
41F3AFE83AAF4B74878AB78A /* OpenSans-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Italic.ttf"; path = "../assets/fonts/OpenSans-Italic.ttf"; sourceTree = "<group>"; };
4953BF5F2368AE8600593328 /* SwimeProxy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = SwimeProxy.swift; path = Mattermost/SwimeProxy.swift; sourceTree = "<group>"; };
@@ -154,8 +153,6 @@
57CB4735B7E57B50D0B50E16 /* Pods-MattermostTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-MattermostTests.debug.xcconfig"; path = "Target Support Files/Pods-MattermostTests/Pods-MattermostTests.debug.xcconfig"; sourceTree = "<group>"; };
6561AEAC21CC40B8A72ABB93 /* OpenSans-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Light.ttf"; path = "../assets/fonts/OpenSans-Light.ttf"; sourceTree = "<group>"; };
6BAF8296411D4657B5A0E8F8 /* libRNReactNativeDocViewer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNReactNativeDocViewer.a; sourceTree = "<group>"; };
6EFF13DD24CE4E26953E598A /* Roboto-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Black.ttf"; path = "../assets/fonts/Roboto-Black.ttf"; sourceTree = "<group>"; };
71E626D4980A4560B26F0E1C /* Roboto-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Bold.ttf"; path = "../assets/fonts/Roboto-Bold.ttf"; sourceTree = "<group>"; };
7F0F4B0924BA173900E14C60 /* LaunchScreen.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = SplashScreenResource/LaunchScreen.storyboard; sourceTree = "<group>"; };
7F151D3D221B062700FAD8F3 /* RuntimeUtils.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = RuntimeUtils.swift; path = Mattermost/RuntimeUtils.swift; sourceTree = "<group>"; };
7F151D42221B07F700FAD8F3 /* MattermostShare-Bridging-Header.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MattermostShare-Bridging-Header.h"; sourceTree = "<group>"; };
@@ -167,10 +164,12 @@
7F240A27220D3A7E00637665 /* MattermostShare.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = MattermostShare.entitlements; sourceTree = "<group>"; };
7F240ADA220E089300637665 /* Item.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Item.swift; sourceTree = "<group>"; };
7F240ADC220E094A00637665 /* TeamsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamsViewController.swift; sourceTree = "<group>"; };
7F25B626270F666D00F32373 /* Metropolis-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Light.ttf"; path = "../assets/fonts/Metropolis-Light.ttf"; sourceTree = "<group>"; };
7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Regular.ttf"; path = "../assets/fonts/Metropolis-Regular.ttf"; sourceTree = "<group>"; };
7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Semibold.ttf"; path = "../assets/fonts/Metropolis-Semibold.ttf"; sourceTree = "<group>"; };
7F292A701E8AB73400A450A3 /* SplashScreenResource */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SplashScreenResource; sourceTree = "<group>"; };
7F325D6DAAF1047EB948EFF7 /* Pods-Mattermost-MattermostTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost-MattermostTests.debug.xcconfig"; path = "Target Support Files/Pods-Mattermost-MattermostTests/Pods-Mattermost-MattermostTests.debug.xcconfig"; sourceTree = "<group>"; };
7F43D6051F6BF9EB001FC614 /* libPods-Mattermost.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = "libPods-Mattermost.a"; path = "../../../../../../../Library/Developer/Xcode/DerivedData/Mattermost-czlinsdviifujheezzjvmisotjrm/Build/Products/Debug-iphonesimulator/libPods-Mattermost.a"; sourceTree = "<group>"; };
7F54ABFAE6CE4A6DB11D1ED7 /* Roboto-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BlackItalic.ttf"; path = "../assets/fonts/Roboto-BlackItalic.ttf"; sourceTree = "<group>"; };
7F581D32221ED5C60099E66B /* NotificationService.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = NotificationService.appex; sourceTree = BUILT_PRODUCTS_DIR; };
7F581D34221ED5C60099E66B /* NotificationService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = NotificationService.swift; sourceTree = "<group>"; };
7F581D36221ED5C60099E66B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -200,14 +199,9 @@
81061F4CBB31484A94D5A8EE /* libz.tbd */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libz.tbd; path = usr/lib/libz.tbd; sourceTree = SDKROOT; };
84E325FF229834C30055068A /* Config.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Config.swift; sourceTree = "<group>"; };
8DEEFB3ED6175724A2653247 /* libPods-Mattermost.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Mattermost.a"; sourceTree = BUILT_PRODUCTS_DIR; };
8F0B22D2C9924FAFA7FB681C /* Roboto-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-LightItalic.ttf"; path = "../assets/fonts/Roboto-LightItalic.ttf"; sourceTree = "<group>"; };
A734E00E7E184582A877F2B3 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Thin.ttf"; path = "../assets/fonts/Roboto-Thin.ttf"; sourceTree = "<group>"; };
BC977883E2624E05975CA65B /* OpenSans-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Regular.ttf"; path = "../assets/fonts/OpenSans-Regular.ttf"; sourceTree = "<group>"; };
BE17F630DB5D41FD93F32D22 /* OpenSans-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-LightItalic.ttf"; path = "../assets/fonts/OpenSans-LightItalic.ttf"; sourceTree = "<group>"; };
C46342B0E5FD4D878AF3A129 /* Roboto-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BoldItalic.ttf"; path = "../assets/fonts/Roboto-BoldItalic.ttf"; sourceTree = "<group>"; };
C5BD64DE829E455A997DCAD5 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Regular.ttf"; path = "../assets/fonts/Roboto-Regular.ttf"; sourceTree = "<group>"; };
C78A387124874496AD2C1466 /* OpenSans-Semibold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Semibold.ttf"; path = "../assets/fonts/OpenSans-Semibold.ttf"; sourceTree = "<group>"; };
D08F54E10DF14AE4BBF4E2B4 /* Roboto-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-MediumItalic.ttf"; path = "../assets/fonts/Roboto-MediumItalic.ttf"; sourceTree = "<group>"; };
D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-Bold.ttf"; path = "../assets/fonts/OpenSans-Bold.ttf"; sourceTree = "<group>"; };
EB4F0DF36537B0B21BE962FB /* Pods-Mattermost.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Mattermost.debug.xcconfig"; path = "Target Support Files/Pods-Mattermost/Pods-Mattermost.debug.xcconfig"; sourceTree = "<group>"; };
F41672974C2907F74BB59B16 /* libPods-Mattermost-MattermostTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Mattermost-MattermostTests.a"; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -266,6 +260,9 @@
0156F464626F49C2977D7982 /* Resources */ = {
isa = PBXGroup;
children = (
7F25B626270F666D00F32373 /* Metropolis-Light.ttf */,
7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */,
7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */,
D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */,
32AC3D4EA79E44738A6E9766 /* OpenSans-BoldItalic.ttf */,
3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */,
@@ -277,18 +274,6 @@
C78A387124874496AD2C1466 /* OpenSans-Semibold.ttf */,
0E617BF0F36D4E738F51D169 /* OpenSans-SemiboldItalic.ttf */,
531BEBC52513E93C00BC05B1 /* compass-icons.ttf */,
6EFF13DD24CE4E26953E598A /* Roboto-Black.ttf */,
7F54ABFAE6CE4A6DB11D1ED7 /* Roboto-BlackItalic.ttf */,
71E626D4980A4560B26F0E1C /* Roboto-Bold.ttf */,
C46342B0E5FD4D878AF3A129 /* Roboto-BoldItalic.ttf */,
031EF04FB2D14EEFAACBAA1A /* Roboto-Italic.ttf */,
34B20A903038487E8D7DEA1E /* Roboto-Light.ttf */,
8F0B22D2C9924FAFA7FB681C /* Roboto-LightItalic.ttf */,
09FA716C56874BDDA30FE8C4 /* Roboto-Medium.ttf */,
D08F54E10DF14AE4BBF4E2B4 /* Roboto-MediumItalic.ttf */,
C5BD64DE829E455A997DCAD5 /* Roboto-Regular.ttf */,
A734E00E7E184582A877F2B3 /* Roboto-Thin.ttf */,
12D0B0E475FD46E29907305E /* Roboto-ThinItalic.ttf */,
);
name = Resources;
sourceTree = "<group>";
@@ -622,6 +607,9 @@
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
7F0F4B0A24BA173900E14C60 /* LaunchScreen.storyboard in Resources */,
7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */,
7F25B62D270F717F00F32373 /* Metropolis-Light.ttf in Resources */,
7F25B62E270F718300F32373 /* Metropolis-Regular.ttf in Resources */,
7F25B632270F825700F32373 /* Metropolis-Semibold.ttf in Resources */,
9358B95F95184EE0A4DCE629 /* OpenSans-Bold.ttf in Resources */,
55C6561DDBBA45929D88B6D1 /* OpenSans-BoldItalic.ttf in Resources */,
D719A67137964F08BE47A5FC /* OpenSans-ExtraBold.ttf in Resources */,

16
ios/Mattermost/Info.plist
View File

@@ -95,20 +95,10 @@
<string>OpenSans-Regular.ttf</string>
<string>OpenSans-Semibold.ttf</string>
<string>OpenSans-SemiboldItalic.ttf</string>
<string>Roboto-Black.ttf</string>
<string>Roboto-BlackItalic.ttf</string>
<string>Roboto-Bold.ttf</string>
<string>Roboto-BoldItalic.ttf</string>
<string>Roboto-Italic.ttf</string>
<string>Roboto-Light.ttf</string>
<string>Roboto-LightItalic.ttf</string>
<string>Roboto-Medium.ttf</string>
<string>Roboto-MediumItalic.ttf</string>
<string>Roboto-Regular.ttf</string>
<string>Roboto-Thin.ttf</string>
<string>Roboto-ThinItalic.ttf</string>
<string>Metropolis-Regular.ttf</string>
<string>Metropolis-Semibold.ttf</string>
<string>Metropolis-Light.ttf</string>
<string>compass-icons.ttf</string>
<string>Mattermost-Regular.otf</string>
</array>
<key>UIBackgroundModes</key>
<array>

4
share_extension/index.tsx
View File

@@ -86,7 +86,7 @@ const styles = StyleSheet.create({
},
sectionTitle: {
fontSize: 24,
fontWeight: '600',
fontFamily: 'OpenSans-Semibold',
color: Colors.black,
},
sectionDescription: {
@@ -96,7 +96,7 @@ const styles = StyleSheet.create({
color: Colors.dark,
},
highlight: {
fontWeight: '700',
fontFamily: 'OpenSans-Bold',
},
footer: {
color: Colors.dark,