vector-im/element-ios/issues/5114 - Added UI for creating undisclosed polls and logic for displaying them in the timeline.

RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditForm.swift

@@ -37,6 +37,8 @@ struct PollEditForm: View {
                 ScrollView {
                     VStack(alignment: .leading, spacing: 32.0) {
                         
+                        PollEditFormTypeView(selectedType: $viewModel.type)
+                        
                         VStack(alignment: .leading, spacing: 16.0) {
                             Text(VectorL10n.pollEditFormPollQuestionOrTopic)
                                 .font(theme.fonts.title3SB)
@@ -58,7 +60,7 @@ struct PollEditForm: View {
                             
                             ForEach(0..<viewModel.answerOptions.count, id: \.self) { index in
                                 SafeBindingCollectionEnumerator($viewModel.answerOptions, index: index) { binding in
-                                    AnswerOptionGroup(text: binding.text, index: index) {
+                                    PollEditFormAnswerOptionView(text: binding.text, index: index) {
                                         withAnimation(.easeInOut(duration: 0.2)) {
                                             viewModel.send(viewAction: .deleteAnswerOption(viewModel.answerOptions[index]))
                                         }
@@ -84,7 +86,8 @@ struct PollEditForm: View {
                             .disabled(!viewModel.viewState.confirmationButtonEnabled)
                         }
                     }
-                    .padding()
+                    .padding(.vertical, 24.0)
+                    .padding(.horizontal, 16.0)
                     .activityIndicator(show: viewModel.viewState.showLoadingIndicator)
                     .alert(item: $viewModel.alertInfo) { info in
                         Alert(title: Text(info.title),
@@ -122,40 +125,6 @@ struct PollEditForm: View {
     }
 }
 
-@available(iOS 14.0, *)
-private struct AnswerOptionGroup: View {
-    
-    @Environment(\.theme) private var theme: ThemeSwiftUI
-    
-    @State private var focused = false
-    
-    @Binding var text: String
-    
-    let index: Int
-    let onDelete: () -> Void
-    
-    var body: some View {
-        VStack(alignment: .leading, spacing: 8.0) {
-            Text(VectorL10n.pollEditFormOptionNumber(index + 1))
-                .font(theme.fonts.subheadline)
-                .foregroundColor(theme.colors.primaryContent)
-            
-            HStack(spacing: 16.0) {
-                TextField(VectorL10n.pollEditFormInputPlaceholder, text: $text, onEditingChanged: { edit in
-                    self.focused = edit
-                })
-                .textFieldStyle(BorderedInputFieldStyle(theme: _theme, isEditing: focused))
-                Button {
-                    onDelete()
-                } label: {
-                    Image(uiImage:Asset.Images.pollDeleteOptionIcon.image)
-                }
-                .accessibilityIdentifier("Delete answer option")
-            }
-        }
-    }
-}
-
 // MARK: - Previews
 
 @available(iOS 14.0, *)

RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormAnswerOptionView.swift

@@ -0,0 +1,64 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct PollEditFormAnswerOptionView: View {
+    
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    @State private var focused = false
+    
+    @Binding var text: String
+    
+    let index: Int
+    let onDelete: () -> Void
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 8.0) {
+            Text(VectorL10n.pollEditFormOptionNumber(index + 1))
+                .font(theme.fonts.subheadline)
+                .foregroundColor(theme.colors.primaryContent)
+            
+            HStack(spacing: 16.0) {
+                TextField(VectorL10n.pollEditFormInputPlaceholder, text: $text, onEditingChanged: { edit in
+                    self.focused = edit
+                })
+                .textFieldStyle(BorderedInputFieldStyle(theme: _theme, isEditing: focused))
+                Button {
+                    onDelete()
+                } label: {
+                    Image(uiImage:Asset.Images.pollDeleteOptionIcon.image)
+                }
+            }
+        }
+    }
+}
+
+@available(iOS 14.0, *)
+struct PollEditFormAnswerOptionView_Previews: PreviewProvider {
+    static var previews: some View {
+        VStack(spacing: 32.0) {
+            PollEditFormAnswerOptionView(text: Binding.constant(""), index: 0) {
+                
+            }
+            PollEditFormAnswerOptionView(text: Binding.constant("Test"), index: 5) {
+                
+            }
+        }
+    }
+}

RiotSwiftUI/Modules/Room/PollEditForm/View/PollEditFormTypeView.swift

@@ -0,0 +1,94 @@
+// 
+// Copyright 2021 New Vector Ltd
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+import SwiftUI
+
+@available(iOS 14.0, *)
+struct PollEditFormTypeView: View {
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    @Binding var selectedType: PollEditFormType
+    
+    var body: some View {
+        VStack(alignment: .leading, spacing: 16.0) {
+            Text(VectorL10n.pollEditFormPollType)
+                .font(theme.fonts.title3SB)
+                .foregroundColor(theme.colors.primaryContent)
+            PollTypeViewButton(type: .disclosed, selectedType: $selectedType)
+            PollTypeViewButton(type: .undisclosed, selectedType: $selectedType)
+        }
+    }
+}
+
+@available(iOS 14.0, *)
+private struct PollTypeViewButton: View {
+    @Environment(\.theme) private var theme: ThemeSwiftUI
+    
+    var type: PollEditFormType
+    @Binding var selectedType: PollEditFormType
+    
+    var body: some View {
+        Button {
+            selectedType = type
+        } label: {
+            HStack(alignment: .top, spacing: 8.0) {
+                
+                if type == selectedType {
+                    Image(uiImage: Asset.Images.pollTypeCheckboxSelected.image)
+                } else {
+                    Image(uiImage: Asset.Images.pollTypeCheckboxDefault.image)
+                }
+                
+                VStack(alignment: .leading, spacing: 2) {
+                    Text(title)
+                        .font(theme.fonts.body)
+                        .foregroundColor(theme.colors.primaryContent)
+                    Text(description)
+                        .font(theme.fonts.footnote)
+                        .foregroundColor(theme.colors.secondaryContent)
+                }
+            }
+        }
+    }
+    
+    private var title: String {
+        switch type {
+        case .disclosed:
+            return VectorL10n.pollEditFormPollTypeOpen
+        case .undisclosed:
+            return VectorL10n.pollEditFormPollTypeClosed
+        }
+    }
+    
+    private var description: String {
+        switch type {
+        case .disclosed:
+            return VectorL10n.pollEditFormPollTypeOpenDescription
+        case .undisclosed:
+            return VectorL10n.pollEditFormPollTypeClosedDescription
+        }
+    }
+}
+
+@available(iOS 14.0, *)
+struct PollEditFormTypeView_Previews: PreviewProvider {
+    static var previews: some View {
+        VStack {
+            PollEditFormTypeView(selectedType: Binding.constant(.disclosed))
+            PollEditFormTypeView(selectedType: Binding.constant(.undisclosed))
+        }
+    }
+}