chore: change font to SuisseIntl

Infomaniak · Jan 12, 2024 · f5d499a · f5d499a
1 parent da4c1db
commit f5d499a
Show file tree

Hide file tree

Showing 31 changed files with 72 additions and 88 deletions.
diff --git a/.github/actions/prepare-android-build/action.yaml b/.github/actions/prepare-android-build/action.yaml
@@ -47,3 +47,10 @@ runs:
         echo ${STORE_ALIAS} | tee -a android/gradle.properties > /dev/null
         echo ${STORE_PASSWORD} | tee -a android/gradle.properties > /dev/null
         echo "::endgroup::"
+
+    - name: ci/append-fonts-to-build
+      shell: bash
+      run: |
+        echo "::group::append-fonts-to-build"
+        cp ${{ github.workspace }}/mobile-private/fonts/* assets/fonts/
+        echo "::endgroup::"
diff --git a/.github/actions/prepare-ios-build/action.yaml b/.github/actions/prepare-ios-build/action.yaml
@@ -23,3 +23,17 @@ runs:
         npm run ios-gems
         npm run pod-install
         echo "::endgroup::"
+
+    - name: ci/checkout-private-repo
+      uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
+      with:
+        repository: infomaniak/mobile-private
+        token: ${{ env.MATTERMOST_BUILD_GH_TOKEN }}
+        path: ${{ github.workspace }}/mobile-private
+
+    - name: ci/append-fonts-to-build
+      shell: bash
+      run: |
+        echo "::group::append-fonts-to-build"
+        cp ${{ github.workspace }}/mobile-private/fonts/* assets/fonts/
+        echo "::endgroup::"
diff --git a/.github/workflows/build-ios-beta.yml b/.github/workflows/build-ios-beta.yml
@@ -21,34 +21,6 @@ jobs:
       - name: ci/test
         uses: ./.github/actions/test
 
-  build-ios-simulator:
-    runs-on: macos-12
-    if: ${{ !contains(github.ref_name, 'beta-ios') }}
-    needs:
-      - test
-    steps:
-      - name: ci/checkout-repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-
-      - name: ci/prepare-ios-build
-        uses: ./.github/actions/prepare-ios-build
-
-      - name: ci/build-ios-simulator
-        env:
-          TAG: "${{ github.ref_name }}"
-          AWS_ACCESS_KEY_ID: "${{ secrets.MM_MOBILE_BETA_AWS_ACCESS_KEY_ID }}"
-          AWS_SECRET_ACCESS_KEY: "${{ secrets.MM_MOBILE_BETA_AWS_SECRET_ACCESS_KEY }}"
-          MATTERMOST_WEBHOOK_URL: "${{ secrets.MM_MOBILE_BETA_MATTERMOST_WEBHOOK_URL }}"
-          GITHUB_TOKEN: "${{ secrets.MM_MOBILE_GITHUB_TOKEN }}"
-        run: bundle exec fastlane ios simulator --env ios.simulator
-        working-directory: ./fastlane
-
-      - name: ci/upload-ios-pr-simulator
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ios-build-simulator-${{ github.run_id }}
-          path: Mattermost-simulator-x86_64.app.zip
-
   build-and-deploy-ios-beta:
     runs-on: macos-12
     if: ${{ !contains(github.ref_name, 'beta-sim') }}
@@ -69,6 +41,8 @@ jobs:
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
+        env:
+          MATTERMOST_BUILD_GH_TOKEN: "${{ secrets.MATTERMOST_BUILD_GH_TOKEN }}"
 
       - name: ci/build-and-deploy-ios-beta
         env:

diff --git a/.github/workflows/build-ios-release.yml b/.github/workflows/build-ios-release.yml
@@ -32,6 +32,8 @@ jobs:
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
+        env:
+          MATTERMOST_BUILD_GH_TOKEN: "${{ secrets.MATTERMOST_BUILD_GH_TOKEN }}"
 
       - name: ci/output-ssh-private-key
         shell: bash
@@ -70,30 +72,3 @@ jobs:
           name: ios-build-release-${{ github.run_id }}
           path: "*.ipa"
 
-  build-ios-simulator:
-    runs-on: macos-12
-    if: ${{ !contains(github.ref_name , 'release-ios') }}
-    needs:
-      - test
-    steps:
-      - name: ci/checkout-repo
-        uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
-
-      - name: ci/prepare-ios-build
-        uses: ./.github/actions/prepare-ios-build
-
-      - name: ci/build-ios-simulator
-        env:
-          TAG: "${{ github.ref_name }}"
-          AWS_ACCESS_KEY_ID: "${{ secrets.MM_MOBILE_BETA_AWS_ACCESS_KEY_ID }}"
-          AWS_SECRET_ACCESS_KEY: "${{ secrets.MM_MOBILE_BETA_AWS_SECRET_ACCESS_KEY }}"
-          MATTERMOST_WEBHOOK_URL: "${{ secrets.MM_MOBILE_BETA_MATTERMOST_WEBHOOK_URL }}"
-          GITHUB_TOKEN: "${{ secrets.MM_MOBILE_GITHUB_TOKEN }}"
-        run: bundle exec fastlane ios simulator --env ios.simulator
-        working-directory: ./fastlane
-
-      - name: ci/upload-ios-pr-simulator
-        uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce # v3.1.2
-        with:
-          name: ios-build-simulator-${{ github.run_id }}
-          path: Mattermost-simulator-x86_64.app.zip
diff --git a/.github/workflows/build-pr.yml b/.github/workflows/build-pr.yml
@@ -34,6 +34,8 @@ jobs:
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
+        env:
+          MATTERMOST_BUILD_GH_TOKEN: "${{ secrets.MATTERMOST_BUILD_GH_TOKEN }}"
 
       - name: ci/output-ssh-private-key
         shell: bash

diff --git a/.github/workflows/github-release.yml b/.github/workflows/github-release.yml
@@ -24,6 +24,8 @@ jobs:
 
       - name: ci/prepare-ios-build
         uses: ./.github/actions/prepare-ios-build
+        env:
+          MATTERMOST_BUILD_GH_TOKEN: "${{ secrets.MATTERMOST_BUILD_GH_TOKEN }}"
 
       - name: ci/output-ssh-private-key
         shell: bash

diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,5 @@
 assets/override
+assets/fonts/SuisseIntl*.ttf
 dist
 build-ios
 *.zip

diff --git a/app/components/badge/index.tsx b/app/components/badge/index.tsx
@@ -134,6 +134,6 @@ const styles = StyleSheet.create({
         paddingHorizontal: 4,
         overflow: 'hidden',
         borderWidth: 2,
-        fontFamily: 'OpenSans-Bold',
+        fontFamily: 'SuisseIntl-SemiBold',
     },
 });
diff --git a/app/components/files/image_file_overlay.tsx b/app/components/files/image_file_overlay.tsx
@@ -22,7 +22,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
     },
     moreImagesText: {
         color: theme.sidebarHeaderTextColor,
-        fontFamily: 'OpenSans',
+        fontFamily: 'SuisseIntl-Regular',
         textAlign: 'center',
     },
 }));

diff --git a/app/components/floating_text_input_label/index.tsx b/app/components/floating_text_input_label/index.tsx
@@ -36,7 +36,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
     },
     errorText: {
         color: theme.errorTextColor,
-        fontFamily: 'OpenSans',
+        fontFamily: 'SuisseIntl-Regular',
         fontSize: 12,
         lineHeight: 16,
         paddingVertical: 5,
@@ -53,7 +53,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
         position: 'absolute',
         color: changeOpacity(theme.centerChannelColor, 0.64),
         left: 16,
-        fontFamily: 'OpenSans',
+        fontFamily: 'SuisseIntl-Regular',
         fontSize: 16,
         zIndex: 10,
         maxWidth: 315,
@@ -66,7 +66,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
     },
     textInput: {
         flexDirection: 'row',
-        fontFamily: 'OpenSans',
+        fontFamily: 'SuisseIntl-Regular',
         fontSize: 16,
         paddingTop: 12,
         paddingBottom: 12,

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
@@ -49,7 +49,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
         text: {
             color: STATUS_COLORS.default,
             fontSize: 15,
-            fontFamily: 'OpenSans-SemiBold',
+            fontFamily: 'SuisseIntl-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
@@ -23,7 +23,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
         },
         title: {
             color: theme.centerChannelColor,
-            fontFamily: 'OpenSans-SemiBold',
+            fontFamily: 'SuisseIntl-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
@@ -41,7 +41,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
         text: {
             color: STATUS_COLORS.default,
             fontSize: 15,
-            fontFamily: 'OpenSans-SemiBold',
+            fontFamily: 'SuisseIntl-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
@@ -37,7 +37,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
         },
         heading: {
             color: theme.centerChannelColor,
-            fontFamily: 'OpenSans-SemiBold',
+            fontFamily: 'SuisseIntl-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
@@ -28,7 +28,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
         title: {
             color: theme.centerChannelColor,
             fontSize: 14,
-            fontFamily: 'OpenSans-SemiBold',
+            fontFamily: 'SuisseIntl-SemiBold',
             lineHeight: 20,
             marginBottom: 5,
         },

diff --git 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: 'SuisseIntl-SemiBold',
         fontSize: 16,
         lineHeight: 24,
     },
@@ -50,7 +50,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
     },
     title: {
         color: theme.centerChannelColor,
-        fontFamily: 'OpenSans-SemiBold',
+        fontFamily: 'SuisseIntl-SemiBold',
         fontSize: 18,
         lineHeight: 24,
     },

diff --git a/app/components/tag/index.tsx b/app/components/tag/index.tsx
@@ -30,7 +30,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => {
         },
         text: {
             color: theme.centerChannelColor,
-            fontFamily: 'OpenSans-SemiBold',
+            fontFamily: 'SuisseIntl-SemiBold',
             fontSize: 10,
             textTransform: 'uppercase',
         },

diff --git a/app/screens/home/account/components/user_info/index.tsx b/app/screens/home/account/components/user_info/index.tsx
@@ -34,14 +34,14 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => {
             fontSize: 28,
             lineHeight: 36,
             color: theme.sidebarText,
-            fontFamily: 'Metropolis-SemiBold',
+            fontFamily: 'SuisseIntl-SemiBold',
             marginTop: 16,
         },
         textUserName: {
             fontSize: 16,
             lineHeight: 24,
             color: theme.sidebarText,
-            fontFamily: 'OpenSans',
+            fontFamily: 'SuisseIntl-Regular',
             marginTop: 4,
         },
     };

diff --git a/app/screens/in_app_notification/index.tsx b/app/screens/in_app_notification/index.tsx
@@ -49,7 +49,7 @@ const styles = StyleSheet.create({
     message: {
         color: '#FFFFFF',
         fontSize: 13,
-        fontFamily: 'OpenSans',
+        fontFamily: 'SuisseIntl-Regular',
     },
     titleContainer: {
         flex: 1,

diff --git a/app/screens/in_app_notification/server.tsx b/app/screens/in_app_notification/server.tsx
@@ -15,7 +15,7 @@ const styles = StyleSheet.create({
     },
     text: {
         color: 'rgba(255, 255, 255, 0.64)',
-        fontFamily: 'OpenSans',
+        fontFamily: 'SuisseIntl-Regular',
         fontSize: 10,
     },
 });

diff --git a/app/screens/in_app_notification/title.tsx b/app/screens/in_app_notification/title.tsx
@@ -25,7 +25,7 @@ const styles = StyleSheet.create({
     title: {
         color: '#FFFFFF',
         fontSize: 14,
-        fontFamily: 'OpenSans-SemiBold',
+        fontFamily: 'SuisseIntl-SemiBold',
     },
 });
 

diff --git a/app/screens/login/form.tsx b/app/screens/login/form.tsx
@@ -58,7 +58,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
         paddingVertical: 10,
         color: theme.buttonBg,
         fontSize: 14,
-        fontFamily: 'OpenSans-SemiBold',
+        fontFamily: 'SuisseIntl-SemiBold',
     },
     loadingContainerStyle: {
         marginRight: 10,

diff --git a/app/screens/login/login_options_separator.tsx b/app/screens/login/login_options_separator.tsx
@@ -27,7 +27,7 @@ const getStyleFromTheme = makeStyleSheetFromTheme((theme: Theme) => ({
         marginLeft: 6,
         textAlign: 'center',
         color: changeOpacity(theme.centerChannelColor, 0.64),
-        fontFamily: 'OpenSans',
+        fontFamily: 'SuisseIntl-Regular',
         fontSize: 12,
         top: -2,
     },

diff --git a/app/screens/login/sso_options.tsx b/app/screens/login/sso_options.tsx
@@ -144,7 +144,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme: Theme) => ({
     },
     buttonText: {
         color: theme.centerChannelColor,
-        fontFamily: 'OpenSans-SemiBold',
+        fontFamily: 'SuisseIntl-SemiBold',
         fontSize: 16,
         lineHeight: 18,
         top: 2,

diff --git a/app/screens/navigation.ts b/app/screens/navigation.ts
@@ -195,15 +195,15 @@ Navigation.setDefaultOptions({
     },
     topBar: {
         title: {
-            fontFamily: 'Metropolis-SemiBold',
+            fontFamily: 'SuisseIntl-SemiBold',
             fontSize: 18,
             fontWeight: '600',
         },
         backButton: {
             enableMenu: false,
         },
         subtitle: {
-            fontFamily: 'OpenSans',
+            fontFamily: 'SuisseIntl-Regular',
             fontSize: 12,
             fontWeight: '400',
         },
@@ -801,7 +801,7 @@ export async function dismissAllModals() {
 
 export const buildNavigationButton = (id: string, testID: string, icon?: ImageResource, text?: string): OptionsTopBarButton => ({
     fontSize: 16,
-    fontFamily: 'OpenSans-SemiBold',
+    fontFamily: 'SuisseIntl-SemiBold',
     fontWeight: '600',
     id,
     icon,

diff --git a/app/utils/buttonStyles.ts b/app/utils/buttonStyles.ts
@@ -378,7 +378,7 @@ export const buttonTextStyle = (
 
     const styles = StyleSheet.create({
         main: {
-            fontFamily: 'OpenSans-SemiBold',
+            fontFamily: 'SuisseIntl-SemiBold',
             fontWeight: '600',
             textAlignVertical: 'center',
             alignItems: 'center',

diff --git a/app/utils/font_family.ts b/app/utils/font_family.ts
@@ -14,7 +14,7 @@ import {StyleSheet, Text} from 'react-native';
 const setFontFamily = () => {
     const styles = StyleSheet.create({
         defaultText: {
-            fontFamily: 'OpenSans',
+            fontFamily: 'SuisseIntl-Regular',
             fontSize: 16,
         },
     });