Skip to content

Commit 4ab9cf6

Browse files
nuno-vieiranuno-vieira
committed
Improve naming of Poll Results Section Headers
1 parent 618c446 commit 4ab9cf6

File tree

7 files changed

+25
-25
lines changed

7 files changed

+25
-25
lines changed

‎Sources/StreamChatUI/ChatMessageList/Attachments/Poll/PollResultsVC/PollResultsOptionView.swift renamed to ‎Sources/StreamChatUI/ChatMessageList/Attachments/Poll/PollResultsVC/PollResultsSectionHeaderOptionView.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import StreamChat
66
import UIKit
77

88
/// The poll option view displayed in the section header of the poll results.
9-
open class PollResultsOptionView: _View, ThemeProvider {
9+
open class PollResultsSectionHeaderOptionView: _View, ThemeProvider {
1010
public struct Content {
1111
public var option: PollOption
1212
public var poll: Poll
@@ -53,7 +53,7 @@ open class PollResultsOptionView: _View, ThemeProvider {
5353
override open func setUpLayout() {
5454
super.setUpLayout()
5555

56-
directionalLayoutMargins = .init(top: 12, leading: 12, bottom: 12, trailing: 12)
56+
directionalLayoutMargins = .init(top: 12, leading: 12, bottom: 8, trailing: 12)
5757

5858
HContainer(spacing: 4, alignment: .center) {
5959
optionNameLabel

‎Sources/StreamChatUI/ChatMessageList/Attachments/Poll/PollResultsVC/PollResultsOptionHeaderView.swift renamed to ‎Sources/StreamChatUI/ChatMessageList/Attachments/Poll/PollResultsVC/PollResultsSectionHeaderView.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import StreamChat
66
import UIKit
77

88
/// The poll results option section header view.
9-
open class PollResultsOptionHeaderView: _TableHeaderFooterView, ThemeProvider {
9+
open class PollResultsSectionHeaderView: _TableHeaderFooterView, ThemeProvider {
1010
public struct Content {
1111
public var option: PollOption
1212
public var poll: Poll
@@ -24,8 +24,8 @@ open class PollResultsOptionHeaderView: _TableHeaderFooterView, ThemeProvider {
2424
}
2525

2626
/// The poll option view displayed in the section header of the poll results.
27-
open private(set) lazy var optionView: PollResultsOptionView = components
28-
.pollResultsOptionView.init()
27+
open private(set) lazy var optionView: PollResultsSectionHeaderOptionView = components
28+
.pollResultsSectionHeaderOptionView.init()
2929
.withoutAutoresizingMaskConstraints
3030

3131
override open func setUpLayout() {

‎Sources/StreamChatUI/ChatMessageList/Attachments/Poll/PollResultsVC/PollResultsTableHeaderView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ open class PollResultsTableHeaderView: _View, ThemeProvider {
5656
super.setUpLayout()
5757

5858
directionalLayoutMargins = .init(top: 16, leading: 16, bottom: 16, trailing: 16)
59-
container.layoutMargins = .init(top: 16, left: 16, bottom: 16, right: 16)
59+
container.directionalLayoutMargins = .init(top: 16, leading: 12, bottom: 16, trailing: 12)
6060
container.isLayoutMarginsRelativeArrangement = true
6161
container.views {
6262
titleLabel

‎Sources/StreamChatUI/ChatMessageList/Attachments/Poll/PollResultsVC/PollResultsVC.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ open class PollResultsVC:
8989
navigationItem.leftBarButtonItem?.tintColor = appearance.colorPalette.background7
9090

9191
tableView.register(components.pollResultsVoteItemCell)
92-
tableView.register(components.pollResultsOptionHeaderView)
92+
tableView.register(components.pollResultsSectionHeaderView)
9393
tableView.register(components.pollResultsFooterButtonView)
9494

9595
tableView.estimatedSectionHeaderHeight = 50
@@ -169,7 +169,7 @@ open class PollResultsVC:
169169
open func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
170170
guard let poll = pollController.poll else { return nil }
171171
let option = poll.options[section]
172-
let view = tableView.dequeueReusableHeaderFooter(with: components.pollResultsOptionHeaderView)
172+
let view = tableView.dequeueReusableHeaderFooter(with: components.pollResultsSectionHeaderView)
173173
view.content = .init(option: option, poll: poll)
174174
style(sectionHeaderView: view, contentView: view.optionView, isEmptySection: option.latestVotes.isEmpty)
175175
return view

‎Sources/StreamChatUI/ChatMessageList/Attachments/Poll/PollResultsVC/PollResultsVoteListVC/PollResultsVoteListVC.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ open class PollResultsVoteListVC:
8787
super.setUp()
8888

8989
tableView.register(components.pollResultsVoteItemCell)
90-
tableView.register(components.pollResultsOptionHeaderView)
90+
tableView.register(components.pollResultsSectionHeaderView)
9191

9292
tableView.estimatedSectionHeaderHeight = 50
9393
tableView.sectionHeaderHeight = UITableView.automaticDimension
@@ -133,7 +133,7 @@ open class PollResultsVoteListVC:
133133
// MARK: - UITableViewDelegate
134134

135135
public func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
136-
let view = tableView.dequeueReusableHeaderFooter(with: components.pollResultsOptionHeaderView)
136+
let view = tableView.dequeueReusableHeaderFooter(with: components.pollResultsSectionHeaderView)
137137
view.content = .init(option: option, poll: poll)
138138
style(sectionHeaderView: view, contentView: view.optionView, isEmptySection: false)
139139
return view

‎Sources/StreamChatUI/Components.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,10 +330,10 @@ public struct Components {
330330
public var pollResultsTableHeaderView: PollResultsTableHeaderView.Type = PollResultsTableHeaderView.self
331331

332332
/// The poll results header view for each section.
333-
public var pollResultsOptionHeaderView: PollResultsOptionHeaderView.Type = PollResultsOptionHeaderView.self
333+
public var pollResultsSectionHeaderView: PollResultsSectionHeaderView.Type = PollResultsSectionHeaderView.self
334334

335-
/// The poll results header content view for header footer view section.
336-
public var pollResultsOptionView: PollResultsOptionView.Type = PollResultsOptionView.self
335+
/// The poll results header content view for the section header.
336+
public var pollResultsSectionHeaderOptionView: PollResultsSectionHeaderOptionView.Type = PollResultsSectionHeaderOptionView.self
337337

338338
/// The poll results footer view for each section.
339339
public var pollResultsFooterButtonView: PollResultsFooterButtonView.Type = PollResultsFooterButtonView.self

‎StreamChat.xcodeproj/project.pbxproj

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1437,10 +1437,10 @@
14371437
AD4C8C232C5D479B00E1C414 /* StackedUserAvatarsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4C8C212C5D479B00E1C414 /* StackedUserAvatarsView.swift */; };
14381438
AD4CDD85296499160057BC8A /* ScrollViewPaginationHandler_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4CDD81296498D20057BC8A /* ScrollViewPaginationHandler_Tests.swift */; };
14391439
AD4CDD862964991A0057BC8A /* InvertedScrollViewPaginationHandler_Tests.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4CDD83296498EB0057BC8A /* InvertedScrollViewPaginationHandler_Tests.swift */; };
1440-
AD4F89D02C666471006DF7E5 /* PollResultsOptionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CA2C666471006DF7E5 /* PollResultsOptionHeaderView.swift */; };
1441-
AD4F89D12C666471006DF7E5 /* PollResultsOptionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CA2C666471006DF7E5 /* PollResultsOptionHeaderView.swift */; };
1442-
AD4F89D22C666471006DF7E5 /* PollResultsOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CB2C666471006DF7E5 /* PollResultsOptionView.swift */; };
1443-
AD4F89D32C666471006DF7E5 /* PollResultsOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CB2C666471006DF7E5 /* PollResultsOptionView.swift */; };
1440+
AD4F89D02C666471006DF7E5 /* PollResultsSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CA2C666471006DF7E5 /* PollResultsSectionHeaderView.swift */; };
1441+
AD4F89D12C666471006DF7E5 /* PollResultsSectionHeaderView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CA2C666471006DF7E5 /* PollResultsSectionHeaderView.swift */; };
1442+
AD4F89D22C666471006DF7E5 /* PollResultsSectionHeaderOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CB2C666471006DF7E5 /* PollResultsSectionHeaderOptionView.swift */; };
1443+
AD4F89D32C666471006DF7E5 /* PollResultsSectionHeaderOptionView.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CB2C666471006DF7E5 /* PollResultsSectionHeaderOptionView.swift */; };
14441444
AD4F89D42C666471006DF7E5 /* PollResultsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CC2C666471006DF7E5 /* PollResultsVC.swift */; };
14451445
AD4F89D52C666471006DF7E5 /* PollResultsVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CC2C666471006DF7E5 /* PollResultsVC.swift */; };
14461446
AD4F89D62C666471006DF7E5 /* PollResultsVoteItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = AD4F89CD2C666471006DF7E5 /* PollResultsVoteItemCell.swift */; };
@@ -4152,8 +4152,8 @@
41524152
AD4C8C212C5D479B00E1C414 /* StackedUserAvatarsView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = StackedUserAvatarsView.swift; sourceTree = "<group>"; };
41534153
AD4CDD81296498D20057BC8A /* ScrollViewPaginationHandler_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScrollViewPaginationHandler_Tests.swift; sourceTree = "<group>"; };
41544154
AD4CDD83296498EB0057BC8A /* InvertedScrollViewPaginationHandler_Tests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = InvertedScrollViewPaginationHandler_Tests.swift; sourceTree = "<group>"; };
4155-
AD4F89CA2C666471006DF7E5 /* PollResultsOptionHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollResultsOptionHeaderView.swift; sourceTree = "<group>"; };
4156-
AD4F89CB2C666471006DF7E5 /* PollResultsOptionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollResultsOptionView.swift; sourceTree = "<group>"; };
4155+
AD4F89CA2C666471006DF7E5 /* PollResultsSectionHeaderView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollResultsSectionHeaderView.swift; sourceTree = "<group>"; };
4156+
AD4F89CB2C666471006DF7E5 /* PollResultsSectionHeaderOptionView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollResultsSectionHeaderOptionView.swift; sourceTree = "<group>"; };
41574157
AD4F89CC2C666471006DF7E5 /* PollResultsVC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollResultsVC.swift; sourceTree = "<group>"; };
41584158
AD4F89CD2C666471006DF7E5 /* PollResultsVoteItemCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollResultsVoteItemCell.swift; sourceTree = "<group>"; };
41594159
AD4F89CE2C666471006DF7E5 /* PollResultsVoteItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PollResultsVoteItemView.swift; sourceTree = "<group>"; };
@@ -8362,8 +8362,8 @@
83628362
AD4F89E02C6A591B006DF7E5 /* PollResultsVoteItem */,
83638363
AD4F89CC2C666471006DF7E5 /* PollResultsVC.swift */,
83648364
AD4F89DA2C667886006DF7E5 /* PollResultsTableHeaderView.swift */,
8365-
AD4F89CA2C666471006DF7E5 /* PollResultsOptionHeaderView.swift */,
8366-
AD4F89CB2C666471006DF7E5 /* PollResultsOptionView.swift */,
8365+
AD4F89CA2C666471006DF7E5 /* PollResultsSectionHeaderView.swift */,
8366+
AD4F89CB2C666471006DF7E5 /* PollResultsSectionHeaderOptionView.swift */,
83678367
AD4F89DD2C6A5908006DF7E5 /* PollResultsFooterButtonView.swift */,
83688368
);
83698369
name = PollResultsVC;
@@ -10308,7 +10308,7 @@
1030810308
888123D2255D430B00070D5A /* UIView+Extensions.swift in Sources */,
1030910309
AD158B6526C1873000C104CD /* ChatThreadVC+SwiftUI.swift in Sources */,
1031010310
8825333E258CE7AC00B77352 /* ChatMessageActionsVC.swift in Sources */,
10311-
AD4F89D02C666471006DF7E5 /* PollResultsOptionHeaderView.swift in Sources */,
10311+
AD4F89D02C666471006DF7E5 /* PollResultsSectionHeaderView.swift in Sources */,
1031210312
F80BCA1E26304FEE00F2107B /* CloseButton.swift in Sources */,
1031310313
22ADD682256C40410098EFEB /* ComposerView.swift in Sources */,
1031410314
E7A37B8425ADA66E0055458F /* ChatSuggestionsHeaderView.swift in Sources */,
@@ -10347,7 +10347,7 @@
1034710347
AD4F89D42C666471006DF7E5 /* PollResultsVC.swift in Sources */,
1034810348
88BA7F5D258B6953006CE0C5 /* ChatLoadingIndicator.swift in Sources */,
1034910349
40FA4DD42A12A0C300DA21D2 /* SlideToCancelView.swift in Sources */,
10350-
AD4F89D22C666471006DF7E5 /* PollResultsOptionView.swift in Sources */,
10350+
AD4F89D22C666471006DF7E5 /* PollResultsSectionHeaderOptionView.swift in Sources */,
1035110351
ADCB578B28A42D7700B81AE8 /* Differentiable.swift in Sources */,
1035210352
883051742630366E0069D731 /* CACornerMask+Extensions.swift in Sources */,
1035310353
AD876B4727288DF700317314 /* ChatMessageReactionAuthorsFlowLayout.swift in Sources */,
@@ -12430,7 +12430,7 @@
1243012430
40824D242A1271B9003B61FD /* PlayPauseButton.swift in Sources */,
1243112431
C121EB892746A1E700023E4C /* TitleContainerView.swift in Sources */,
1243212432
C121EB8A2746A1E700023E4C /* GradientView.swift in Sources */,
12433-
AD4F89D12C666471006DF7E5 /* PollResultsOptionHeaderView.swift in Sources */,
12433+
AD4F89D12C666471006DF7E5 /* PollResultsSectionHeaderView.swift in Sources */,
1243412434
C121EB8B2746A1E700023E4C /* AttachmentActionButton.swift in Sources */,
1243512435
C121EB8C2746A1E700023E4C /* ChatSuggestionsVC.swift in Sources */,
1243612436
C121EB8D2746A1E700023E4C /* ChatSuggestionsHeaderView.swift in Sources */,
@@ -12558,7 +12558,7 @@
1255812558
C121EBD62746A1EA00023E4C /* ChatMessageReactionAppearance.swift in Sources */,
1255912559
AD78F9FB28EC735700BC0FCE /* SwiftyLineProcessor.swift in Sources */,
1256012560
C1788F6029C33A1000149883 /* ChatThreadRepliesCountDecorationView.swift in Sources */,
12561-
AD4F89D32C666471006DF7E5 /* PollResultsOptionView.swift in Sources */,
12561+
AD4F89D32C666471006DF7E5 /* PollResultsSectionHeaderOptionView.swift in Sources */,
1256212562
40824D0A2A1270BF003B61FD /* VoiceRecordingAttachmentViewInjector.swift in Sources */,
1256312563
ADD738482A8D312B0011FE81 /* ChannelListMessageTimestampFormatter.swift in Sources */,
1256412564
C121EBD72746A1EA00023E4C /* ChatMessageReactions+Types.swift in Sources */,

0 commit comments

Comments
 (0)