generated from element-hq/.github
-
Notifications
You must be signed in to change notification settings - Fork 98
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
"View only" polls in the timeline (#1399)
* Add stub methods in RoomTimelineItemFactory * Add PollRoomTimelineView and PollEndRoomTimelineView * Add timeline skeleton * Start poll mapping * Add comment * Refine poll UI * Add feature flags for polls * Cleanup * Delete poll end event * Refine poll mapping * Refine poll layout * Reuse FormRowAccessory * Refine poll bubble layout * Localise strings * Update project * Refine poll preview * Map poll properties
- Loading branch information
1 parent
8f29047
commit 0e7a48d
Showing
19 changed files
with
394 additions
and
43 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
ElementX/Resources/Assets.xcassets/images/polls/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| { | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
12 changes: 12 additions & 0 deletions
12
ElementX/Resources/Assets.xcassets/images/polls/equalizer.imageset/Contents.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| { | ||
| "images" : [ | ||
| { | ||
| "filename" : "equalizer.pdf", | ||
| "idiom" : "universal" | ||
| } | ||
| ], | ||
| "info" : { | ||
| "author" : "xcode", | ||
| "version" : 1 | ||
| } | ||
| } |
Binary file added
BIN
+1.62 KB
ElementX/Resources/Assets.xcassets/images/polls/equalizer.imageset/equalizer.pdf
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
ElementX/Sources/Screens/RoomScreen/View/Timeline/PollOptionView.swift
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| // | ||
| // 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 PollOptionView: View { | ||
| let pollOption: Poll.Option | ||
|
|
||
| var body: some View { | ||
| HStack(alignment: .top, spacing: 8) { | ||
| FormRowAccessory(kind: .multipleSelection(isSelected: pollOption.isSelected)) | ||
|
|
||
| VStack(spacing: 10) { | ||
| HStack(alignment: .lastTextBaseline) { | ||
| Text(pollOption.text) | ||
| .frame(maxWidth: .infinity, alignment: .leading) | ||
|
|
||
| Text(L10n.commonPollVotesCount(pollOption.votes)) | ||
| .font(.compound.bodySM) | ||
| .foregroundColor(.compound.textSecondary) | ||
| } | ||
|
|
||
| progressView | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // MARK: - Private | ||
|
|
||
| private var progressView: some View { | ||
| ProgressView(value: Double(pollOption.votes) / Double(pollOption.allVotes)) | ||
| .progressViewStyle(LinearProgressViewStyle(tint: .compound.textPrimary)) | ||
| } | ||
| } | ||
|
|
||
| struct PollOptionView_Previews: PreviewProvider { | ||
| static var previews: some View { | ||
| VStack { | ||
| Group { | ||
| PollOptionView(pollOption: .init(id: "1", | ||
| text: "Italian 🇮🇹", | ||
| votes: 1, | ||
| allVotes: 10, | ||
| isSelected: true)) | ||
|
|
||
| PollOptionView(pollOption: .init(id: "2", | ||
| text: "Chinese 🇨🇳", | ||
| votes: 9, | ||
| allVotes: 10, | ||
| isSelected: false)) | ||
| } | ||
| .padding() | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.