fix: TODOs and tests in WireUI - WPB-11346

WireUI/Sources/WireAccountImage/AccountImageView/AccountImageView.swift

@@ -195,7 +195,7 @@ public final class AccountImageView: UIView {
         guard let accountImageViewWrapper = accountImageView.superview else { return }
 
         accountImageViewWrapper.layer.cornerRadius = if isTeamAccount {
-            teamAccountImageCornerRadius
+            teamAccountImageCornerRadius // TODO: [WPB-11449] is this even needed? We always show the user's image
         } else {
             accountImageViewWrapper.frame.height / 2
         }

WireUI/Sources/WireDesign/Appearance/SidebarViewDesign.swift

@@ -25,7 +25,7 @@ public struct SidebarViewDesign {
     public let accountInfoViewUsernameColor = ColorTheme.Base.secondaryText
     public let menuItemTitleForegroundColor = ColorTheme.Backgrounds.onBackground
     public let menuItemLinkIconForegroundColor = ColorTheme.Base.secondaryText
-    public let menuItemIsPressedTitleForegroundColor = ColorTheme.Base.onPrimary
+    public let menuItemIsSelectedTitleForegroundColor = ColorTheme.Base.onPrimary
 
     public init() {}
 }

WireUI/Sources/WireMainNavigation/MainCoordinator.swift

@@ -18,6 +18,8 @@
 
 import UIKit
 
+public typealias MainCoordinator = GenericMainCoordinator
+
 // swiftlint:disable opening_brace
 
 /// Manages the main navigation and the layout changes of the application after a successful login.
@@ -31,7 +33,7 @@ import UIKit
 /// instances and then put or remove the content view controllers into/from `viewControllers` array.
 
 @MainActor
-public final class MainCoordinator<
+public final class GenericMainCoordinator<
 
     SplitViewController: MainSplitViewControllerProtocol,
     ConversationBuilder: MainConversationBuilderProtocol,
@@ -192,7 +194,7 @@ public final class MainCoordinator<
 
         dismissArchiveIfNeeded()
         dismissSettingsIfNeeded()
-        await dismissPresentedViewControllerIfNeeded()
+        await dismissPresentedViewController()
 
         // Move the conversation list from the tab bar controller to the split view controller if needed.
         if let conversationList = tabBarController.conversationList {
@@ -222,7 +224,7 @@ public final class MainCoordinator<
 
         dismissConversationListIfNeeded()
         dismissSettingsIfNeeded()
-        await dismissPresentedViewControllerIfNeeded()
+        await dismissPresentedViewController()
 
         // move the archive from the tab bar controller to the split view controller
         if let archive = tabBarController.archive {
@@ -243,7 +245,7 @@ public final class MainCoordinator<
 
         dismissConversationListIfNeeded()
         dismissArchiveIfNeeded()
-        await dismissPresentedViewControllerIfNeeded()
+        await dismissPresentedViewController()
 
         // move the settings from the tab bar controller to the split view controller
         if let settings = tabBarController.settings {
@@ -262,7 +264,7 @@ public final class MainCoordinator<
             splitViewController.hideSidebar()
         }
 
-        await dismissPresentedViewControllerIfNeeded()
+        await dismissPresentedViewController()
 
         let conversation = conversationBuilder.build(
             conversation: conversation,
@@ -320,7 +322,7 @@ public final class MainCoordinator<
         selfProfile.modalPresentationStyle = .formSheet
         self.selfProfile = selfProfile
 
-        await dismissPresentedViewControllerIfNeeded()
+        await dismissPresentedViewController()
         await withCheckedContinuation { continuation in
             splitViewController.present(selfProfile, animated: true, completion: continuation.resume)
         }
@@ -369,7 +371,7 @@ public final class MainCoordinator<
             splitViewController.hideSidebar()
         }
 
-        await dismissPresentedViewControllerIfNeeded()
+        await dismissPresentedViewController()
         await withCheckedContinuation { continuation in
             splitViewController.present(viewController, animated: true, completion: continuation.resume)
         }
@@ -399,7 +401,7 @@ public final class MainCoordinator<
         }
     }
 
-    private func dismissPresentedViewControllerIfNeeded() async {
+    public func dismissPresentedViewController() async {
         await withCheckedContinuation { continuation in
             splitViewController.dismiss(animated: true, completion: continuation.resume)
         }

WireUI/Sources/WireMainNavigation/Preview/PreviewConversationListViewController.swift

@@ -25,6 +25,7 @@ final class PreviewConversationListViewController: UIHostingController<LabelView
     // MARK: - MainConversationListProtocol
 
     var conversationFilter: ConversationFilter?
+    var selectedConversation: ConversationModel?
     var mainSplitViewState: MainSplitViewState = .expanded
 
     enum ConversationFilter: MainConversationFilterRepresentable {

WireUI/Sources/WireMainNavigation/Preview/PreviewConversationViewController.swift

@@ -22,6 +22,8 @@ final class PreviewConversationViewController: UIHostingController<LabelView>, M
     struct ConversationModel {}
     struct ConversationMessageModel {}
 
+    var conversationModel: ConversationModel! { .init() }
+
     // MARK: - Life Cycle
 
     convenience init() {

WireUI/Sources/WireMainNavigation/Protocols/Conversation/MainConversationBuilderProtocol.swift

@@ -30,9 +30,9 @@ public protocol MainConversationBuilderProtocol {
         message: Conversation.ConversationMessageModel?,
         mainCoordinator: MainCoordinator
     ) -> Conversation where
-    MainCoordinator.ConversationList == ConversationList,
-    MainCoordinator.SettingsContentBuilder == SettingsBuilder,
-    MainCoordinator.ConversationModel == Conversation.ConversationModel,
-    MainCoordinator.ConversationMessageModel == Conversation.ConversationMessageModel,
-    MainCoordinator.User == User
+        MainCoordinator.ConversationList == ConversationList,
+        MainCoordinator.SettingsContentBuilder == SettingsBuilder,
+        MainCoordinator.ConversationModel == Conversation.ConversationModel,
+        MainCoordinator.ConversationMessageModel == Conversation.ConversationMessageModel,
+        MainCoordinator.User == User
 }

WireUI/Sources/WireMainNavigation/Protocols/Conversation/MainConversationProtocol.swift

@@ -18,7 +18,10 @@
 
 import UIKit
 
+@MainActor
 public protocol MainConversationProtocol: UIViewController {
     associatedtype ConversationModel
     associatedtype ConversationMessageModel
+
+    var conversationModel: ConversationModel! { get }
 }

WireUI/Sources/WireMainNavigation/Protocols/ConversationList/MainConversationListProtocol.swift

@@ -24,10 +24,14 @@ import UIKit
 public protocol MainConversationListProtocol: UIViewController {
 
     associatedtype ConversationFilter: MainConversationFilterRepresentable
+    associatedtype ConversationModel
 
     /// Assigning a non-nil value to this property filters the presented conversations by the provided criteria.
     var conversationFilter: ConversationFilter? { get set }
 
+    /// The conversation which is represented by the list selection.
+    var selectedConversation: ConversationModel? { get }
+
     /// Allows the ``MainCoordinator`` to inform this instance about the current split view state.
     var mainSplitViewState: MainSplitViewState { get set }
 }

WireUI/Sources/WireMainNavigation/Protocols/Coordinator/MainCoordinatorInjectingViewControllerBuilder.swift

@@ -30,9 +30,9 @@ public protocol MainCoordinatorInjectingViewControllerBuilder {
     func build<MainCoordinator: MainCoordinatorProtocol>(
         mainCoordinator: MainCoordinator
     ) -> ViewController where
-    MainCoordinator.ConversationList == ConversationList,
-    MainCoordinator.SettingsContentBuilder == SettingsBuilder,
-    MainCoordinator.ConversationModel == ConversationModel,
-    MainCoordinator.ConversationMessageModel == ConversationMessageModel,
-    MainCoordinator.User == User
+        MainCoordinator.ConversationList == ConversationList,
+        MainCoordinator.SettingsContentBuilder == SettingsBuilder,
+        MainCoordinator.ConversationModel == ConversationModel,
+        MainCoordinator.ConversationMessageModel == ConversationMessageModel,
+        MainCoordinator.User == User
 }

WireUI/Sources/WireMainNavigation/Protocols/Coordinator/MainCoordinatorProtocol.swift

@@ -60,4 +60,6 @@ public protocol MainCoordinatorProtocol: AnyObject {
 
     @MainActor
     func presentViewController(_ viewController: UIViewController) async
+    @MainActor
+    func dismissPresentedViewController() async
 }

WireUI/Sources/WireSidebar/Models/SidebarModel.swift

@@ -27,11 +27,12 @@ final class SidebarModel: ObservableObject {
     @Published var wireAccentColorMapping: WireAccentColorMapping?
     @Published var wireTextStyleMapping: WireTextStyleMapping?
     @Published var sidebarBackgroundColor: UIColor = .systemGray5
-    @Published var sidebarAccountInfoViewDisplayNameColor: UIColor = .darkText
-    @Published var sidebarAccountInfoViewUsernameColor: UIColor = .systemGray
-    @Published var sidebarMenuItemTitleForegroundColor: UIColor = .darkText
+    @Published var sidebarAccountInfoViewDisplayNameColor: UIColor = defaultTextColor
+    @Published var sidebarAccountInfoViewUsernameColor: UIColor = .gray
+    @Published var sidebarMenuHeaderForegroundColor: UIColor = defaultTextColor
+    @Published var sidebarMenuItemTitleForegroundColor: UIColor = defaultTextColor
     @Published var sidebarMenuItemLinkIconForegroundColor: UIColor = .systemGray
-    @Published var sidebarMenuItemIsPressedTitleForegroundColor: UIColor = .systemBlue
+    @Published var sidebarMenuItemIsSelectedTitleForegroundColor: UIColor = .systemBackground
 
     @Published var accountInfo = SidebarAccountInfo()
     @Published var selectedMenuItem: SidebarSelectableMenuItem = .all {
@@ -55,3 +56,7 @@ final class SidebarModel: ObservableObject {
         self.supportAction = supportAction
     }
 }
+
+private let defaultTextColor = UIColor {
+    $0.userInterfaceStyle == .dark ? .white : .darkText
+}

WireUI/Sources/WireSidebar/Views/SidebarMenuItemView.swift

@@ -31,7 +31,7 @@ struct SidebarMenuItemView: View {
 
     @Environment(\.sidebarMenuItemTitleForegroundColor) private var titleForegroundColor
     @Environment(\.sidebarMenuItemLinkIconForegroundColor) private var linkIconForegroundColor
-    @Environment(\.sidebarMenuItemIsPressedTitleForegroundColor) private var isPressedTitleForegroundColor
+    @Environment(\.sidebarMenuItemIsSelectedTitleForegroundColor) private var isSelectedTitleForegroundColor
 
     /// The `systemName` which is passed into `SwiftUI.Image`.
     private(set) var icon: String
@@ -55,11 +55,11 @@ struct SidebarMenuItemView: View {
             HStack {
                 Label {
                     title()
-                        .foregroundStyle(isHighlighted ? isPressedTitleForegroundColor : titleForegroundColor)
+                        .foregroundStyle(isHighlighted ? isSelectedTitleForegroundColor : titleForegroundColor)
                 } icon: {
                     let iconSystemNameSuffix = isHighlighted ? ".fill" : ""
                     let icon = Image(systemName: icon + iconSystemNameSuffix)
-                        .foregroundStyle(isHighlighted ? isPressedTitleForegroundColor : Color(accentColor))
+                        .foregroundStyle(isHighlighted ? isSelectedTitleForegroundColor : Color(accentColor))
                         .background(GeometryReader { geometryProxy in
                             Color.clear.preference(key: SidebarMenuItemMinIconSizeKey.self, value: geometryProxy.size)
                         })
@@ -74,7 +74,7 @@ struct SidebarMenuItemView: View {
 
                 if isLink {
                     Image(systemName: "arrow.up.forward.square")
-                        .foregroundStyle(isHighlighted ? isPressedTitleForegroundColor : linkIconForegroundColor)
+                        .foregroundStyle(isHighlighted ? isSelectedTitleForegroundColor : linkIconForegroundColor)
                 }
             }
             .contentShape(RoundedRectangle(cornerRadius: backgroundCornerRadius))
@@ -108,8 +108,8 @@ extension View {
         modifier(SidebarMenuItemLinkIconForegroundColorViewModifier(linkIconForegroundColor: linkIconForegroundColor))
     }
 
-    func sidebarMenuItemIsPressedTitleForegroundColor(_ isPressedTitleForegroundColor: Color) -> some View {
-        modifier(SidebarMenuItemIsPressedTitleForegroundColorViewModifier(isPressedTitleForegroundColor: isPressedTitleForegroundColor))
+    func sidebarMenuItemIsSelectedTitleForegroundColor(_ isSelectedTitleForegroundColor: Color) -> some View {
+        modifier(SidebarMenuItemIsSelectedTitleForegroundColorViewModifier(isSelectedTitleForegroundColor: isSelectedTitleForegroundColor))
     }
 }
 
@@ -124,9 +124,9 @@ private extension EnvironmentValues {
         set { self[SidebarMenuItemLinkIconForegroundColorKey.self] = newValue }
     }
 
-    var sidebarMenuItemIsPressedTitleForegroundColor: Color {
-        get { self[SidebarMenuItemIsPressedTitleForegroundColorKey.self] }
-        set { self[SidebarMenuItemIsPressedTitleForegroundColorKey.self] = newValue }
+    var sidebarMenuItemIsSelectedTitleForegroundColor: Color {
+        get { self[SidebarMenuItemIsSelectedTitleForegroundColorKey.self] }
+        set { self[SidebarMenuItemIsSelectedTitleForegroundColorKey.self] = newValue }
     }
 }
 
@@ -154,15 +154,15 @@ private struct SidebarMenuItemLinkIconForegroundColorKey: EnvironmentKey {
     static let defaultValue = Color.primary.opacity(0.6)
 }
 
-struct SidebarMenuItemIsPressedTitleForegroundColorViewModifier: ViewModifier {
-    var isPressedTitleForegroundColor: Color
+struct SidebarMenuItemIsSelectedTitleForegroundColorViewModifier: ViewModifier {
+    var isSelectedTitleForegroundColor: Color
     func body(content: Content) -> some View {
         content
-            .environment(\.sidebarMenuItemIsPressedTitleForegroundColor, isPressedTitleForegroundColor)
+            .environment(\.sidebarMenuItemIsSelectedTitleForegroundColor, isSelectedTitleForegroundColor)
     }
 }
 
-private struct SidebarMenuItemIsPressedTitleForegroundColorKey: EnvironmentKey {
+private struct SidebarMenuItemIsSelectedTitleForegroundColorKey: EnvironmentKey {
     static let defaultValue = Color.white
 }
 

WireUI/Sources/WireSidebar/Views/SidebarView.swift

@@ -21,7 +21,8 @@ import WireFoundation
 
 public struct SidebarView<AccountImageView>: View where AccountImageView: View {
 
-    @Environment(\.sidebarBackgroundColor) private var sidebarBackgroundColor
+    @Environment(\.sidebarMenuHeaderForegroundColor) private var menuHeaderForegroundColor
+    @Environment(\.sidebarBackgroundColor) private var backgroundViewColor
 
     public var accountInfo: SidebarAccountInfo?
     @Binding public var selectedMenuItem: SidebarSelectableMenuItem
@@ -57,7 +58,7 @@ public struct SidebarView<AccountImageView>: View where AccountImageView: View {
         ZStack {
             // background color
             Rectangle()
-                .foregroundStyle(sidebarBackgroundColor)
+                .foregroundStyle(backgroundViewColor)
                 .ignoresSafeArea()
 
             // content
@@ -123,6 +124,7 @@ public struct SidebarView<AccountImageView>: View where AccountImageView: View {
     @ViewBuilder
     private func menuItemHeader(_ key: LocalizedStringKey, addTopPadding: Bool = true) -> some View {
         let text = Text(key, bundle: .module)
+            .foregroundStyle(menuHeaderForegroundColor)
             .wireTextStyle(.h2)
             .padding(.horizontal, 8)
             .padding(.vertical, 12)
@@ -205,18 +207,39 @@ public struct SidebarView<AccountImageView>: View where AccountImageView: View {
 // MARK: - View Modifiers + Environment
 
 extension View {
+    func sidebarMenuHeaderForegroundColor(_ headerForegroundColor: Color) -> some View {
+        modifier(SidebarMenuHeaderForegroundColorViewModifier(headerForegroundColor: headerForegroundColor))
+    }
+
     func sidebarBackgroundColor(_ sidebarBackgroundColor: Color) -> some View {
         modifier(SidebarBackgroundColorViewModifier(sidebarBackgroundColor: sidebarBackgroundColor))
     }
 }
 
 private extension EnvironmentValues {
+    var sidebarMenuHeaderForegroundColor: Color {
+        get { self[SidebarMenuHeaderForegroundColorKey.self] }
+        set { self[SidebarMenuHeaderForegroundColorKey.self] = newValue }
+    }
+
     var sidebarBackgroundColor: Color {
         get { self[SidebarBackgroundColorKey.self] }
         set { self[SidebarBackgroundColorKey.self] = newValue }
     }
 }
 
+struct SidebarMenuHeaderForegroundColorViewModifier: ViewModifier {
+    var headerForegroundColor: Color
+    func body(content: Content) -> some View {
+        content
+            .environment(\.sidebarMenuHeaderForegroundColor, headerForegroundColor)
+    }
+}
+
+private struct SidebarMenuHeaderForegroundColorKey: EnvironmentKey {
+    static let defaultValue = Color.primary
+}
+
 struct SidebarBackgroundColorViewModifier: ViewModifier {
     var sidebarBackgroundColor: Color
     func body(content: Content) -> some View {

WireUI/Sources/WireSidebar/Views/SidebarViewController.swift

@@ -69,6 +69,11 @@ public final class SidebarViewController: UIViewController {
         set { model.sidebarAccountInfoViewUsernameColor = newValue }
     }
 
+    public var sidebarMenuHeaderForegroundColor: UIColor {
+        get { model.sidebarMenuHeaderForegroundColor }
+        set { model.sidebarMenuHeaderForegroundColor = newValue }
+    }
+
     public var sidebarMenuItemTitleForegroundColor: UIColor {
         get { model.sidebarMenuItemTitleForegroundColor }
         set { model.sidebarMenuItemTitleForegroundColor = newValue }
@@ -79,9 +84,9 @@ public final class SidebarViewController: UIViewController {
         set { model.sidebarMenuItemLinkIconForegroundColor = newValue }
     }
 
-    public var sidebarMenuItemIsPressedTitleForegroundColor: UIColor {
-        get { model.sidebarMenuItemIsPressedTitleForegroundColor }
-        set { model.sidebarMenuItemIsPressedTitleForegroundColor = newValue }
+    public var sidebarMenuItemIsSelectedTitleForegroundColor: UIColor {
+        get { model.sidebarMenuItemIsSelectedTitleForegroundColor }
+        set { model.sidebarMenuItemIsSelectedTitleForegroundColor = newValue }
     }
 
     // MARK: - Private Properties
@@ -168,9 +173,10 @@ private struct SidebarAdapter<AccountImageView>: View where AccountImageView: Vi
         .sidebarBackgroundColor(.init(uiColor: model.sidebarBackgroundColor))
         .sidebarAccountInfoViewDisplayNameColor(.init(uiColor: model.sidebarAccountInfoViewDisplayNameColor))
         .sidebarAccountInfoViewUsernameColor(.init(uiColor: model.sidebarAccountInfoViewUsernameColor))
+        .sidebarMenuHeaderForegroundColor(.init(uiColor: model.sidebarMenuHeaderForegroundColor))
         .sidebarMenuItemTitleForegroundColor(.init(uiColor: model.sidebarMenuItemTitleForegroundColor))
         .sidebarMenuItemLinkIconForegroundColor(.init(uiColor: model.sidebarMenuItemLinkIconForegroundColor))
-        .sidebarMenuItemIsPressedTitleForegroundColor(.init(uiColor: model.sidebarMenuItemIsPressedTitleForegroundColor))
+        .sidebarMenuItemIsSelectedTitleForegroundColor(.init(uiColor: model.sidebarMenuItemIsSelectedTitleForegroundColor))
         .environment(\.wireAccentColor, model.wireAccentColor)
         .environment(\.wireAccentColorMapping, model.wireAccentColorMapping)
         .environment(\.wireTextStyleMapping, model.wireTextStyleMapping)