Add SegmentedPicker

2026-04-21 17:12:45 +02:00 · 2023-01-12 15:45:16 +01:00
parent f8bdb378c5
commit acf59515f9
2 changed files with 87 additions and 16 deletions
@@ -27,28 +27,38 @@ struct PollHistory: View {
    
    var body: some View {
        VStack {
-            Picker("abc", selection: .constant(PollHistoryMode.active)) {
-                Text("Active Polls")
-                    .tag(PollHistoryMode.active)
-                
-                Text("Past Polls")
-                    .tag(PollHistoryMode.past)
+            HStack {
+                SegmentedPicker(
+                    segments: [
+                        ("Active Polls", PollHistoryMode.active),
+                        ("Past Pools", PollHistoryMode.past)
+                    ],
+                    selection: $viewModel.mode,
+                    interSegmentSpacing: 14
+                )
+                Spacer()
            }
-            .pickerStyle(SegmentedPickerStyle())
            
            ScrollView {
-                ForEach(0..<10) { index in
-                    Text("Active poll number: \(index)")
-                }
-                
-                Button {
-                    #warning("handle action")
-                } label: {
-                    Text("Load more polls")
+                LazyVStack(spacing: 32) {
+                    ForEach(0..<10) { index in
+                        Text("Active poll number: \(index)")
+                    }
+                    .frame(maxWidth: .infinity, alignment: .leading)
+                    
+                    Button {
+                        #warning("handle action")
+                    } label: {
+                        Text("Load more polls")
+                    }
+                    .frame(maxWidth: .infinity, alignment: .leading)
                }
+                .padding(.top, 32)
            }
-            .frame(maxWidth: .infinity, maxHeight: .infinity)
        }
+        .padding(.horizontal, 16)
+        .padding(.vertical, 32)
+        .frame(maxWidth: .infinity, maxHeight: .infinity)
        .background(theme.colors.background.ignoresSafeArea())
        .accentColor(theme.colors.accent)
    }
@@ -0,0 +1,61 @@
+// 
+// Copyright 2023 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
+
+struct SegmentedPicker<Tag: Hashable>: View {
+    private let segments: [(String, Tag)]
+    private let selection: Binding<Tag>
+    private let interSegmentSpacing: CGFloat
+    
+    @Environment(\.theme) private var theme
+    
+    init(segments: [(String, Tag)], selection: Binding<Tag>, interSegmentSpacing: CGFloat) {
+        self.segments = segments
+        self.selection = selection
+        self.interSegmentSpacing = interSegmentSpacing
+    }
+    
+    var body: some View {
+        HStack(spacing: interSegmentSpacing) {
+            ForEach(segments, id: \.1) { text, tag in
+                let isSelectedSegment = tag == selection.wrappedValue
+                
+                Button {
+                    selection.wrappedValue = tag
+                } label: {
+                    Text(text)
+                        .font(isSelectedSegment ? theme.fonts.headline : theme.fonts.body)
+                        .underline(isSelectedSegment)
+                }
+                .accentColor(isSelectedSegment ? theme.colors.accent : theme.colors.primaryContent)
+            }
+        }
+    }
+}
+
+struct SegmentedPicker_Previews: PreviewProvider {
+    static var previews: some View {
+        SegmentedPicker(
+            segments: [
+                ("Segment 1", "1"),
+                ("Segment 2", "2")
+            ],
+            selection: .constant("1"),
+            interSegmentSpacing: 14
+        )
+    }
+}