From 83e17029fcb80df297c276f4b3900184750512ed Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Thu, 28 Oct 2021 16:04:30 +0400 Subject: [PATCH] Various Fixes --- .../Telegram-iOS/en.lproj/Localizable.strings | 1 + .../CallListUI/Sources/CallListCallItem.swift | 2 +- .../Sources/CallListGroupCallItem.swift | 2 +- .../ChatListFilterSettingsHeaderItem.swift | 2 +- .../ChatListFilterPresetCategoryItem.swift | 2 +- .../ChatListFilterPresetListItem.swift | 2 +- ...hatListFilterPresetListSuggestedItem.swift | 2 +- .../Sources/CreatePollOptionActionItem.swift | 2 +- .../Sources/CreatePollOptionItem.swift | 2 +- .../Sources/CreatePollTextInputItem.swift | 2 +- .../Sources/InviteLinkEditController.swift | 42 ++++++++++++------- .../Sources/InviteLinkHeaderItem.swift | 2 +- .../Sources/ItemListDatePickerItem.swift | 2 +- .../ItemListInviteLinkDateLimitItem.swift | 2 +- .../Sources/ItemListInviteLinkItem.swift | 2 +- .../ItemListInviteLinkUsageLimitItem.swift | 2 +- .../Sources/ItemListInviteRequestItem.swift | 2 +- .../ItemListPermanentInviteLinkItem.swift | 2 +- .../Sources/ItemListAddressItem.swift | 2 +- .../Sources/ItemListAvatarAndNameItem.swift | 2 +- .../Sources/ItemListPeerActionItem.swift | 2 +- .../Sources/ItemListPeerItem.swift | 2 +- .../Sources/ItemListStickerPackItem.swift | 2 +- .../ItemListUI/Sources/ItemListItem.swift | 8 +++- .../Sources/Items/ItemListActionItem.swift | 2 +- .../Sources/Items/ItemListCheckboxItem.swift | 2 +- .../Items/ItemListDisclosureItem.swift | 2 +- .../Sources/Items/ItemListInfoItem.swift | 2 +- .../Items/ItemListMultilineInputItem.swift | 2 +- .../Items/ItemListMultilineTextItem.swift | 2 +- .../Items/ItemListPlaceholderItem.swift | 2 +- .../Items/ItemListSingleLineInputItem.swift | 2 +- .../Sources/Items/ItemListSwitchItem.swift | 2 +- .../Sources/Items/ItemListTextItem.swift | 2 +- .../Sources/ItemListVenueItem.swift | 2 +- .../JoinLinkPreviewPeerContentNode.swift | 5 ++- .../PeerInfoUI/Sources/ChatSlowmodeItem.swift | 2 +- .../Sources/GroupStickerPackCurrentItem.swift | 2 +- .../Sources/ItemListCallListItem.swift | 2 +- .../Sources/ItemListSecretChatKeyItem.swift | 2 +- .../Sources/PeerAutoremoveTimeoutItem.swift | 2 +- .../Sources/PeersNearbyHeaderItem.swift | 2 +- .../AutodownloadDataUsagePickerItem.swift | 2 +- .../AutodownloadSizeLimitItem.swift | 2 +- .../CalculatingCacheSizeItem.swift | 2 +- .../KeepMediaDurationPickerItem.swift | 2 +- .../MaximumCacheSizePickerItem.swift | 2 +- .../ProxySettingsActionItem.swift | 2 +- .../ProxySettingsServerItem.swift | 2 +- .../Data and Storage/StorageUsageItem.swift | 2 +- .../Data and Storage/WebBrowserItem.swift | 2 +- .../LocalizationListItem.swift | 2 +- .../NotificationsCategoryItemListItem.swift | 2 +- .../ForwardPrivacyChatPreviewItem.swift | 2 +- .../ItemListRecentSessionItem.swift | 2 +- .../Recent Sessions/ItemListWebsiteItem.swift | 2 +- .../Search/SettingsSearchResultItem.swift | 2 +- .../Text Size/TextSizeSelectionItem.swift | 2 +- .../Sources/ThemeCarouselItem.swift | 2 +- .../Sources/ThemePickerGridItem.swift | 2 +- .../Themes/ThemeSettingsAccentColorItem.swift | 2 +- .../Themes/ThemeSettingsAppIconItem.swift | 2 +- .../Themes/ThemeSettingsBrightnessItem.swift | 2 +- .../Themes/ThemeSettingsChatPreviewItem.swift | 2 +- .../Themes/ThemeSettingsFontSizeItem.swift | 2 +- .../Themes/ThemeSettingsThemeItem.swift | 2 +- .../Sources/MessageStatsOverviewItem.swift | 2 +- .../StatisticsUI/Sources/StatsGraphItem.swift | 2 +- .../Sources/StatsMessageItem.swift | 2 +- .../Sources/StatsOverviewItem.swift | 2 +- .../Sources/UpdateInfoItem.swift | 2 +- 71 files changed, 105 insertions(+), 85 deletions(-) diff --git a/Telegram/Telegram-iOS/en.lproj/Localizable.strings b/Telegram/Telegram-iOS/en.lproj/Localizable.strings index 219808007c..ad5138b010 100644 --- a/Telegram/Telegram-iOS/en.lproj/Localizable.strings +++ b/Telegram/Telegram-iOS/en.lproj/Localizable.strings @@ -6872,6 +6872,7 @@ Sorry for the inconvenience."; "InviteLink.Create.RequestApprovalOnInfoGroup" = "New users will be able to join the group only after having been approved by the admins."; "InviteLink.Create.RequestApprovalOnInfoChannel" = "New users will be able to join the channel only after having been approved by the admins."; +"InviteLink.Create.LinkNameTitle" = "Link Name"; "InviteLink.Create.LinkName" = "Link Name (Optional)"; "InviteLink.Create.LinkNameInfo" = "Only you and other admins will see this name."; diff --git a/submodules/CallListUI/Sources/CallListCallItem.swift b/submodules/CallListUI/Sources/CallListCallItem.swift index 96dd1dd82e..7dfee591ca 100644 --- a/submodules/CallListUI/Sources/CallListCallItem.swift +++ b/submodules/CallListUI/Sources/CallListCallItem.swift @@ -357,7 +357,7 @@ class CallListCallItemNode: ItemListRevealOptionsItemNode { case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } var dateRightInset: CGFloat = 46.0 + params.rightInset diff --git a/submodules/CallListUI/Sources/CallListGroupCallItem.swift b/submodules/CallListUI/Sources/CallListGroupCallItem.swift index d75d37dbc2..be34a755dc 100644 --- a/submodules/CallListUI/Sources/CallListGroupCallItem.swift +++ b/submodules/CallListUI/Sources/CallListGroupCallItem.swift @@ -309,7 +309,7 @@ class CallListGroupCallItemNode: ItemListRevealOptionsItemNode { case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } var dateRightInset: CGFloat = 46.0 + params.rightInset diff --git a/submodules/ChatListFilterSettingsHeaderItem/Sources/ChatListFilterSettingsHeaderItem.swift b/submodules/ChatListFilterSettingsHeaderItem/Sources/ChatListFilterSettingsHeaderItem.swift index 1e5d6a341d..94c7a057ba 100644 --- a/submodules/ChatListFilterSettingsHeaderItem/Sources/ChatListFilterSettingsHeaderItem.swift +++ b/submodules/ChatListFilterSettingsHeaderItem/Sources/ChatListFilterSettingsHeaderItem.swift @@ -140,7 +140,7 @@ class ChatListFilterSettingsHeaderItemNode: ListViewItemNode { let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: attributedText, backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - params.rightInset - leftInset * 2.0, height: CGFloat.greatestFiniteMagnitude), alignment: .center, cutout: nil, insets: UIEdgeInsets())) let contentSize = CGSize(width: params.width, height: topInset + titleLayout.size.height) - var insets = itemListNeighborsGroupedInsets(neighbors) + var insets = itemListNeighborsGroupedInsets(neighbors, params) if isHidden { insets = UIEdgeInsets() diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift index cd2c1bf445..2717233c4e 100644 --- a/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift @@ -201,7 +201,7 @@ class ChatListFilterPresetCategoryItemNode: ItemListRevealOptionsItemNode, ItemL let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let minHeight: CGFloat = titleLayout.size.height + verticalInset * 2.0 let rawHeight: CGFloat = verticalInset * 2.0 + titleLayout.size.height diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift index 543b89ff79..7fddedcea1 100644 --- a/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift @@ -226,7 +226,7 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN let labelConstrain: CGFloat = params.width - params.rightInset - leftInset - 40.0 - titleLayout.size.width - 10.0 let (labelLayout, labelApply) = makeLabelLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.label, font: titleFont, textColor: item.presentationData.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: labelConstrain, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: titleLayout.size.height + 11.0 * 2.0) let separatorHeight = UIScreenPixel diff --git a/submodules/ChatListUI/Sources/ChatListFilterPresetListSuggestedItem.swift b/submodules/ChatListUI/Sources/ChatListFilterPresetListSuggestedItem.swift index 81bbf9c1ab..bb607df52b 100644 --- a/submodules/ChatListUI/Sources/ChatListFilterPresetListSuggestedItem.swift +++ b/submodules/ChatListUI/Sources/ChatListFilterPresetListSuggestedItem.swift @@ -226,7 +226,7 @@ public class ChatListFilterPresetListSuggestedItemNode: ListViewItemNode, ItemLi itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: height) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/ComposePollUI/Sources/CreatePollOptionActionItem.swift b/submodules/ComposePollUI/Sources/CreatePollOptionActionItem.swift index e7cc231c00..ac848df663 100644 --- a/submodules/ComposePollUI/Sources/CreatePollOptionActionItem.swift +++ b/submodules/ComposePollUI/Sources/CreatePollOptionActionItem.swift @@ -140,7 +140,7 @@ class CreatePollOptionActionItemNode: ListViewItemNode, ItemListItemNode { let separatorHeight = UIScreenPixel - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: 44.0) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/ComposePollUI/Sources/CreatePollOptionItem.swift b/submodules/ComposePollUI/Sources/CreatePollOptionItem.swift index d1af134992..4609c3c173 100644 --- a/submodules/ComposePollUI/Sources/CreatePollOptionItem.swift +++ b/submodules/ComposePollUI/Sources/CreatePollOptionItem.swift @@ -261,7 +261,7 @@ class CreatePollOptionItemNode: ItemListRevealOptionsItemNode, ItemListItemNode, let separatorHeight = UIScreenPixel - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let leftInset: CGFloat = params.leftInset + (item.isSelected != nil ? 60.0 : 16.0) let rightInset: CGFloat = 44.0 + params.rightInset diff --git a/submodules/ComposePollUI/Sources/CreatePollTextInputItem.swift b/submodules/ComposePollUI/Sources/CreatePollTextInputItem.swift index d7e607bf25..430c2a1e9e 100644 --- a/submodules/ComposePollUI/Sources/CreatePollTextInputItem.swift +++ b/submodules/ComposePollUI/Sources/CreatePollTextInputItem.swift @@ -336,7 +336,7 @@ public class CreatePollTextInputItemNode: ListViewItemNode, ASEditableTextNodeDe } let contentSize = CGSize(width: params.width, height: contentHeight) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/InviteLinksUI/Sources/InviteLinkEditController.swift b/submodules/InviteLinksUI/Sources/InviteLinkEditController.swift index 1e2471a502..1569b45fa3 100644 --- a/submodules/InviteLinksUI/Sources/InviteLinkEditController.swift +++ b/submodules/InviteLinksUI/Sources/InviteLinkEditController.swift @@ -70,6 +70,7 @@ func isValidNumberOfUsers(_ number: String) -> Bool { } private enum InviteLinksEditEntry: ItemListNodeEntry { + case titleHeader(PresentationTheme, String) case title(PresentationTheme, String, String) case titleInfo(PresentationTheme, String) @@ -91,7 +92,7 @@ private enum InviteLinksEditEntry: ItemListNodeEntry { var section: ItemListSectionId { switch self { - case .title, .titleInfo: + case .titleHeader, .title, .titleInfo: return InviteLinksEditSection.title.rawValue case .requestApproval, .requestApprovalInfo: return InviteLinksEditSection.requestApproval.rawValue @@ -106,39 +107,47 @@ private enum InviteLinksEditEntry: ItemListNodeEntry { var stableId: Int32 { switch self { - case .title: + case .titleHeader: return 0 - case .titleInfo: + case .title: return 1 - case .requestApproval: + case .titleInfo: return 2 - case .requestApprovalInfo: + case .requestApproval: return 3 - case .timeHeader: + case .requestApprovalInfo: return 4 - case .timePicker: + case .timeHeader: return 5 - case .timeExpiryDate: + case .timePicker: return 6 - case .timeCustomPicker: + case .timeExpiryDate: return 7 - case .timeInfo: + case .timeCustomPicker: return 8 - case .usageHeader: + case .timeInfo: return 9 - case .usagePicker: + case .usageHeader: return 10 - case .usageCustomPicker: + case .usagePicker: return 11 - case .usageInfo: + case .usageCustomPicker: return 12 - case .revoke: + case .usageInfo: return 13 + case .revoke: + return 14 } } static func ==(lhs: InviteLinksEditEntry, rhs: InviteLinksEditEntry) -> Bool { switch lhs { + case let .titleHeader(lhsTheme, lhsText): + if case let .titleHeader(rhsTheme, rhsText) = rhs, lhsTheme === rhsTheme, lhsText == rhsText { + return true + } else { + return false + } case let .title(lhsTheme, lhsPlaceholder, lhsValue): if case let .title(rhsTheme, rhsPlaceholder, rhsValue) = rhs, lhsTheme === rhsTheme, lhsPlaceholder == rhsPlaceholder, lhsValue == rhsValue { return true @@ -233,6 +242,8 @@ private enum InviteLinksEditEntry: ItemListNodeEntry { func item(presentationData: ItemListPresentationData, arguments: Any) -> ListViewItem { let arguments = arguments as! InviteLinkEditControllerArguments switch self { + case let .titleHeader(_, text): + return ItemListSectionHeaderItem(presentationData: presentationData, text: text, sectionId: self.section) case let .title(_, placeholder, value): return ItemListSingleLineInputItem(presentationData: presentationData, title: NSAttributedString(), text: value, placeholder: placeholder, maxLength: 32, sectionId: self.section, textUpdated: { value in arguments.updateState { state in @@ -356,6 +367,7 @@ private enum InviteLinksEditEntry: ItemListNodeEntry { private func inviteLinkEditControllerEntries(invite: ExportedInvitation?, state: InviteLinkEditControllerState, isGroup: Bool, isPublic: Bool, presentationData: PresentationData) -> [InviteLinksEditEntry] { var entries: [InviteLinksEditEntry] = [] + entries.append(.titleHeader(presentationData.theme, presentationData.strings.InviteLink_Create_LinkNameTitle.uppercased())) entries.append(.title(presentationData.theme, presentationData.strings.InviteLink_Create_LinkName, state.title)) entries.append(.titleInfo(presentationData.theme, presentationData.strings.InviteLink_Create_LinkNameInfo)) diff --git a/submodules/InviteLinksUI/Sources/InviteLinkHeaderItem.swift b/submodules/InviteLinksUI/Sources/InviteLinkHeaderItem.swift index b76c282401..98f2b8403a 100644 --- a/submodules/InviteLinksUI/Sources/InviteLinkHeaderItem.swift +++ b/submodules/InviteLinksUI/Sources/InviteLinkHeaderItem.swift @@ -112,7 +112,7 @@ class InviteLinkHeaderItemNode: ListViewItemNode { let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: attributedText, backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - params.rightInset - leftInset * 2.0, height: CGFloat.greatestFiniteMagnitude), alignment: .center, cutout: nil, insets: UIEdgeInsets())) let contentSize = CGSize(width: params.width, height: topInset + titleLayout.size.height) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/InviteLinksUI/Sources/ItemListDatePickerItem.swift b/submodules/InviteLinksUI/Sources/ItemListDatePickerItem.swift index fb9fe12d82..18c0ecab50 100644 --- a/submodules/InviteLinksUI/Sources/ItemListDatePickerItem.swift +++ b/submodules/InviteLinksUI/Sources/ItemListDatePickerItem.swift @@ -138,7 +138,7 @@ public class ItemListDatePickerItemNode: ListViewItemNode, ItemListItemNode { itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: height) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] in diff --git a/submodules/InviteLinksUI/Sources/ItemListInviteLinkDateLimitItem.swift b/submodules/InviteLinksUI/Sources/ItemListInviteLinkDateLimitItem.swift index 01c09d333a..31b1daec09 100644 --- a/submodules/InviteLinksUI/Sources/ItemListInviteLinkDateLimitItem.swift +++ b/submodules/InviteLinksUI/Sources/ItemListInviteLinkDateLimitItem.swift @@ -275,7 +275,7 @@ private final class ItemListInviteLinkTimeLimitItemNode: ListViewItemNode { let (customTextLayout, customTextApply) = makeCustomTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: customTextString, font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets())) contentSize = CGSize(width: params.width, height: 88.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift b/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift index c7b853565f..6e6ee5be55 100644 --- a/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift +++ b/submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift @@ -456,7 +456,7 @@ public class ItemListInviteLinkItemNode: ListViewItemNode, ItemListItemNode { case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let contentSize = CGSize(width: params.width, height: max(minHeight, rawHeight)) diff --git a/submodules/InviteLinksUI/Sources/ItemListInviteLinkUsageLimitItem.swift b/submodules/InviteLinksUI/Sources/ItemListInviteLinkUsageLimitItem.swift index 39d7946bb2..b2e09badf7 100644 --- a/submodules/InviteLinksUI/Sources/ItemListInviteLinkUsageLimitItem.swift +++ b/submodules/InviteLinksUI/Sources/ItemListInviteLinkUsageLimitItem.swift @@ -285,7 +285,7 @@ private final class ItemListInviteLinkUsageLimitItemNode: ListViewItemNode { let (customTextLayout, customTextApply) = makeCustomTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: customTextString, font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets())) contentSize = CGSize(width: params.width, height: 88.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/InviteLinksUI/Sources/ItemListInviteRequestItem.swift b/submodules/InviteLinksUI/Sources/ItemListInviteRequestItem.swift index 6105f8278a..35a0e24e12 100644 --- a/submodules/InviteLinksUI/Sources/ItemListInviteRequestItem.swift +++ b/submodules/InviteLinksUI/Sources/ItemListInviteRequestItem.swift @@ -559,7 +559,7 @@ public class ItemListInviteRequestItemNode: ListViewItemNode, ItemListItemNode { case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let contentSize = CGSize(width: params.width, height: max(minHeight, rawHeight)) diff --git a/submodules/InviteLinksUI/Sources/ItemListPermanentInviteLinkItem.swift b/submodules/InviteLinksUI/Sources/ItemListPermanentInviteLinkItem.swift index c42a6a3d8f..c56be02e22 100644 --- a/submodules/InviteLinksUI/Sources/ItemListPermanentInviteLinkItem.swift +++ b/submodules/InviteLinksUI/Sources/ItemListPermanentInviteLinkItem.swift @@ -338,7 +338,7 @@ public class ItemListPermanentInviteLinkItemNode: ListViewItemNode, ItemListItem case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } if !item.displayImporters { diff --git a/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift b/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift index fca0a1693c..4c32aa20dc 100644 --- a/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift +++ b/submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift @@ -178,7 +178,7 @@ public class ItemListAddressItemNode: ListViewItemNode { case .blocks: itemBackgroundColor = item.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } if !item.displayDecorations { diff --git a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift index b265de796e..c9b365a81b 100644 --- a/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift +++ b/submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift @@ -501,7 +501,7 @@ public class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNo let baseHeight = nameNodeLayout.size.height + nameSpacing + statusNodeLayout.size.height + 30.0 contentSize = CGSize(width: params.width, height: max(baseHeight, verticalInset * 2.0 + 66.0)) if withTopInset || hasCorners { - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } else { let topInset: CGFloat switch neighbors.top { diff --git a/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.swift b/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.swift index 0836eb70e4..b3ce620fd0 100644 --- a/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.swift +++ b/submodules/ItemListPeerActionItem/Sources/ItemListPeerActionItem.swift @@ -191,7 +191,7 @@ class ItemListPeerActionItemNode: ListViewItemNode { let separatorHeight = UIScreenPixel - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: titleLayout.size.height + verticalInset * 2.0) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift index 1d209a662f..ff219bab35 100644 --- a/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift +++ b/submodules/ItemListPeerItem/Sources/ItemListPeerItem.swift @@ -838,7 +838,7 @@ public class ItemListPeerItemNode: ItemListRevealOptionsItemNode, ItemListItemNo let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - editingOffset - rightInset - labelLayout.size.width - labelInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) let (statusLayout, statusApply) = makeStatusLayout(TextNodeLayoutArguments(attributedString: statusAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - editingOffset - rightInset - labelLayout.size.width - labelInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - var insets = itemListNeighborsGroupedInsets(neighbors) + var insets = itemListNeighborsGroupedInsets(neighbors, params) if !item.hasTopGroupInset { switch neighbors.top { case .none: diff --git a/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift b/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift index 733cbccd8d..335a1e2c04 100644 --- a/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift +++ b/submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift @@ -388,7 +388,7 @@ class ItemListStickerPackItemNode: ItemListRevealOptionsItemNode { let verticalInset: CGFloat = 11.0 let titleSpacing: CGFloat = 2.0 - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let separatorHeight = UIScreenPixel var editableControlSizeAndApply: (CGFloat, (CGFloat) -> ItemListEditableControlNode)? diff --git a/submodules/ItemListUI/Sources/ItemListItem.swift b/submodules/ItemListUI/Sources/ItemListItem.swift index b78321db72..5ad5eab690 100644 --- a/submodules/ItemListUI/Sources/ItemListItem.swift +++ b/submodules/ItemListUI/Sources/ItemListItem.swift @@ -120,11 +120,15 @@ public func itemListNeighborsPlainInsets(_ neighbors: ItemListNeighbors) -> UIEd return insets } -public func itemListNeighborsGroupedInsets(_ neighbors: ItemListNeighbors) -> UIEdgeInsets { +public func itemListNeighborsGroupedInsets(_ neighbors: ItemListNeighbors, _ params: ListViewItemLayoutParams) -> UIEdgeInsets { let topInset: CGFloat switch neighbors.top { case .none: - topInset = UIScreenPixel + 35.0 + if itemListHasRoundedBlockLayout(params) { + topInset = UIScreenPixel + 24.0 + } else { + topInset = UIScreenPixel + 35.0 + } case .sameSection: topInset = 0.0 case let .otherSection(otherInset): diff --git a/submodules/ItemListUI/Sources/Items/ItemListActionItem.swift b/submodules/ItemListUI/Sources/Items/ItemListActionItem.swift index 2d18cd7b3f..766f31319f 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListActionItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListActionItem.swift @@ -174,7 +174,7 @@ public class ItemListActionItemNode: ListViewItemNode, ItemListItemNode { itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: titleLayout.size.height + 22.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/ItemListUI/Sources/Items/ItemListCheckboxItem.swift b/submodules/ItemListUI/Sources/Items/ItemListCheckboxItem.swift index 666929fccb..e045763880 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListCheckboxItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListCheckboxItem.swift @@ -151,7 +151,7 @@ public class ItemListCheckboxItemNode: ListViewItemNode { let separatorHeight = UIScreenPixel - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: titleLayout.size.height + 22.0) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift b/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift index cbee3ff80e..728d816f06 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift @@ -330,7 +330,7 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode { itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: height) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift b/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift index ca15e82aa4..059c11d196 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift @@ -226,7 +226,7 @@ public class InfoItemNode: ListViewItemNode { let insets: UIEdgeInsets if let neighbors = neighbors { - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } else { insets = UIEdgeInsets() } diff --git a/submodules/ItemListUI/Sources/Items/ItemListMultilineInputItem.swift b/submodules/ItemListUI/Sources/Items/ItemListMultilineInputItem.swift index 0920cf5f87..e48338135d 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListMultilineInputItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListMultilineInputItem.swift @@ -243,7 +243,7 @@ public class ItemListMultilineInputItemNode: ListViewItemNode, ASEditableTextNod } let contentSize = CGSize(width: params.width, height: contentHeight) - let insets = item.noInsets ? UIEdgeInsets() : itemListNeighborsGroupedInsets(neighbors) + let insets = item.noInsets ? UIEdgeInsets() : itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/ItemListUI/Sources/Items/ItemListMultilineTextItem.swift b/submodules/ItemListUI/Sources/Items/ItemListMultilineTextItem.swift index 2bc29a05c0..98c0e0e6f7 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListMultilineTextItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListMultilineTextItem.swift @@ -211,7 +211,7 @@ public class ItemListMultilineTextItemNode: ListViewItemNode { insets = itemListNeighborsPlainInsets(neighbors) case .blocks: contentSize = CGSize(width: params.width, height: titleLayout.size.height + 22.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/ItemListUI/Sources/Items/ItemListPlaceholderItem.swift b/submodules/ItemListUI/Sources/Items/ItemListPlaceholderItem.swift index 38fead4565..20bb3b4043 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListPlaceholderItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListPlaceholderItem.swift @@ -130,7 +130,7 @@ public class ItemListPlaceholderItemNode: ListViewItemNode, ItemListItemNode { itemBackgroundColor = item.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: height) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } return (ListViewItemNodeLayout(contentSize: contentSize, insets: insets), { [weak self] in diff --git a/submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift b/submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift index 06d03f7063..ea8d8a1aed 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift @@ -251,7 +251,7 @@ public class ItemListSingleLineInputItemNode: ListViewItemNode, UITextFieldDeleg let separatorHeight = UIScreenPixel let contentSize = CGSize(width: params.width, height: max(titleLayout.size.height, measureTitleLayout.size.height) + 22.0) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift b/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift index c236527181..f2cbe56f0f 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift @@ -221,7 +221,7 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode { itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: 44.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } if item.disableLeadingInset { diff --git a/submodules/ItemListUI/Sources/Items/ItemListTextItem.swift b/submodules/ItemListUI/Sources/Items/ItemListTextItem.swift index ce647c65d3..0573004cd9 100644 --- a/submodules/ItemListUI/Sources/Items/ItemListTextItem.swift +++ b/submodules/ItemListUI/Sources/Items/ItemListTextItem.swift @@ -134,7 +134,7 @@ public class ItemListTextItemNode: ListViewItemNode, ItemListItemNode { let contentSize: CGSize - var insets = itemListNeighborsGroupedInsets(neighbors) + var insets = itemListNeighborsGroupedInsets(neighbors, params) if case .large = item.text { insets.top = 14.0 bottomInset = -6.0 diff --git a/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift b/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift index 9788d068b0..ad47572947 100644 --- a/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift +++ b/submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift @@ -253,7 +253,7 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode { case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let contentSize = CGSize(width: params.width, height: max(minHeight, rawHeight)) diff --git a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewPeerContentNode.swift b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewPeerContentNode.swift index da393419ec..1a6c0e9830 100644 --- a/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewPeerContentNode.swift +++ b/submodules/JoinLinkPreviewUI/Sources/JoinLinkPreviewPeerContentNode.swift @@ -95,7 +95,10 @@ final class JoinLinkPreviewPeerContentNode: ASDisplayNode, ShareContentContainer let itemTheme = SelectablePeerNodeTheme(textColor: theme.actionSheet.primaryTextColor, secretTextColor: .green, selectedTextColor: theme.actionSheet.controlAccentColor, checkBackgroundColor: theme.actionSheet.opaqueItemBackgroundColor, checkFillColor: theme.actionSheet.controlAccentColor, checkColor: theme.actionSheet.opaqueItemBackgroundColor, avatarPlaceholderColor: theme.list.mediaPlaceholderColor) if case let .invite(isGroup, _, _, memberCount, members) = content { - self.peerNodes = members.map { peer in + self.peerNodes = members.compactMap { peer in + guard peer.id != context.account.peerId else { + return nil + } let node = SelectablePeerNode() node.setup(context: context, theme: theme, strings: strings, peer: EngineRenderedPeer(peer: peer), synchronousLoad: false) node.theme = itemTheme diff --git a/submodules/PeerInfoUI/Sources/ChatSlowmodeItem.swift b/submodules/PeerInfoUI/Sources/ChatSlowmodeItem.swift index 51db3420b1..c196645e1a 100644 --- a/submodules/PeerInfoUI/Sources/ChatSlowmodeItem.swift +++ b/submodules/PeerInfoUI/Sources/ChatSlowmodeItem.swift @@ -198,7 +198,7 @@ class ChatSlowmodeItemNode: ListViewItemNode { } contentSize = CGSize(width: params.width, height: 88.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/PeerInfoUI/Sources/GroupStickerPackCurrentItem.swift b/submodules/PeerInfoUI/Sources/GroupStickerPackCurrentItem.swift index a793692dde..46ce2f6f9d 100644 --- a/submodules/PeerInfoUI/Sources/GroupStickerPackCurrentItem.swift +++ b/submodules/PeerInfoUI/Sources/GroupStickerPackCurrentItem.swift @@ -208,7 +208,7 @@ class GroupStickerPackCurrentItemNode: ItemListRevealOptionsItemNode { let leftInset: CGFloat = 65.0 + params.leftInset - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: 59.0) let separatorHeight = UIScreenPixel diff --git a/submodules/PeerInfoUI/Sources/ItemListCallListItem.swift b/submodules/PeerInfoUI/Sources/ItemListCallListItem.swift index ebc3b19887..2e02353f11 100644 --- a/submodules/PeerInfoUI/Sources/ItemListCallListItem.swift +++ b/submodules/PeerInfoUI/Sources/ItemListCallListItem.swift @@ -225,7 +225,7 @@ public class ItemListCallListItemNode: ListViewItemNode { case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } if !item.displayDecorations { diff --git a/submodules/PeerInfoUI/Sources/ItemListSecretChatKeyItem.swift b/submodules/PeerInfoUI/Sources/ItemListSecretChatKeyItem.swift index c4d4c86e1f..8cabf9bccb 100644 --- a/submodules/PeerInfoUI/Sources/ItemListSecretChatKeyItem.swift +++ b/submodules/PeerInfoUI/Sources/ItemListSecretChatKeyItem.swift @@ -187,7 +187,7 @@ class ItemListSecretChatKeyItemNode: ListViewItemNode { itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: 22.0 + titleLayout.size.height) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/PeerInfoUI/Sources/PeerAutoremoveTimeoutItem.swift b/submodules/PeerInfoUI/Sources/PeerAutoremoveTimeoutItem.swift index 758f6dbb83..2d1d00b00c 100644 --- a/submodules/PeerInfoUI/Sources/PeerAutoremoveTimeoutItem.swift +++ b/submodules/PeerInfoUI/Sources/PeerAutoremoveTimeoutItem.swift @@ -192,7 +192,7 @@ class PeerRemoveTimeoutItemNode: ListViewItemNode, ItemListItemNode { } contentSize = CGSize(width: params.width, height: 88.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/PeersNearbyUI/Sources/PeersNearbyHeaderItem.swift b/submodules/PeersNearbyUI/Sources/PeersNearbyHeaderItem.swift index cf15453d83..a43632cf91 100644 --- a/submodules/PeersNearbyUI/Sources/PeersNearbyHeaderItem.swift +++ b/submodules/PeersNearbyUI/Sources/PeersNearbyHeaderItem.swift @@ -93,7 +93,7 @@ class PeersNearbyHeaderItemNode: ListViewItemNode { let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: attributedText, backgroundColor: nil, maximumNumberOfLines: 0, truncationType: .end, constrainedSize: CGSize(width: params.width - params.rightInset - leftInset * 2.0, height: CGFloat.greatestFiniteMagnitude), alignment: .center, cutout: nil, insets: UIEdgeInsets())) let contentSize = CGSize(width: params.width, height: topInset + titleLayout.size.height) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift index 4d3d6fe819..055c56d170 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift @@ -226,7 +226,7 @@ private final class AutodownloadDataUsagePickerItemNode: ListViewItemNode { let (customTextLayout, customTextApply) = makeCustomTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.strings.AutoDownloadSettings_DataUsageCustom, font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets())) contentSize = CGSize(width: params.width, height: 88.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift index f71fa13043..1ea9c5e2ca 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift @@ -200,7 +200,7 @@ private final class AutodownloadSizeLimitItemNode: ListViewItemNode { let (maxTextLayout, maxTextApply) = makeMaxTextLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: dataSizeString(1536 * 1024 * 1024, formatting: formatting), font: Font.regular(13.0), textColor: item.theme.list.itemSecondaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width, height: CGFloat.greatestFiniteMagnitude), alignment: .center, lineSpacing: 0.0, cutout: nil, insets: UIEdgeInsets())) contentSize = CGSize(width: params.width, height: 88.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift b/submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift index f157ff5893..2c3a87a1f5 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift @@ -125,7 +125,7 @@ private final class CalculatingCacheSizeItemNode: ListViewItemNode { itemBackgroundColor = item.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: titleLayout.size.height + 22.0 + 24.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift index cb8cbe0aff..8afae27390 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift @@ -186,7 +186,7 @@ private final class KeepMediaDurationPickerItemNode: ListViewItemNode { } contentSize = CGSize(width: params.width, height: 88.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift index 6fd3cbf310..d3cd145fe9 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift @@ -201,7 +201,7 @@ private final class MaximumCacheSizePickerItemNode: ListViewItemNode { } contentSize = CGSize(width: params.width, height: 88.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift index 6f7f78f52f..ab7c94465f 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift @@ -141,7 +141,7 @@ private final class ProxySettingsActionItemNode: ListViewItemNode { let separatorHeight = UIScreenPixel - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: 22.0 + titleLayout.size.height) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift index 8dd03be9db..94f93f6af3 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift @@ -265,7 +265,7 @@ private final class ProxySettingsServerItemNode: ItemListRevealOptionsItemNode { let (titleLayout, titleApply) = makeTitleLayout(TextNodeLayoutArguments(attributedString: titleAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .middle, constrainedSize: CGSize(width: params.width - leftInset - 12.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) let (statusLayout, statusApply) = makeStatusLayout(TextNodeLayoutArguments(attributedString: statusAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: 64.0) let separatorHeight = UIScreenPixel diff --git a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift index 509ce14b4c..ffeff3a82d 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift @@ -203,7 +203,7 @@ private final class StorageUsageItemNode: ListViewItemNode { } contentSize = CGSize(width: params.width, height: textOrigin.y + 34.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift b/submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift index 578c9f9718..0b519a7ae3 100644 --- a/submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift +++ b/submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift @@ -161,7 +161,7 @@ private final class WebBrowserItemNode: ListViewItemNode { let separatorHeight = UIScreenPixel - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: 22.0 + titleLayout.size.height) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift b/submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift index ba852bc7ef..d9a6e078f3 100644 --- a/submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift +++ b/submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift @@ -199,7 +199,7 @@ class LocalizationListItemNode: ItemListRevealOptionsItemNode { let (subtitleLayout, subtitleApply) = makeSubtitleLayout(TextNodeLayoutArguments(attributedString: NSAttributedString(string: item.subtitle, font: subtitleFont, textColor: item.presentationData.theme.list.itemPrimaryTextColor), backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 50.0, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: titleLayout.size.height + 1.0 + subtitleLayout.size.height + 8.0 * 2.0) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/SettingsUI/Sources/Notifications/NotificationsCategoryItemListItem.swift b/submodules/SettingsUI/Sources/Notifications/NotificationsCategoryItemListItem.swift index 011be80fb6..2f589eba59 100644 --- a/submodules/SettingsUI/Sources/Notifications/NotificationsCategoryItemListItem.swift +++ b/submodules/SettingsUI/Sources/Notifications/NotificationsCategoryItemListItem.swift @@ -235,7 +235,7 @@ public class NotificationsCategoryItemListItemNode: ListViewItemNode, ItemListIt itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: height) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift b/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift index e9413858f4..f9acade286 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift @@ -174,7 +174,7 @@ class ForwardPrivacyChatPreviewItemNode: ListViewItemNode { if let node = node { contentSize.height += node.frame.size.height } - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListRecentSessionItem.swift b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListRecentSessionItem.swift index e067f4438d..1e3473f102 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListRecentSessionItem.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListRecentSessionItem.swift @@ -330,7 +330,7 @@ class ItemListRecentSessionItemNode: ItemListRevealOptionsItemNode { let (appLayout, appApply) = makeAppLayout(TextNodeLayoutArguments(attributedString: appAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) let (locationLayout, locationApply) = makeLocationLayout(TextNodeLayoutArguments(attributedString: locationAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: verticalInset * 2.0 + titleLayout.size.height + titleSpacing + appLayout.size.height + textSpacing + locationLayout.size.height) let separatorHeight = UIScreenPixel diff --git a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift index 13e6d8353e..fa3c120856 100644 --- a/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift +++ b/submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift @@ -260,7 +260,7 @@ class ItemListWebsiteItemNode: ItemListRevealOptionsItemNode { let (appLayout, appApply) = makeAppLayout(TextNodeLayoutArguments(attributedString: appAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) let (locationLayout, locationApply) = makeLocationLayout(TextNodeLayoutArguments(attributedString: locationAttributedString, backgroundColor: nil, maximumNumberOfLines: 1, truncationType: .end, constrainedSize: CGSize(width: params.width - leftInset - 8.0 - editingOffset - rightInset, height: CGFloat.greatestFiniteMagnitude), alignment: .natural, cutout: nil, insets: UIEdgeInsets())) - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) let contentSize = CGSize(width: params.width, height: 75.0) let separatorHeight = UIScreenPixel diff --git a/submodules/SettingsUI/Sources/Search/SettingsSearchResultItem.swift b/submodules/SettingsUI/Sources/Search/SettingsSearchResultItem.swift index 0e034ae597..88f0a929c1 100644 --- a/submodules/SettingsUI/Sources/Search/SettingsSearchResultItem.swift +++ b/submodules/SettingsUI/Sources/Search/SettingsSearchResultItem.swift @@ -134,7 +134,7 @@ class SettingsSearchResultItemNode: ListViewItemNode { var leftInset: CGFloat = params.leftInset let contentInset: CGFloat = 58.0 - let insets = itemListNeighborsGroupedInsets(neighbors) + let insets = itemListNeighborsGroupedInsets(neighbors, params) leftInset += contentInset diff --git a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift index 9966899b13..e11d1b0a1e 100644 --- a/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift +++ b/submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift @@ -172,7 +172,7 @@ class BubbleSettingsRadiusItemNode: ListViewItemNode, ItemListItemNode { let separatorHeight = UIScreenPixel contentSize = CGSize(width: params.width, height: 60.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) if item.disableLeadingInset { insets.top = 0.0 diff --git a/submodules/SettingsUI/Sources/ThemeCarouselItem.swift b/submodules/SettingsUI/Sources/ThemeCarouselItem.swift index b27f71b79a..bd094bca89 100644 --- a/submodules/SettingsUI/Sources/ThemeCarouselItem.swift +++ b/submodules/SettingsUI/Sources/ThemeCarouselItem.swift @@ -687,7 +687,7 @@ class ThemeCarouselThemeItemNode: ListViewItemNode, ItemListItemNode { let separatorHeight = UIScreenPixel contentSize = CGSize(width: params.width, height: 133.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/ThemePickerGridItem.swift b/submodules/SettingsUI/Sources/ThemePickerGridItem.swift index bfd94ce674..1b1dd27080 100644 --- a/submodules/SettingsUI/Sources/ThemePickerGridItem.swift +++ b/submodules/SettingsUI/Sources/ThemePickerGridItem.swift @@ -432,7 +432,7 @@ class ThemeGridThemeItemNode: ListViewItemNode, ItemListItemNode { let rows = ceil(CGFloat(item.themes.count) / CGFloat(imageCount)) contentSize = CGSize(width: params.width, height: minSpacing + rows * (itemSize.height + itemSpacing)) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift index e2f75b6ffd..a4fd6b4958 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift @@ -786,7 +786,7 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode { let separatorHeight = UIScreenPixel contentSize = CGSize(width: params.width, height: 60.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift index 2024b3ba73..01f2db1fdb 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift @@ -212,7 +212,7 @@ class ThemeSettingsAppIconItemNode: ListViewItemNode, ItemListItemNode { let separatorHeight = UIScreenPixel contentSize = CGSize(width: params.width, height: 116.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift index c17bc7199a..5525cb6019 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift @@ -141,7 +141,7 @@ class ThemeSettingsBrightnessItemNode: ListViewItemNode { let separatorHeight = UIScreenPixel contentSize = CGSize(width: params.width, height: 60.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift index f1fa0b89e8..464280933b 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift @@ -199,7 +199,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode { for node in nodes { contentSize.height += node.frame.size.height } - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift index d2093790ce..17e2b12ea4 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift @@ -187,7 +187,7 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode { let separatorHeight = UIScreenPixel contentSize = CGSize(width: params.width, height: 60.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) if item.disableLeadingInset { insets.top = 0.0 diff --git a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift index 0d4e951c76..9d69241255 100644 --- a/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift +++ b/submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift @@ -541,7 +541,7 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode { let separatorHeight = UIScreenPixel contentSize = CGSize(width: params.width, height: 116.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) let layoutSize = layout.size diff --git a/submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift b/submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift index 51de36f047..5328dd1e69 100644 --- a/submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift +++ b/submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift @@ -147,7 +147,7 @@ class MessageStatsOverviewItemNode: ListViewItemNode { case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let valueFont = Font.semibold(item.presentationData.fontSize.itemListBaseFontSize) diff --git a/submodules/StatisticsUI/Sources/StatsGraphItem.swift b/submodules/StatisticsUI/Sources/StatsGraphItem.swift index 46404eb5c0..c4ac0a910f 100644 --- a/submodules/StatisticsUI/Sources/StatsGraphItem.swift +++ b/submodules/StatisticsUI/Sources/StatsGraphItem.swift @@ -159,7 +159,7 @@ class StatsGraphItemNode: ListViewItemNode { itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: 361.0) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } var visibilityHeight = currentVisibilityHeight diff --git a/submodules/StatisticsUI/Sources/StatsMessageItem.swift b/submodules/StatisticsUI/Sources/StatsMessageItem.swift index eaee3b6b98..b66d265937 100644 --- a/submodules/StatisticsUI/Sources/StatsMessageItem.swift +++ b/submodules/StatisticsUI/Sources/StatsMessageItem.swift @@ -311,7 +311,7 @@ public class StatsMessageItemNode: ListViewItemNode, ItemListItemNode { itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor contentSize = CGSize(width: params.width, height: height) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets) diff --git a/submodules/StatisticsUI/Sources/StatsOverviewItem.swift b/submodules/StatisticsUI/Sources/StatsOverviewItem.swift index 6687feacf8..54e04dc712 100644 --- a/submodules/StatisticsUI/Sources/StatsOverviewItem.swift +++ b/submodules/StatisticsUI/Sources/StatsOverviewItem.swift @@ -187,7 +187,7 @@ class StatsOverviewItemNode: ListViewItemNode { case .blocks: itemBackgroundColor = item.presentationData.theme.list.itemBlocksBackgroundColor itemSeparatorColor = item.presentationData.theme.list.itemBlocksSeparatorColor - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let valueFont = Font.semibold(item.presentationData.fontSize.itemListBaseFontSize) diff --git a/submodules/TelegramUpdateUI/Sources/UpdateInfoItem.swift b/submodules/TelegramUpdateUI/Sources/UpdateInfoItem.swift index 9a721a8bc1..29e8fd0d0d 100644 --- a/submodules/TelegramUpdateUI/Sources/UpdateInfoItem.swift +++ b/submodules/TelegramUpdateUI/Sources/UpdateInfoItem.swift @@ -225,7 +225,7 @@ class UpdateInfoItemNode: ListViewItemNode { insets = itemListNeighborsPlainInsets(neighbors) case .blocks: contentSize = CGSize(width: params.width, height: 88.0 + textLayout.size.height + inset) - insets = itemListNeighborsGroupedInsets(neighbors) + insets = itemListNeighborsGroupedInsets(neighbors, params) } let layout = ListViewItemNodeLayout(contentSize: contentSize, insets: insets)