[iOS] UI bug on iPad when using filters in Discussion

Discussion/Discussion/Domain/Model/ThreadType.swift

@@ -14,17 +14,36 @@ public enum ThreadType {
     case courseTopics(topicID: String)
 }
 
-public enum ThreadsFilter {
+public enum ThreadsFilter: Identifiable {
+    public var id: String {
+        localizedValue
+    }
+
     case allThreads
     case unread
     case unanswered
+
+    var localizedValue: String {
+        switch self {
+        case .allThreads:
+            return DiscussionLocalization.Posts.Filter.allPosts
+        case .unread:
+            return DiscussionLocalization.Posts.Filter.unread
+        case .unanswered:
+            return DiscussionLocalization.Posts.Filter.unanswered
+        }
+    }
 }
 
-public enum SortType {
+public enum SortType: Identifiable {
+    public var id: String {
+        localizedValue
+    }
+
     case recentActivity
     case mostActivity
     case mostVotes
-    
+
     var localizedValue: String {
         switch self {
         case .recentActivity:

Discussion/Discussion/Presentation/Posts/PostsView.swift

@@ -13,12 +13,16 @@ import Theme
 public struct PostsView: View {
 
     @ObservedObject private var viewModel: PostsViewModel
-    @State private var showingAlert = false
+    @State private var showFilterSheet = false
+    @State private var showSortSheet = false
     private let router: DiscussionRouter
     private let title: String
     private let currentBlockID: String
     private let courseID: String
     private var showTopMenu: Bool
+    private var isPad: Bool {
+        UIDevice.current.userInterfaceIdiom == .pad
+    }
 
     public init(
         courseID: String,
@@ -73,25 +77,10 @@ public struct PostsView: View {
                                 VStack {
                                     HStack {
                                         Group {
-                                            Button(action: {
-                                                viewModel.generateButtons(type: .filter)
-                                                showingAlert = true
-                                            }, label: {
-                                                CoreAssets.filter.swiftUIImage.renderingMode(.template)
-                                                    .foregroundColor(Theme.Colors.accentXColor)
-                                                Text(viewModel.filterTitle.localizedValue)
-                                            })
+                                            filterButton
                                             Spacer()
-                                            Button(action: {
-                                                viewModel.generateButtons(type: .sort)
-                                                showingAlert = true
-                                            }, label: {
-                                                CoreAssets.sort.swiftUIImage.renderingMode(.template)
-                                                    .foregroundColor(Theme.Colors.accentXColor)
-                                                Text(viewModel.sortTitle.localizedValue)
-                                            })
-                                        }
-                                        .foregroundColor(Theme.Colors.accentColor)
+                                            sortButton
+                                        }.foregroundColor(Theme.Colors.accentColor)
                                     }
                                     .font(Theme.Fonts.labelMedium)
                                     .padding(.horizontal, 24)
@@ -210,7 +199,6 @@ public struct PostsView: View {
                                 }
                             }
                             .accessibilityAction {}
-                            .animation(nil)
                             .onRightSwipeGesture {
                                 router.back()
                             }
@@ -241,13 +229,70 @@ public struct PostsView: View {
                 Theme.Colors.background
                     .ignoresSafeArea()
             )
-            // MARK: - Action Sheet
-            .actionSheet(isPresented: $showingAlert, content: {
-                ActionSheet(title: Text(DiscussionLocalization.Posts.Alert.makeSelection), buttons: viewModel.filterButtons)
-            })
         }
     }
 
+    private var filterButton: some View {
+        Button(
+            action: {
+                showFilterSheet = true
+            },
+            label: {
+                CoreAssets.filter.swiftUIImage
+                    .renderingMode(.template)
+                    .foregroundColor(Theme.Colors.accentXColor)
+                Text(viewModel.filterTitle.localizedValue)
+            }
+        )
+        .confirmationDialog(
+            DiscussionLocalization.Posts.Alert.makeSelection,
+            isPresented: $showFilterSheet,
+            titleVisibility: isPad ? .automatic : .visible,
+            actions: {
+                ForEach(viewModel.filterInfos) { info in
+                    Button(
+                        action: {
+                            viewModel.filter(by: info)
+                        },
+                        label: {
+                            Text(info.localizedValue)
+                        }
+                    )
+                }
+            }
+        )
+    }
+
+    private var sortButton: some View {
+        Button(
+            action: {
+                showSortSheet = true
+            },
+            label: {
+                CoreAssets.sort.swiftUIImage.renderingMode(.template)
+                    .foregroundColor(Theme.Colors.accentXColor)
+                Text(viewModel.sortTitle.localizedValue)
+            }
+        )
+        .confirmationDialog(
+            DiscussionLocalization.Posts.Alert.makeSelection,
+            isPresented: $showSortSheet,
+            titleVisibility: isPad ? .automatic : .visible,
+            actions: {
+                ForEach(viewModel.sortInfos) { info in
+                    Button(
+                        action: {
+                            viewModel.sort(by: info)
+                        },
+                        label: {
+                            Text(info.localizedValue)
+                        }
+                    )
+                }
+            }
+        )
+    }
+
     @MainActor
     private func reloadPage(onSuccess: @escaping () -> Void) {
         Task {

Discussion/Discussion/Presentation/Posts/PostsViewModel.swift

@@ -10,20 +10,6 @@ import SwiftUI
 import Combine
 import Core
 
-public extension ThreadsFilter {
-
-    var localizedValue: String {
-        switch self {
-        case .allThreads:
-            return DiscussionLocalization.Posts.Filter.allPosts
-        case .unread:
-            return DiscussionLocalization.Posts.Filter.unread
-        case .unanswered:
-            return DiscussionLocalization.Posts.Filter.unanswered
-        }
-    }
-}
-
 public class PostsViewModel: ObservableObject {
 
     public var nextPage = 1
@@ -40,7 +26,7 @@ public class PostsViewModel: ObservableObject {
     @Published var filteredPosts: [DiscussionPost] = []
     @Published var filterTitle: ThreadsFilter = .allThreads {
         willSet {
-            if let courseID {
+            if courseID != nil {
                 resetPosts()
                 Task {
                     _ = await getPosts(pageNumber: 1)
@@ -50,15 +36,30 @@ public class PostsViewModel: ObservableObject {
     }
     @Published var sortTitle: SortType = .recentActivity {
         willSet {
-            if let courseID {
+            if courseID != nil {
                 resetPosts()
                 Task {
                     _ = await getPosts(pageNumber: 1)
                 }
             }
         }
     }
-    @Published var filterButtons: [ActionSheet.Button] = []
+
+    var filterInfos: [ThreadsFilter] {
+        [
+            .allThreads,
+            .unread,
+            .unanswered
+        ]
+    }
+
+    var sortInfos: [SortType] {
+        [
+            .recentActivity,
+            .mostActivity,
+            .mostVotes
+        ]
+    }
 
     public var courseID: String?
     var errorMessage: String? {
@@ -113,41 +114,14 @@ public class PostsViewModel: ObservableObject {
         totalPages = 1
     }
 
-    public func generateButtons(type: ButtonType) {
-        switch type {
-        case .sort:
-            self.filterButtons = [
-                ActionSheet.Button.default(Text(DiscussionLocalization.Posts.Sort.recentActivity)) {
-                    self.sortTitle = .recentActivity
-                    self.filteredPosts = self.discussionPosts
-                },
-                ActionSheet.Button.default(Text(DiscussionLocalization.Posts.Sort.mostActivity)) {
-                    self.sortTitle = .mostActivity
-                    self.filteredPosts = self.discussionPosts
-                },
-                ActionSheet.Button.default(Text(DiscussionLocalization.Posts.Sort.mostVotes)) {
-                    self.sortTitle = .mostVotes
-                    self.filteredPosts = self.discussionPosts
-                },
-                .cancel()
-            ]
-        case .filter:
-            self.filterButtons = [
-                ActionSheet.Button.default(Text(DiscussionLocalization.Posts.Filter.allPosts)) {
-                    self.filterTitle = .allThreads
-                    self.filteredPosts = self.discussionPosts
-                },
-                ActionSheet.Button.default(Text(DiscussionLocalization.Posts.Filter.unread)) {
-                    self.filterTitle = .unread
-                    self.filteredPosts = self.discussionPosts
-                },
-                ActionSheet.Button.default(Text(DiscussionLocalization.Posts.Filter.unanswered)) {
-                    self.filterTitle = .unanswered
-                    self.filteredPosts = self.discussionPosts
-                },
-                .cancel()
-            ]
-        }
+    public func sort(by value: SortType) {
+        self.sortTitle = value
+        self.filteredPosts = self.discussionPosts
+    }
+
+    public func filter(by value: ThreadsFilter) {
+        self.filterTitle = value
+        self.filteredPosts = self.discussionPosts
     }
 
     func generatePosts(threads: ThreadLists?) -> [DiscussionPost] {