Merge branch 'master' into infomaniak-editor

# Conflicts:
#	Mail/Helpers/RichTextEditor.swift
#	Package.swift
#	Project.swift

.github/workflows/ci.yml

@@ -15,6 +15,8 @@ jobs:
         with:
           access_token: ${{ github.token }}
       - uses: jdx/mise-action@v2
+        with:
+          cache: false
       - name: Checkout
         uses: actions/checkout@v2
       - name: Create test env

.github/workflows/periphery.yml

@@ -0,0 +1,35 @@
+name: CI workflow
+
+on:
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    name: Scan unused code
+    runs-on: [ self-hosted, iOS ]
+
+    steps:
+      - name: Cancel Previous Runs
+        uses: styfle/cancel-workflow-action@0.12.1
+        with:
+          access_token: ${{ github.token }}
+      - uses: jdx/mise-action@v2
+        with:
+          cache: false
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Periphery
+        id: periphery
+        run: ./scripts/periphery.sh
+      - uses: mshick/add-pr-comment@v2
+        with:
+          message: |
+            Found ${{ steps.periphery.outputs.unused_count }} unused code occurences
+            <details>
+              <summary>Expand</summary>
+              
+              ```
+              ${{ steps.periphery.outputs.detailed_output }}
+              ```
+            </details>

.github/workflows/uitests.yml

@@ -15,6 +15,8 @@ jobs:
         with:
           access_token: ${{ github.token }}
       - uses: jdx/mise-action@v2
+        with:
+          cache: false
       - name: Checkout
         uses: actions/checkout@v2
       - name: Create test env

.mise.toml

@@ -1,4 +1,5 @@
 [tools]
 tuist = '4.9.0'
+periphery = '2.18.0'
 swiftformat = '0.53.7'
-swiftlint = '0.54.0'
+swiftlint = '0.54.0'

.periphery.yml

@@ -0,0 +1,19 @@
+clean_build: true
+retain_objc_accessible: true
+retain_public: true
+schemes:
+- Infomaniak Mail
+- MailAppIntentsExtension
+- MailCore
+- MailCoreUI
+- MailNotificationServiceExtension
+- MailResources
+- MailShareExtension
+targets:
+- Infomaniak Mail
+- MailAppIntentsExtension
+- MailCore
+- MailNotificationServiceExtension
+- MailResources
+- MailShareExtension
+workspace: Mail.xcworkspace

.swiftlint.yml

@@ -8,6 +8,7 @@ disabled_rules:
  - force_cast
  - cyclomatic_complexity
  - inclusive_language
+ - for_where
 opt_in_rules:
  - closure_end_indentation
  - closure_spacing
@@ -29,6 +30,7 @@ opt_in_rules:
  - toggle_bool
  - trailing_closure
  - unneeded_parentheses_in_closure_argument
+analyzer_rules:
  - unused_import
 excluded:
  - .tuist-bin/*

Mail/AppDelegate.swift

@@ -21,6 +21,7 @@ import InfomaniakCore
 import InfomaniakDI
 import InfomaniakNotifications
 import MailCore
+import MailCoreUI
 import UIKit
 
 @available(iOSApplicationExtension, unavailable)

Mail/Components/Buttons/Custom Buttons/AccountButton.swift → Mail/Components/Custom Buttons/AccountButton.swift

@@ -18,6 +18,7 @@
 
 import InfomaniakCore
 import MailCore
+import MailCoreUI
 import MailResources
 import SwiftModalPresentation
 import SwiftUI

Mail/Components/Buttons/Custom Buttons/ExtendedFAB.swift → Mail/Components/Custom Buttons/ExtendedFAB.swift

@@ -16,6 +16,7 @@
  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
+import MailCoreUI
 import MailResources
 import SwiftUI
 

Mail/Components/Buttons/Custom Buttons/MenuDrawerButton.swift → Mail/Components/Custom Buttons/MenuDrawerButton.swift

@@ -19,6 +19,7 @@
 import InfomaniakCoreUI
 import InfomaniakDI
 import MailCore
+import MailCoreUI
 import MailResources
 import SwiftUI
 

Mail/Components/Buttons/Custom Buttons/SearchButton.swift → Mail/Components/Custom Buttons/SearchButton.swift

@@ -17,6 +17,7 @@
  */
 
 import MailCore
+import MailCoreUI
 import MailResources
 import SwiftUI
 

Mail/Components/MailboxListView.swift

@@ -17,6 +17,7 @@
  */
 
 import MailCore
+import MailCoreUI
 import MailResources
 import RealmSwift
 import SwiftUI

Mail/Components/ThreadCell/ThreadCell.swift

@@ -17,6 +17,7 @@
  */
 
 import MailCore
+import MailCoreUI
 import MailResources
 import SwiftUI
 
@@ -33,6 +34,10 @@ extension ThreadDensity {
 }
 
 struct ThreadCellDataHolder {
+    static let lastMessageNotFromSentPredicate = NSPredicate(
+        format: "SUBQUERY(folders, $folder, $folder.role != %@).@count > 0",
+        FolderRole.sent.rawValue
+    )
     /// Sender of the last message that is not in the Sent folder, otherwise the last message of the thread
     let recipientToDisplay: Recipient?
 
@@ -48,7 +53,8 @@ struct ThreadCellDataHolder {
     let isInWrittenByMeFolder: Bool
 
     init(thread: Thread) {
-        let lastMessageNotFromSent = thread.messages.last { $0.folder?.role != .sent } ?? thread.messages.last
+        let lastMessageNotFromSent = thread.messages.filter(Self.lastMessageNotFromSentPredicate).last ?? thread.messages.last
+
         date = thread.date.formatted(.thread(.list))
 
         subject = thread.formattedSubject

Mail/Components/ThreadCell/ThreadCellAvatarCheckboxView.swift

@@ -17,6 +17,7 @@
  */
 
 import MailCore
+import MailCoreUI
 import SwiftUI
 
 struct ThreadCellAvatarCheckboxView: View {

Mail/Components/ThreadCell/ThreadCellDetailsView.swift

@@ -17,6 +17,7 @@
  */
 
 import MailCore
+import MailCoreUI
 import MailResources
 import SwiftUI
 

Mail/Helpers/MailTargetAssembly.swift

@@ -24,6 +24,7 @@ import InfomaniakDI
 import InfomaniakLogin
 import InfomaniakNotifications
 import MailCore
+import MailCoreUI
 
 open class CommonAppAndShareTargetAssembly: TargetAssembly {
     override open class func getTargetServices() -> [Factory] {