Refactored alert info to not use the soon to be deprecated API (#1084)

* refactored alert info to not use the soon to be deprecated API

* missing files and changelog

* updated some tests

* Update ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>

---------

Co-authored-by: Doug <6060466+pixlwave@users.noreply.github.com>

ElementX/Sources/Screens/Authentication/LoginScreen/View/LoginScreen.swift

@@ -46,7 +46,7 @@ struct LoginScreen: View {
             .padding(.bottom, 16)
         }
         .background(Color.element.background.ignoresSafeArea())
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
     }
     
     /// The header containing the title and icon.

ElementX/Sources/Screens/Authentication/ServerSelectionScreen/View/ServerSelectionScreen.swift

@@ -33,7 +33,7 @@ struct ServerSelectionScreen: View {
         }
         .background(Color.element.background.ignoresSafeArea())
         .toolbar { toolbar }
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
         .interactiveDismissDisabled()
     }
     

ElementX/Sources/Screens/Authentication/SoftLogoutScreen/View/SoftLogoutScreen.swift

@@ -48,7 +48,7 @@ struct SoftLogoutScreen: View {
             .padding(.bottom, 16)
         }
         .background(Color.element.background.ignoresSafeArea())
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
         .introspectViewController { viewController in
             guard let window = viewController.view.window else { return }
             context.send(viewAction: .updateWindow(window))

ElementX/Sources/Screens/CreateRoom/View/CreateRoomScreen.swift

@@ -41,7 +41,7 @@ struct CreateRoomScreen: View {
             }
         }
         .background(ViewFrameReader(frame: $frame))
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
     }
     
     @ScaledMetric private var roomIconSize: CGFloat = 70

ElementX/Sources/Screens/HomeScreen/View/HomeScreen.swift

@@ -116,7 +116,7 @@ struct HomeScreen: View {
         .animation(.elementDefault, value: context.viewState.showSessionVerificationBanner)
         .animation(.elementDefault, value: context.viewState.roomListMode)
         .animation(.none, value: context.viewState.visibleRooms)
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
         .alert(item: $context.leaveRoomAlertItem,
                actions: leaveRoomAlertActions,
                message: leaveRoomAlertMessage)

ElementX/Sources/Screens/InviteUsersScreen/View/InviteUsersScreen.swift

@@ -38,7 +38,7 @@ struct InviteUsersScreen: View {
                 searchViewController.hidesNavigationBarDuringPresentation = false
             }
             .compoundSearchField()
-            .alert(item: $context.alertInfo) { $0.alert }
+            .alert(item: $context.alertInfo)
             .background(ViewFrameReader(frame: $frame))
     }
     

ElementX/Sources/Screens/InvitesScreen/View/InvitesScreen.swift

@@ -36,7 +36,7 @@ struct InvitesScreen: View {
         }
         .background(Color.element.background.ignoresSafeArea())
         .navigationTitle(L10n.actionInvitesList)
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
     }
     
     // MARK: - Private

ElementX/Sources/Screens/LocationSharing/LocationSharingScreenModels.swift

@@ -16,7 +16,7 @@
 
 import Foundation
 
-enum LocationSharingViewError: Error {
+enum LocationSharingViewError: Error, Hashable {
     case failedSharingLocation
     case mapError(MapLibreError)
 }
@@ -31,15 +31,18 @@ struct StaticLocationScreenBindings {
     /// Information describing the currently displayed alert.
     var mapError: MapLibreError? {
         get {
-            errorAlert?.error as? MapLibreError
+            if case let .mapError(error) = alertInfo?.id {
+                return error
+            }
+            return nil
         }
         set {
-            errorAlert = newValue.map { ErrorAlertItem(error: $0) }
+            alertInfo = newValue.map { AlertInfo(id: .mapError($0)) }
         }
     }
     
     /// Information describing the currently displayed alert.
-    var errorAlert: ErrorAlertItem?
+    var alertInfo: AlertInfo<LocationSharingViewError>?
 }
 
 enum StaticLocationScreenViewAction { }

ElementX/Sources/Screens/LocationSharing/View/StaticLocationScreen.swift

@@ -26,7 +26,7 @@ struct StaticLocationScreen: View {
             mapView
                 .ignoresSafeArea(.all, edges: [.bottom])
                 .navigationBarTitleDisplayMode(.inline)
-                .errorAlert(item: $context.errorAlert)
+                .alert(item: $context.alertInfo)
         }
     }
     

ElementX/Sources/Screens/RoomDetailsScreen/RoomDetailsScreenModels.swift

@@ -61,7 +61,7 @@ struct RoomDetailsScreenViewState: BindableState {
 }
 
 struct RoomDetailsScreenViewStateBindings {
-    struct IgnoreUserAlertItem: AlertItem, Equatable {
+    struct IgnoreUserAlertItem: AlertProtocol, Equatable {
         enum Action {
             case ignore
             case unignore
@@ -105,7 +105,7 @@ struct RoomDetailsScreenViewStateBindings {
     var ignoreUserRoomAlertItem: IgnoreUserAlertItem?
 }
 
-struct LeaveRoomAlertItem: AlertItem {
+struct LeaveRoomAlertItem: AlertProtocol {
     enum RoomState {
         case empty
         case `public`

ElementX/Sources/Screens/RoomDetailsScreen/View/RoomDetailsScreen.swift

@@ -42,7 +42,7 @@ struct RoomDetailsScreen: View {
             }
         }
         .elementFormStyle()
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
         .alert(item: $context.leaveRoomAlertItem,
                actions: leaveRoomAlertActions,
                message: leaveRoomAlertMessage)

ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenModels.swift

@@ -26,7 +26,7 @@ struct RoomMemberDetailsScreenViewState: BindableState {
 }
 
 struct RoomMemberDetailsScreenViewStateBindings {
-    struct IgnoreUserAlertItem: AlertItem, Equatable {
+    struct IgnoreUserAlertItem: AlertProtocol, Equatable {
         enum Action {
             case ignore
             case unignore
@@ -65,7 +65,7 @@ struct RoomMemberDetailsScreenViewStateBindings {
     }
     
     var ignoreUserAlert: IgnoreUserAlertItem?
-    var errorAlert: ErrorAlertItem?
+    var alertInfo: AlertInfo<RoomMemberDetailsScreenError>?
 }
 
 enum RoomMemberDetailsScreenViewAction {
@@ -74,3 +74,8 @@ enum RoomMemberDetailsScreenViewAction {
     case ignoreConfirmed
     case unignoreConfirmed
 }
+
+enum RoomMemberDetailsScreenError: Hashable {
+    case alert(String)
+    case unknown
+}

ElementX/Sources/Screens/RoomMemberDetailsScreen/RoomMemberDetailsScreenViewModel.swift

@@ -55,8 +55,8 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
         switch result {
         case .success:
             state.details.isIgnored = true
-        case .failure(let error):
-            state.bindings.errorAlert = .init(error: error)
+        case .failure:
+            state.bindings.alertInfo = .init(id: .unknown)
         }
     }
 
@@ -68,8 +68,8 @@ class RoomMemberDetailsScreenViewModel: RoomMemberDetailsScreenViewModelType, Ro
         switch result {
         case .success:
             state.details.isIgnored = false
-        case .failure(let error):
-            state.bindings.errorAlert = .init(error: error)
+        case .failure:
+            state.bindings.alertInfo = .init(id: .unknown)
         }
     }
 }

ElementX/Sources/Screens/RoomMemberDetailsScreen/View/RoomMemberDetailsScreen.swift

@@ -29,7 +29,7 @@ struct RoomMemberDetailsScreen: View {
         }
         .elementFormStyle()
         .alert(item: $context.ignoreUserAlert, actions: blockUserAlertActions, message: blockUserAlertMessage)
-        .errorAlert(item: $context.errorAlert)
+        .alert(item: $context.alertInfo)
     }
     
     // MARK: - Private

ElementX/Sources/Screens/RoomMemberListScreen/View/RoomMembersListScreen.swift

@@ -33,7 +33,7 @@ struct RoomMembersListScreen: View {
         .compoundSearchField()
         .background(Color.element.background.ignoresSafeArea())
         .navigationTitle(L10n.commonPeople)
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
         .toolbar {
             ToolbarItem(placement: .confirmationAction) {
                 inviteButton

ElementX/Sources/Screens/RoomScreen/View/RoomScreen.swift

@@ -37,7 +37,7 @@ struct RoomScreen: View {
             .toolbar { toolbar }
             .toolbarBackground(.visible, for: .navigationBar) // Fix the toolbar's background.
             .overlay { loadingIndicator }
-            .alert(item: $context.alertInfo) { $0.alert }
+            .alert(item: $context.alertInfo)
             .sheet(item: $context.debugInfo) { TimelineItemDebugView(info: $0) }
             .sheet(item: $context.actionMenuInfo) { info in
                 context.viewState.timelineItemMenuActionProvider?(info.item.id).map { actions in

ElementX/Sources/Screens/StartChatScreen/View/StartChatScreen.swift

@@ -41,7 +41,7 @@ struct StartChatScreen: View {
         .dismissSearchOnDisappear()
         .searchable(text: $context.searchQuery, placement: .navigationBarDrawer(displayMode: .always), prompt: L10n.commonSearchForSomeone)
         .compoundSearchField()
-        .alert(item: $context.alertInfo) { $0.alert }
+        .alert(item: $context.alertInfo)
     }
 
     // MARK: - Private