Merge branch 'release/1.8.14/master'

element-hq · May 5, 2022 · 7fbd72d · 7fbd72d
2 parents b7be67c + 4b69778
commit 7fbd72d
Show file tree

Hide file tree

Showing 270 changed files with 11,295 additions and 1,719 deletions.
diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
@@ -43,10 +43,12 @@ jobs:
 
       # Common setup
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Brew bundle
+        run: brew bundle
       - name: Bundle install
         run: |
           bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3    
+          bundle install --jobs 4 --retry 3
       - name: Use right MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_related_branches
 

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
@@ -48,10 +48,12 @@ jobs:
 
       # Common setup
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Brew bundle
+        run: brew bundle
       - name: Bundle install
         run: |
           bundle config path vendor/bundle
-          bundle install --jobs 4 --retry 3    
+          bundle install --jobs 4 --retry 3
       - name: Use right MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_related_branches
 

diff --git a/.github/workflows/ci-ui-tests.yml b/.github/workflows/ci-ui-tests.yml
@@ -0,0 +1,59 @@
+name: UI Tests CI
+
+on:
+  # Triggers the workflow on any pull request
+  pull_request:
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+env:
+  # Make the git branch for a PR available to our Fastfile
+  MX_GIT_BRANCH: ${{ github.event.pull_request.head.ref }}
+
+jobs:
+  tests:
+    name: UI Tests
+    runs-on: macos-11
+
+    concurrency:
+      # Only allow a single run of this workflow on each branch, automatically cancelling older runs.
+      group: ui-tests-${{ github.head_ref }}
+      cancel-in-progress: true
+
+    steps:
+      - uses: actions/checkout@v2
+
+      # Common cache
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - uses: actions/cache@v2
+        with:
+          path: Pods
+          key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-pods-
+      - uses: actions/cache@v2
+        with:
+          path: vendor/bundle
+          key: ${{ runner.os }}-gems-${{ hashFiles('**/Gemfile.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-gems-
+
+      # Make sure we use the latest version of MatrixSDK
+      - name: Reset MatrixSDK pod
+        run: rm -rf Pods/MatrixSDK
+
+      # Common setup
+      # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Brew bundle
+        run: brew bundle
+      - name: Bundle install
+        run: |
+          bundle config path vendor/bundle
+          bundle install --jobs 4 --retry 3
+      - name: Use right MatrixSDK versions
+        run: bundle exec fastlane point_dependencies_to_related_branches
+
+      # Main step
+      - name: UI tests
+        run: bundle exec fastlane uitest
diff --git a/.github/workflows/release-alpha.yml b/.github/workflows/release-alpha.yml
@@ -25,7 +25,7 @@ jobs:
           if: "${{ env.P12_KEY != '' || env.P12_PASSWORD_KEY != '' }}"
           run: echo "::set-output name=defined::true"
   build:
-    # Run job if secrets are avilable (not avaiable for forks).
+    # Run job if secrets are available (not available for forks).
     needs: [check-secret]
     if: needs.check-secret.outputs.out-key == 'true'
     name: Release
@@ -63,11 +63,12 @@ jobs:
 
       # Common setup
       # Note: GH actions do not support yaml anchor yet. We need to duplicate this for every job
+      - name: Brew bundle
+        run: brew bundle
       - name: Bundle install
         run: |
           bundle config path vendor/bundle
           bundle install --jobs 4 --retry 3
-
       - name: Use right MatrixSDK versions
         run: bundle exec fastlane point_dependencies_to_related_branches
 
@@ -84,7 +85,7 @@ jobs:
       - name: Build Ad-hoc release and send it to Diawi
         run: bundle exec fastlane alpha
         env:
-          # Automaticaly bypass 2FA upgrade if possible on Apple account.
+          # Automatically bypass 2FA upgrade if possible on Apple account.
           SPACESHIP_SKIP_2FA_UPGRADE: true
           APPLE_ID: ${{ secrets.FASTLANE_USER }}
           FASTLANE_USER: ${{ secrets.FASTLANE_USER }}

diff --git a/.github/workflows/triage-move-labelled.yml b/.github/workflows/triage-move-labelled.yml
@@ -11,7 +11,6 @@ jobs:
     if: >
         contains(github.event.issue.labels.*.name, 'A-Maths') || 
         contains(github.event.issue.labels.*.name, 'A-Message-Pinning') ||
-        contains(github.event.issue.labels.*.name, 'A-Threads') ||
         contains(github.event.issue.labels.*.name, 'A-Polls') ||
         contains(github.event.issue.labels.*.name, 'A-Location-Sharing') ||
         contains(github.event.issue.labels.*.name, 'A-Message-Bubbles') ||

diff --git a/Brewfile b/Brewfile
@@ -0,0 +1,2 @@
+brew "xcodegen"
+brew "mint"
diff --git a/Brewfile.lock.json b/Brewfile.lock.json
@@ -0,0 +1,91 @@
+{
+  "entries": {
+    "brew": {
+      "xcodegen": {
+        "version": "2.28.0",
+        "bottle": {
+          "rebuild": 0,
+          "root_url": "https://ghcr.io/v2/homebrew/core",
+          "files": {
+            "arm64_monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:fa493f26e65f0bb0c6be559a395efb84009d842d55035c8fcfd7bcc35096fd17",
+              "sha256": "fa493f26e65f0bb0c6be559a395efb84009d842d55035c8fcfd7bcc35096fd17"
+            },
+            "arm64_big_sur": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:54ce7cba17293f6eabd644af8c8855ca5ac46f4e8475e5a1a961053d31061210",
+              "sha256": "54ce7cba17293f6eabd644af8c8855ca5ac46f4e8475e5a1a961053d31061210"
+            },
+            "monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:261df12ea22b281c6683113755a95887213aec51a345851d3671eec6a82dd169",
+              "sha256": "261df12ea22b281c6683113755a95887213aec51a345851d3671eec6a82dd169"
+            },
+            "big_sur": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:24936b2f648842c026cc0da57ac4d2a04669a1bd459af06d20acfbfa3a1c33da",
+              "sha256": "24936b2f648842c026cc0da57ac4d2a04669a1bd459af06d20acfbfa3a1c33da"
+            },
+            "catalina": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/xcodegen/blobs/sha256:d7b4298a5833f5c2abaa8f19cd60f1da2f13379b9534d67746ac5a37b754e1bd",
+              "sha256": "d7b4298a5833f5c2abaa8f19cd60f1da2f13379b9534d67746ac5a37b754e1bd"
+            }
+          }
+        }
+      },
+      "mint": {
+        "version": "0.17.1",
+        "bottle": {
+          "rebuild": 0,
+          "root_url": "https://ghcr.io/v2/homebrew/core",
+          "files": {
+            "arm64_monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:1c0ec84137dd50cf949a68e1b8d3729956e2843e1cc48c6827d26e6d7dbc74fc",
+              "sha256": "1c0ec84137dd50cf949a68e1b8d3729956e2843e1cc48c6827d26e6d7dbc74fc"
+            },
+            "arm64_big_sur": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:c57aaea4b6eb863ef946bafe3a77f3d32ad4e10e05876b7c6b2df8f8b9656f4e",
+              "sha256": "c57aaea4b6eb863ef946bafe3a77f3d32ad4e10e05876b7c6b2df8f8b9656f4e"
+            },
+            "monterey": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:5faf98e60b6d18332bcac4ab076f6ba861ee7daea4c23a85f97e6c8fa3d1f463",
+              "sha256": "5faf98e60b6d18332bcac4ab076f6ba861ee7daea4c23a85f97e6c8fa3d1f463"
+            },
+            "big_sur": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:3ccf422821dd5fc82488f8e0ab2a11efb645901527b8cf9c42979cc152a9ce02",
+              "sha256": "3ccf422821dd5fc82488f8e0ab2a11efb645901527b8cf9c42979cc152a9ce02"
+            },
+            "catalina": {
+              "cellar": ":any_skip_relocation",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:d09ea36619994628564fb3d7e8e71b8c368c59f68e29174fb84b9b127bd9290e",
+              "sha256": "d09ea36619994628564fb3d7e8e71b8c368c59f68e29174fb84b9b127bd9290e"
+            },
+            "x86_64_linux": {
+              "cellar": "/home/linuxbrew/.linuxbrew/Cellar",
+              "url": "https://ghcr.io/v2/homebrew/core/mint/blobs/sha256:1d73dd0102396a53abac4721557dc7d7c2897bdb0e95551e04869c48d11df764",
+              "sha256": "1d73dd0102396a53abac4721557dc7d7c2897bdb0e95551e04869c48d11df764"
+            }
+          }
+        }
+      }
+    }
+  },
+  "system": {
+    "macos": {
+      "monterey": {
+        "HOMEBREW_VERSION": "3.4.8",
+        "HOMEBREW_PREFIX": "/opt/homebrew",
+        "Homebrew/homebrew-core": "c56787cde0b726d961c1949aca8548551133975e",
+        "CLT": "",
+        "Xcode": "13.3",
+        "macOS": "12.3.1"
+      }
+    }
+  }
+}
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,37 @@
+## Changes in 1.8.14 (2022-05-05)
+
+🙌 Improvements
+
+- Upgrade MatrixSDK version ([v0.23.4](https://github.com/matrix-org/matrix-ios-sdk/releases/tag/v0.23.4)).
+- Spaces: Bring leaving space experience in line with Web ([#4850](https://github.com/vector-im/element-ios/issues/4850))
+- Location sharing: Add cell for live location sharing in timeline ([#6029](https://github.com/vector-im/element-ios/issues/6029))
+- Location sharing: Add timer selector when start live location sharing ([#6071](https://github.com/vector-im/element-ios/issues/6071))
+- Location sharing: Connect SDK to location sharing timeline cell ([#6077](https://github.com/vector-im/element-ios/issues/6077))
+
+🐛 Bugfixes
+
+- RoomNavigationParameters: Fix initializer by not defining convenience. ([#5883](https://github.com/vector-im/element-ios/issues/5883))
+- Fail to open a sub space ([#5965](https://github.com/vector-im/element-ios/issues/5965))
+- RecentsViewController: Fix disappearing filter on search cancellation & empty view on the first screen appearing. ([#6076](https://github.com/vector-im/element-ios/issues/6076))
+- RoomsViewController: Avoid crash by fixing section index to scroll. ([#6086](https://github.com/vector-im/element-ios/issues/6086))
+- Search: Prevent crash when searching ([#6115](https://github.com/vector-im/element-ios/issues/6115))
+
+🗣 Translations
+
+- Localisations: Remove strings with bad formatting and add a run script to detect errors at compile time. ([#5990](https://github.com/vector-im/element-ios/issues/5990))
+
+🧱 Build
+
+- UI Tests: Fix broken tests and add a check on PRs. ([#6050](https://github.com/vector-im/element-ios/issues/6050))
+
+🚧 In development 🚧
+
+- Authentication: Begin implementing authentication flow with a Service, Registration screen and Server Selection screen. ([#5648](https://github.com/vector-im/element-ios/issues/5648))
+- Location sharing: Add live location viewer screen. ([#5723](https://github.com/vector-im/element-ios/issues/5723))
+- Location sharing: Support live location event in the timeline. ([#6057](https://github.com/vector-im/element-ios/issues/6057))
+- Location sharing: Integrate live location viewer screen with room screen. ([#6081](https://github.com/vector-im/element-ios/issues/6081))
+
+
 ## Changes in 1.8.13 (2022-04-20)
 
 ✨ Features

diff --git a/Config/AppIdentifiers.xcconfig b/Config/AppIdentifiers.xcconfig
@@ -27,13 +27,13 @@ DEVELOPMENT_TEAM = 7J4U792NQT
 
 // Provisioning profiles
 RIOT_PROVISIONING_PROFILE_SPECIFIER = Vector App Store
-RIOT_PROVISIONING_PROFILE = 4b43c1ca-3246-4984-828f-165838f5715a
+RIOT_PROVISIONING_PROFILE = 7579fa6f-9887-415e-90fc-2c7acd8812e6
 
 NSE_PROVISIONING_PROFILE_SPECIFIER = "Vector NSE: App Store"
-NSE_PROVISIONING_PROFILE = de44ca91-4318-4c23-8611-b531793505c2
+NSE_PROVISIONING_PROFILE = e73107b2-1bfe-4615-be3e-39fd4dcb2af0
 
 SHARE_EXTENSION_PROVISIONING_PROFILE_SPECIFIER = "Vector Share Extension: App Store"
-SHARE_EXTENSION_PROVISIONING_PROFILE = 546090a2-77ca-4bc2-b904-da5bd97a2f37
+SHARE_EXTENSION_PROVISIONING_PROFILE = 8c797ca0-0440-49bd-be8d-11d761152995
 
 SIRI_INTENTS_PROVISIONING_PROFILE_SPECIFIER = "Vector Siri Intents: App Store"
-SIRI_INTENTS_PROVISIONING_PROFILE = 6951ad31-4850-445a-89c8-b64bca0a1c44
+SIRI_INTENTS_PROVISIONING_PROFILE = 1690e81a-5ad3-4d99-b578-02693579be71
diff --git a/Config/AppVersion.xcconfig b/Config/AppVersion.xcconfig
@@ -15,5 +15,5 @@
 //
 
 // Version
-MARKETING_VERSION = 1.8.13
-CURRENT_PROJECT_VERSION = 1.8.13
+MARKETING_VERSION = 1.8.14
+CURRENT_PROJECT_VERSION = 1.8.14
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
@@ -385,6 +385,8 @@ final class BuildSettings: NSObject {
 
     // MARK: - Onboarding
     static let onboardingShowAccountPersonalization = false
+    static let onboardingEnableNewAuthenticationFlow = false
+    static let onboardingHostYourOwnServerLink = URL(string: "https://element.io/contact-sales")!
 
     // MARK: - Unified Search
     static let unifiedSearchScreenShowPublicDirectory = true

diff --git a/Config/Project.xcconfig b/Config/Project.xcconfig
@@ -25,10 +25,10 @@
 KEYCHAIN_ACCESS_GROUP = $(AppIdentifierPrefix)$(BASE_BUNDLE_IDENTIFIER).keychain.shared
 
 // Build settings
-IPHONEOS_DEPLOYMENT_TARGET = 12.1
+IPHONEOS_DEPLOYMENT_TARGET = 14.0
 SDKROOT = iphoneos
 TARGETED_DEVICE_FAMILY = 1,2
-SWIFT_VERSION = 5.3.1
+SWIFT_VERSION = 5.6
 ENABLE_BITCODE = NO
 
 LD_RUNPATH_SEARCH_PATHS = $(inherited) @executable_path/Frameworks @executable_path/../../Frameworks

diff --git a/DesignKit/Source/ColorValues.swift b/DesignKit/Source/ColorValues.swift
@@ -46,5 +46,7 @@ public struct ColorValues: Colors {
 
     public let background: UIColor
 
+    public let ems: UIColor
+
     public let namesAndAvatars: [UIColor]
 }
diff --git a/DesignKit/Source/Colors.swift b/DesignKit/Source/Colors.swift
@@ -55,7 +55,7 @@ public protocol Colors {
     /// Separating line
     var separator: ColorType { get }
 
-    //  Cards, tiles
+    /// Cards, tiles
     var tile: ColorType { get }
 
     /// Top navigation background on iOS
@@ -64,6 +64,9 @@ public protocol Colors {
     /// Background UI color
     var background: ColorType { get }
 
+    /// Global color: The EMS brand's purple colour.
+    var ems: ColorType { get }
+
     /// - Names in chat timeline
     /// - Avatars default states that include first name letter
     var namesAndAvatars: [ColorType] { get }

diff --git a/DesignKit/Source/ColorsSwiftUI.swift b/DesignKit/Source/ColorsSwiftUI.swift
@@ -47,6 +47,8 @@ public struct ColorSwiftUI: Colors {
 
     public let background: Color
 
+    public var ems: Color
+
     public let namesAndAvatars: [Color]
 
     init(values: ColorValues) {
@@ -62,6 +64,7 @@ public struct ColorSwiftUI: Colors {
         tile = Color(values.tile)
         navigation = Color(values.navigation)
         background = Color(values.background)
+        ems = Color(values.ems)
         namesAndAvatars = values.namesAndAvatars.map({ Color($0) })
     }
 }
diff --git a/DesignKit/Variants/Colors/Dark/DarkColors.swift b/DesignKit/Variants/Colors/Dark/DarkColors.swift
@@ -33,6 +33,7 @@ public class DarkColors {
         tile: UIColor(rgb:0x394049),
         navigation: UIColor(rgb:0x21262C),
         background: UIColor(rgb:0x15191E),
+        ems: UIColor(rgb: 0x7E69FF),
         namesAndAvatars: [
             UIColor(rgb:0x368BD6),
             UIColor(rgb:0xAC3BA8),

diff --git a/DesignKit/Variants/Colors/Light/LightColors.swift b/DesignKit/Variants/Colors/Light/LightColors.swift
@@ -34,6 +34,7 @@ public class LightColors {
         tile: UIColor(rgb:0xF3F8FD),
         navigation: UIColor(rgb:0xF4F6FA),
         background: UIColor(rgb:0xFFFFFF),
+        ems: UIColor(rgb: 0x7E69FF),
         namesAndAvatars: [
             UIColor(rgb:0x368BD6),
             UIColor(rgb:0xAC3BA8),

diff --git a/INSTALL.md b/INSTALL.md
@@ -8,6 +8,7 @@ To build Element iOS project you need:
 - [Ruby](https://www.ruby-lang.org/), a dynamic programming language used by several build tools.
 - [CocoaPods](https://cocoapods.org), library dependencies manager for Xcode projects.
 - [XcodeGen](https://github.com/yonaskolb/XcodeGen), an Xcode project generator.
+- [Mint](https://github.com/yonaskolb/Mint), a package manager that installs and runs executable Swift packages
 - [bundler](https://bundler.io/) (optional), is also a dependency manager used to manage build tools dependency (CocoaPods, Fastlane).
 
 ### Install Ruby
@@ -26,12 +27,12 @@ $ gem install cocoapods
 
 In the last case please ensure that you are using the same version as indicated at the end of the `Podfile.lock` file.
 
-### Install XcodeGen
+### Install XcodeGen and Mint
 
-You can directly install XcodeGen with [Homebrew](https://brew.sh) or RubyGems:
+You can install XcodeGen and Mint using the included [Homebrew](https://brew.sh) Brewfile:
 
 ```
-$ brew install xcodegen
+$ brew bundle
 ```
 
 ### Install bundler (optional)