/issues/5114 - Disabled poll creation in build settings and removed t…

…he custom title bar view modifier.
element-hq · Nov 11, 2021 · 9a662d9 · 9a662d9
1 parent 17686e5
commit 9a662d9
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 27 deletions.
diff --git a/Config/BuildSettings.swift b/Config/BuildSettings.swift
@@ -285,7 +285,7 @@ final class BuildSettings: NSObject {
             return false
         }
 
-        return true
+        return false
     }
 
     /// Allow split view detail view stacking    

diff --git a/Podfile b/Podfile
@@ -96,6 +96,10 @@ abstract_target 'RiotPods' do
     import_SwiftUI_pods
   end 
 
+  target "RiotSwiftUITests" do
+    import_SwiftUI_pods
+  end 
+
   target "SiriIntents" do
     import_MatrixKit
   end

diff --git a/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift b/RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift
@@ -81,9 +81,19 @@ struct PollEditForm: View {
                     .animation(.easeInOut(duration: 0.2))
                     .padding()
                     .frame(minHeight: proxy.size.height) // Make the VStack fill the ScrollView's parent
-                    .modifier(NavigationTitleBar(titleColor: theme.colors.primaryContent) {
-                        viewModel.send(viewAction: .cancel)
-                    })
+                    .toolbar {
+                        ToolbarItem(placement: .navigationBarLeading) {
+                            Button(VectorL10n.cancel, action: {
+                                viewModel.send(viewAction: .cancel)
+                            })
+                        }
+                        ToolbarItem(placement: .principal) {
+                            Text(VectorL10n.pollEditFormCreatePoll)
+                                .font(.headline)
+                                .foregroundColor(theme.colors.primaryContent)
+                        }
+                    }
+                    .navigationBarTitleDisplayMode(.inline)
                 }
             }
         }
@@ -125,29 +135,6 @@ private struct AnswerOptionGroup: View {
     }
 }
 
-@available(iOS 14.0, *)
-private struct NavigationTitleBar: ViewModifier {
-    let titleColor: Color
-    let cancelCallback: () -> Void
-
-    func body(content: Content) -> some View {
-        return content
-            .toolbar {
-                ToolbarItem(placement: .navigationBarLeading) {
-                    Button(VectorL10n.cancel, action: {
-                        cancelCallback()
-                    })
-                }
-                ToolbarItem(placement: .principal) {
-                    Text(VectorL10n.pollEditFormCreatePoll)
-                        .font(.headline)
-                        .foregroundColor(titleColor)
-                }
-            }
-            .navigationBarTitleDisplayMode(.inline)
-    }
-}
-
 // MARK: - Previews
 
 @available(iOS 14.0, *)