diff --git a/android/app/src/main/assets/fonts/Metropolis-Regular.ttf b/android/app/src/main/assets/fonts/Metropolis-Regular.ttf new file mode 100644 index 000000000..012acd813 Binary files /dev/null and b/android/app/src/main/assets/fonts/Metropolis-Regular.ttf differ diff --git a/android/app/src/main/assets/fonts/OpenSans-Bold.ttf b/android/app/src/main/assets/fonts/OpenSans-Bold.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSans-BoldItalic.ttf b/android/app/src/main/assets/fonts/OpenSans-BoldItalic.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSans-ExtraBold.ttf b/android/app/src/main/assets/fonts/OpenSans-ExtraBold.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSans-ExtraBoldItalic.ttf b/android/app/src/main/assets/fonts/OpenSans-ExtraBoldItalic.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSans-Italic.ttf b/android/app/src/main/assets/fonts/OpenSans-Italic.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSans-Light.ttf b/android/app/src/main/assets/fonts/OpenSans-Light.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSans-LightItalic.ttf b/android/app/src/main/assets/fonts/OpenSans-LightItalic.ttf new file mode 100644 index 000000000..68299c4bc Binary files /dev/null and b/android/app/src/main/assets/fonts/OpenSans-LightItalic.ttf differ diff --git a/android/app/src/main/assets/fonts/OpenSans-Regular.ttf b/android/app/src/main/assets/fonts/OpenSans-Regular.ttf new file mode 100644 index 000000000..db433349b Binary files /dev/null and b/android/app/src/main/assets/fonts/OpenSans-Regular.ttf differ diff --git a/assets/fonts/OpenSans-Semibold.ttf b/android/app/src/main/assets/fonts/OpenSans-SemiBold.ttf old mode 100755 new mode 100644 similarity index 100% rename from assets/fonts/OpenSans-Semibold.ttf rename to android/app/src/main/assets/fonts/OpenSans-SemiBold.ttf diff --git a/assets/fonts/OpenSans-SemiboldItalic.ttf b/android/app/src/main/assets/fonts/OpenSans-SemiBoldItalic.ttf old mode 100755 new mode 100644 similarity index 100% rename from assets/fonts/OpenSans-SemiboldItalic.ttf rename to android/app/src/main/assets/fonts/OpenSans-SemiBoldItalic.ttf diff --git a/android/app/src/main/assets/fonts/OpenSans-Semibold.ttf b/android/app/src/main/assets/fonts/OpenSans-Semibold.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSans-SemiboldItalic.ttf b/android/app/src/main/assets/fonts/OpenSans-SemiboldItalic.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSans.ttf b/android/app/src/main/assets/fonts/OpenSans.ttf old mode 100755 new mode 100644 diff --git a/android/app/src/main/assets/fonts/OpenSansLight-Italic.ttf b/android/app/src/main/assets/fonts/OpenSansLight-Italic.ttf old mode 100755 new mode 100644 diff --git a/app/components/channel_icon/index.tsx b/app/components/channel_icon/index.tsx index 79f5de15b..6477e3624 100644 --- a/app/components/channel_icon/index.tsx +++ b/app/components/channel_icon/index.tsx @@ -59,7 +59,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { group: { color: theme.sidebarText, fontSize: 10, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', }, groupActive: { color: theme.sidebarTextActiveColor, diff --git a/app/components/failed_action/index.tsx b/app/components/failed_action/index.tsx index b4f31aabf..2ad74f2bd 100644 --- a/app/components/failed_action/index.tsx +++ b/app/components/failed_action/index.tsx @@ -30,7 +30,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => { title: { color: changeOpacity(theme.centerChannelColor, 0.8), fontSize: 20, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', marginBottom: 15, marginTop: 10, }, diff --git a/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx b/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx index 10f494913..1e178f25a 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/button_binding/index.tsx @@ -49,7 +49,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { text: { color: STATUS_COLORS.default, fontSize: 15, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', lineHeight: 17, }, }; diff --git a/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx b/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx index fb8b85c00..3d35a30d9 100644 --- a/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx +++ b/app/components/post_list/post/body/content/embedded_bindings/embed_title.tsx @@ -21,7 +21,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { }, title: { color: theme.centerChannelColor, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', marginBottom: 5, fontSize: 14, lineHeight: 20, diff --git a/app/components/post_list/post/body/content/message_attachments/action_button/index.tsx b/app/components/post_list/post/body/content/message_attachments/action_button/index.tsx index 113bdc014..a4f506202 100644 --- a/app/components/post_list/post/body/content/message_attachments/action_button/index.tsx +++ b/app/components/post_list/post/body/content/message_attachments/action_button/index.tsx @@ -41,7 +41,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { text: { color: STATUS_COLORS.default, fontSize: 15, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', lineHeight: 17, }, }; diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx index 24d325a7f..d5d4fc929 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_fields.tsx @@ -35,7 +35,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { }, heading: { color: theme.centerChannelColor, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', }, table: { flex: 1, diff --git a/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx b/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx index a92e0201d..326e25efe 100644 --- a/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx +++ b/app/components/post_list/post/body/content/message_attachments/attachment_title.tsx @@ -26,7 +26,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { title: { color: theme.centerChannelColor, fontSize: 14, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', lineHeight: 20, marginBottom: 5, }, diff --git a/app/components/post_list/post/body/files/file_info.tsx b/app/components/post_list/post/body/files/file_info.tsx index ff41098fa..d2e0f6694 100644 --- a/app/components/post_list/post/body/files/file_info.tsx +++ b/app/components/post_list/post/body/files/file_info.tsx @@ -32,7 +32,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { flexDirection: 'column', flexWrap: 'wrap', fontSize: 14, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', color: theme.centerChannelColor, paddingRight: 10, }, diff --git a/app/components/tablet_title/index.tsx b/app/components/tablet_title/index.tsx index 8be974bb3..5ffc23f03 100644 --- a/app/components/tablet_title/index.tsx +++ b/app/components/tablet_title/index.tsx @@ -26,7 +26,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ }, action: { color: changeOpacity(theme.centerChannelColor, 0.7), - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', fontSize: 16, lineHeight: 24, }, @@ -50,7 +50,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ }, title: { color: theme.centerChannelColor, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', fontSize: 18, lineHeight: 24, }, diff --git a/app/components/tag/index.tsx b/app/components/tag/index.tsx index 274b9851d..99c42bffd 100644 --- a/app/components/tag/index.tsx +++ b/app/components/tag/index.tsx @@ -33,7 +33,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => { }, text: { color: theme.centerChannelColor, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', fontSize: 10, }, title: { diff --git a/app/screens/about/index.tsx b/app/screens/about/index.tsx index 60b8defc6..ab271d4dd 100644 --- a/app/screens/about/index.tsx +++ b/app/screens/about/index.tsx @@ -97,7 +97,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => { footerTitleText: { color: changeOpacity(theme.centerChannelColor, 0.5), fontSize: 11, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', lineHeight: 13, }, footerText: { diff --git a/app/screens/bottom_sheet/content.tsx b/app/screens/bottom_sheet/content.tsx index f3222b1d8..44a3f94e9 100644 --- a/app/screens/bottom_sheet/content.tsx +++ b/app/screens/bottom_sheet/content.tsx @@ -32,7 +32,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => { color: theme.centerChannelColor, lineHeight: 30, fontSize: 25, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', }, separator: { height: 1, diff --git a/app/screens/channel/channel.tsx b/app/screens/channel/channel.tsx index 657345243..d826c75e6 100644 --- a/app/screens/channel/channel.tsx +++ b/app/screens/channel/channel.tsx @@ -44,7 +44,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ }, sectionTitle: { fontSize: 16, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', color: theme.centerChannelColor, }, })); diff --git a/app/screens/home/channel_list/channel_list.tsx b/app/screens/home/channel_list/channel_list.tsx index 97c7170d4..2ec01ab1e 100644 --- a/app/screens/home/channel_list/channel_list.tsx +++ b/app/screens/home/channel_list/channel_list.tsx @@ -35,7 +35,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({ }, sectionTitle: { fontSize: 24, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', color: theme.centerChannelColor, }, })); diff --git a/app/utils/markdown/index.ts b/app/utils/markdown/index.ts index f52a22f1c..8fbc53e66 100644 --- a/app/utils/markdown/index.ts +++ b/app/utils/markdown/index.ts @@ -17,7 +17,7 @@ export const getMarkdownTextStyles = makeStyleSheetFromTheme((theme: Theme) => { fontFamily: 'OpenSans-Italic', }, strong: { - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', }, del: { textDecorationLine: 'line-through', diff --git a/assets/fonts/Metropolis-Semibold.ttf b/assets/fonts/Metropolis-Semibold.ttf deleted file mode 100644 index 2f7522d57..000000000 Binary files a/assets/fonts/Metropolis-Semibold.ttf and /dev/null differ diff --git a/assets/fonts/OpenSans-Bold.ttf b/assets/fonts/OpenSans-Bold.ttf old mode 100755 new mode 100644 diff --git a/assets/fonts/OpenSans-BoldItalic.ttf b/assets/fonts/OpenSans-BoldItalic.ttf old mode 100755 new mode 100644 diff --git a/assets/fonts/OpenSans-ExtraBold.ttf b/assets/fonts/OpenSans-ExtraBold.ttf old mode 100755 new mode 100644 diff --git a/assets/fonts/OpenSans-ExtraBoldItalic.ttf b/assets/fonts/OpenSans-ExtraBoldItalic.ttf old mode 100755 new mode 100644 diff --git a/assets/fonts/OpenSans-Italic.ttf b/assets/fonts/OpenSans-Italic.ttf old mode 100755 new mode 100644 diff --git a/assets/fonts/OpenSans-Light.ttf b/assets/fonts/OpenSans-Light.ttf old mode 100755 new mode 100644 diff --git a/assets/fonts/OpenSans-LightItalic.ttf b/assets/fonts/OpenSans-LightItalic.ttf old mode 100755 new mode 100644 diff --git a/assets/fonts/OpenSans-Regular.ttf b/assets/fonts/OpenSans-Regular.ttf old mode 100755 new mode 100644 diff --git a/assets/fonts/OpenSans-SemiBold.ttf b/assets/fonts/OpenSans-SemiBold.ttf new file mode 100644 index 000000000..1a7679e39 Binary files /dev/null and b/assets/fonts/OpenSans-SemiBold.ttf differ diff --git a/assets/fonts/OpenSans-SemiBoldItalic.ttf b/assets/fonts/OpenSans-SemiBoldItalic.ttf new file mode 100644 index 000000000..59b6d16b0 Binary files /dev/null and b/assets/fonts/OpenSans-SemiBoldItalic.ttf differ diff --git a/ios/Mattermost.xcodeproj/project.pbxproj b/ios/Mattermost.xcodeproj/project.pbxproj index 21b5cbca6..6e86eaa1f 100644 --- a/ios/Mattermost.xcodeproj/project.pbxproj +++ b/ios/Mattermost.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 02860A1AC3334896837E96B7 /* OpenSans-SemiBoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0DB14DFDF6E04FA69FE769DC /* OpenSans-SemiBoldItalic.ttf */; }; 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 */; }; @@ -17,6 +18,7 @@ 49B4C050230C981C006E919E /* libUploadAttachments.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FABE04522137F2A00D0F595 /* libUploadAttachments.a */; }; 531BEBC72513E93C00BC05B1 /* compass-icons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 531BEBC52513E93C00BC05B1 /* compass-icons.ttf */; }; 536CC6C323E79287002C478C /* RNNotificationEventHandler+HandleReplyAction.m in Sources */ = {isa = PBXBuildFile; fileRef = 536CC6C123E79287002C478C /* RNNotificationEventHandler+HandleReplyAction.m */; }; + 58495E36BF1A4EAB93609E57 /* Metropolis-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 54956DEFEBB74EF78C3A6AE5 /* Metropolis-SemiBold.ttf */; }; 6C9B1EFD6561083917AF06CF /* libPods-Mattermost.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8DEEFB3ED6175724A2653247 /* libPods-Mattermost.a */; }; 7F0F4B0A24BA173900E14C60 /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7F0F4B0924BA173900E14C60 /* LaunchScreen.storyboard */; }; 7F151D3E221B062700FAD8F3 /* RuntimeUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7F151D3D221B062700FAD8F3 /* RuntimeUtils.swift */; }; @@ -37,7 +39,6 @@ 7FABE0562213884700D0F595 /* libUploadAttachments.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FABE04522137F2A00D0F595 /* libUploadAttachments.a */; }; 7FB31F812710995B0032E2E5 /* Metropolis-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B626270F666D00F32373 /* Metropolis-Light.ttf */; }; 7FB31F822710996D0032E2E5 /* Metropolis-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */; }; - 7FB31F832710996D0032E2E5 /* Metropolis-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */; }; 7FB31F842710996D0032E2E5 /* OpenSans-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */; }; 7FB31F852710996D0032E2E5 /* OpenSans-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 32AC3D4EA79E44738A6E9766 /* OpenSans-BoldItalic.ttf */; }; 7FB31F862710996D0032E2E5 /* OpenSans-ExtraBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */; }; @@ -46,13 +47,12 @@ 7FB31F892710996D0032E2E5 /* OpenSans-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6561AEAC21CC40B8A72ABB93 /* OpenSans-Light.ttf */; }; 7FB31F8A2710996D0032E2E5 /* OpenSans-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BE17F630DB5D41FD93F32D22 /* OpenSans-LightItalic.ttf */; }; 7FB31F8B2710996D0032E2E5 /* OpenSans-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = BC977883E2624E05975CA65B /* OpenSans-Regular.ttf */; }; - 7FB31F8C2710996D0032E2E5 /* OpenSans-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C78A387124874496AD2C1466 /* OpenSans-Semibold.ttf */; }; - 7FB31F8D2710996D0032E2E5 /* OpenSans-SemiboldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 0E617BF0F36D4E738F51D169 /* OpenSans-SemiboldItalic.ttf */; }; 7FB31F8E2710996D0032E2E5 /* compass-icons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 531BEBC52513E93C00BC05B1 /* compass-icons.ttf */; }; 7FCEFB9326B7934F006DC1DE /* SDWebImageDownloaderOperation+Swizzle.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FCEFB9226B7934F006DC1DE /* SDWebImageDownloaderOperation+Swizzle.m */; }; 7FEB109D1F61019C0039A015 /* MattermostManaged.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEB109A1F61019C0039A015 /* MattermostManaged.m */; }; 84E3264B229834C30055068A /* Config.swift in Sources */ = {isa = PBXBuildFile; fileRef = 84E325FF229834C30055068A /* Config.swift */; }; 88F091443F8214E333C1742C /* ExpoModulesProvider.swift in Sources */ = {isa = PBXBuildFile; fileRef = 491398A1DE9F082851AB1A77 /* ExpoModulesProvider.swift */; }; + A94508A396424B2DB778AFE9 /* OpenSans-SemiBold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = E5C16B14E1CE4868886A1A00 /* OpenSans-SemiBold.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -128,7 +128,7 @@ /* Begin PBXFileReference section */ 00E356F11AD99517003FC87E /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 00E356F21AD99517003FC87E /* MattermostTests.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = MattermostTests.m; sourceTree = ""; }; - 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 = ""; }; + 0DB14DFDF6E04FA69FE769DC /* OpenSans-SemiBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-SemiBoldItalic.ttf"; path = "../assets/fonts/OpenSans-SemiBoldItalic.ttf"; sourceTree = ""; }; 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 = ""; }; 13B07FB01A68108700A75B9A /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Mattermost/AppDelegate.m; sourceTree = ""; }; @@ -152,6 +152,7 @@ 531BEBC52513E93C00BC05B1 /* compass-icons.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "compass-icons.ttf"; path = "../assets/fonts/compass-icons.ttf"; sourceTree = ""; }; 536CC6C123E79287002C478C /* RNNotificationEventHandler+HandleReplyAction.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "RNNotificationEventHandler+HandleReplyAction.m"; path = "Mattermost/RNNotificationEventHandler+HandleReplyAction.m"; sourceTree = ""; }; 536CC6C223E79287002C478C /* RNNotificationEventHandler+HandleReplyAction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "RNNotificationEventHandler+HandleReplyAction.h"; path = "Mattermost/RNNotificationEventHandler+HandleReplyAction.h"; sourceTree = ""; }; + 54956DEFEBB74EF78C3A6AE5 /* Metropolis-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "Metropolis-SemiBold.ttf"; path = "../assets/fonts/Metropolis-SemiBold.ttf"; sourceTree = ""; }; 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 = ""; }; 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 = ""; }; 6BAF8296411D4657B5A0E8F8 /* libRNReactNativeDocViewer.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNReactNativeDocViewer.a; sourceTree = ""; }; @@ -168,7 +169,6 @@ 7F240ADC220E094A00637665 /* TeamsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeamsViewController.swift; sourceTree = ""; }; 7F25B626270F666D00F32373 /* Metropolis-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Light.ttf"; path = "../assets/fonts/Metropolis-Light.ttf"; sourceTree = ""; }; 7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Regular.ttf"; path = "../assets/fonts/Metropolis-Regular.ttf"; sourceTree = ""; }; - 7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Metropolis-Semibold.ttf"; path = "../assets/fonts/Metropolis-Semibold.ttf"; sourceTree = ""; }; 7F292A701E8AB73400A450A3 /* SplashScreenResource */ = {isa = PBXFileReference; lastKnownFileType = folder; path = SplashScreenResource; sourceTree = ""; }; 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 = ""; }; 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 = ""; }; @@ -203,8 +203,8 @@ 8DEEFB3ED6175724A2653247 /* libPods-Mattermost.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Mattermost.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 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 = ""; }; 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 = ""; }; - 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 = ""; }; 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 = ""; }; + E5C16B14E1CE4868886A1A00 /* OpenSans-SemiBold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-SemiBold.ttf"; path = "../assets/fonts/OpenSans-SemiBold.ttf"; sourceTree = ""; }; 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 = ""; }; F41672974C2907F74BB59B16 /* libPods-Mattermost-MattermostTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-Mattermost-MattermostTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; FBBEC29EE2D3418D9AC33BD5 /* OpenSans-ExtraBoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = "OpenSans-ExtraBoldItalic.ttf"; path = "../assets/fonts/OpenSans-ExtraBoldItalic.ttf"; sourceTree = ""; }; @@ -262,9 +262,10 @@ 0156F464626F49C2977D7982 /* Resources */ = { isa = PBXGroup; children = ( + 531BEBC52513E93C00BC05B1 /* compass-icons.ttf */, 7F25B626270F666D00F32373 /* Metropolis-Light.ttf */, 7F25B628270F666D00F32373 /* Metropolis-Regular.ttf */, - 7F25B631270F824E00F32373 /* Metropolis-Semibold.ttf */, + 54956DEFEBB74EF78C3A6AE5 /* Metropolis-SemiBold.ttf */, D4B1B363C2414DA19C1AC521 /* OpenSans-Bold.ttf */, 32AC3D4EA79E44738A6E9766 /* OpenSans-BoldItalic.ttf */, 3647DF63D6764CF093375861 /* OpenSans-ExtraBold.ttf */, @@ -273,9 +274,8 @@ 6561AEAC21CC40B8A72ABB93 /* OpenSans-Light.ttf */, BE17F630DB5D41FD93F32D22 /* OpenSans-LightItalic.ttf */, BC977883E2624E05975CA65B /* OpenSans-Regular.ttf */, - C78A387124874496AD2C1466 /* OpenSans-Semibold.ttf */, - 0E617BF0F36D4E738F51D169 /* OpenSans-SemiboldItalic.ttf */, - 531BEBC52513E93C00BC05B1 /* compass-icons.ttf */, + E5C16B14E1CE4868886A1A00 /* OpenSans-SemiBold.ttf */, + 0DB14DFDF6E04FA69FE769DC /* OpenSans-SemiBoldItalic.ttf */, ); name = Resources; sourceTree = ""; @@ -628,7 +628,6 @@ 7F292A711E8AB73400A450A3 /* SplashScreenResource in Resources */, 7FB31F812710995B0032E2E5 /* Metropolis-Light.ttf in Resources */, 7FB31F822710996D0032E2E5 /* Metropolis-Regular.ttf in Resources */, - 7FB31F832710996D0032E2E5 /* Metropolis-Semibold.ttf in Resources */, 7FB31F842710996D0032E2E5 /* OpenSans-Bold.ttf in Resources */, 7FB31F852710996D0032E2E5 /* OpenSans-BoldItalic.ttf in Resources */, 7FB31F862710996D0032E2E5 /* OpenSans-ExtraBold.ttf in Resources */, @@ -637,9 +636,10 @@ 7FB31F892710996D0032E2E5 /* OpenSans-Light.ttf in Resources */, 7FB31F8A2710996D0032E2E5 /* OpenSans-LightItalic.ttf in Resources */, 7FB31F8B2710996D0032E2E5 /* OpenSans-Regular.ttf in Resources */, - 7FB31F8C2710996D0032E2E5 /* OpenSans-Semibold.ttf in Resources */, - 7FB31F8D2710996D0032E2E5 /* OpenSans-SemiboldItalic.ttf in Resources */, 7FB31F8E2710996D0032E2E5 /* compass-icons.ttf in Resources */, + 58495E36BF1A4EAB93609E57 /* Metropolis-SemiBold.ttf in Resources */, + A94508A396424B2DB778AFE9 /* OpenSans-SemiBold.ttf in Resources */, + 02860A1AC3334896837E96B7 /* OpenSans-SemiBoldItalic.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -707,7 +707,7 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Mattermost/Pods-Mattermost-frameworks.sh", - "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes/hermes.framework/hermes", + "${PODS_XCFRAMEWORKS_BUILD_DIR}/hermes-engine/hermes.framework/hermes", ); name = "[CP] Embed Pods Frameworks"; outputPaths = ( @@ -739,43 +739,11 @@ ); inputPaths = ( "${PODS_ROOT}/Target Support Files/Pods-Mattermost/Pods-Mattermost-resources.sh", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Entypo.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Feather.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Foundation.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Octicons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf", - "${PODS_ROOT}/../../node_modules/react-native-vector-icons/Fonts/Zocial.ttf", "${PODS_CONFIGURATION_BUILD_DIR}/React-Core/AccessibilityResources.bundle", "${PODS_ROOT}/YoutubePlayer-in-WKWebView/WKYTPlayerView/WKYTPlayerView.bundle", ); name = "[CP] Copy Pods Resources"; outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AntDesign.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Entypo.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/EvilIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Feather.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Brands.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Regular.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FontAwesome5_Solid.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Fontisto.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Foundation.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Ionicons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialCommunityIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/MaterialIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Octicons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/SimpleLineIcons.ttf", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Zocial.ttf", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/AccessibilityResources.bundle", "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/WKYTPlayerView.bundle", ); diff --git a/ios/Mattermost/Info.plist b/ios/Mattermost/Info.plist index bda636f61..c0d89541c 100644 --- a/ios/Mattermost/Info.plist +++ b/ios/Mattermost/Info.plist @@ -93,10 +93,10 @@ OpenSans-Light.ttf OpenSans-LightItalic.ttf OpenSans-Regular.ttf - OpenSans-Semibold.ttf - OpenSans-SemiboldItalic.ttf + OpenSans-SemiBold.ttf + OpenSans-SemiBoldItalic.ttf Metropolis-Regular.ttf - Metropolis-Semibold.ttf + Metropolis-SemiBold.ttf Metropolis-Light.ttf compass-icons.ttf diff --git a/ios/Podfile.lock b/ios/Podfile.lock index 88fc0e18c..26b022887 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -830,4 +830,4 @@ SPEC CHECKSUMS: PODFILE CHECKSUM: 3e0817a7d08c4aed8ac029ae720de65e28de4656 -COCOAPODS: 1.10.2 +COCOAPODS: 1.11.2 diff --git a/package-lock.json b/package-lock.json index fe7c348a5..eaeb33260 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "mattermost-mobile", "version": "2.0.0", "hasInstallScript": true, "license": "Apache 2.0", @@ -17438,7 +17439,6 @@ "node_modules/mmjstool": { "version": "1.0.0", "resolved": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#010f456ea8be5beebafdb8776177cba515c1969e", - "integrity": "sha512-d2p3iGoWbBpmYrZJnGOGoxfSeLTtwQKBQB+LeDA91RAc2RUCiMAA5kYGneSD0uK3L/TgEu6BuObQiCS2GoFMwA==", "dev": true, "dependencies": { "@typescript-eslint/typescript-estree": "5.8.1", @@ -37346,7 +37346,6 @@ }, "mmjstool": { "version": "git+ssh://git@github.com/mattermost/mattermost-utilities.git#010f456ea8be5beebafdb8776177cba515c1969e", - "integrity": "sha512-d2p3iGoWbBpmYrZJnGOGoxfSeLTtwQKBQB+LeDA91RAc2RUCiMAA5kYGneSD0uK3L/TgEu6BuObQiCS2GoFMwA==", "dev": true, "from": "mmjstool@github:mattermost/mattermost-utilities#010f456ea8be5beebafdb8776177cba515c1969e", "requires": { diff --git a/share_extension/index.tsx b/share_extension/index.tsx index a3e110825..e884f7048 100644 --- a/share_extension/index.tsx +++ b/share_extension/index.tsx @@ -86,7 +86,7 @@ const styles = StyleSheet.create({ }, sectionTitle: { fontSize: 24, - fontFamily: 'OpenSans-Semibold', + fontFamily: 'OpenSans-SemiBold', color: Colors.black, }, sectionDescription: {