ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '449d2abf1d9b41f5f7cfd4fee7b75843f18242f3'

Browse Source
This commit is contained in:
Ali 2022-01-13 21:05:27 +04:00
commit b9831396f8
63 changed files with 84 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
submodules/BotPaymentsUI/Sources/BotCheckoutHeaderItem.swift
View File

@ -237,7 +237,7 @@ class BotCheckoutHeaderItemNode: ListViewItemNode {
}
switch neighbors.bottom {
case .sameSection(false):
break
strongSelf.bottomStripeNode.isHidden = false
default:
hasBottomCorners = true
strongSelf.bottomStripeNode.isHidden = hasCorners

1
submodules/CallListUI/Sources/CallListCallItem.swift
View File

@ -595,6 +595,7 @@ class CallListCallItemNode: ItemListRevealOptionsItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

2
submodules/ChatInterfaceState/Sources/ChatInterfaceState.swift
View File

@ -274,7 +274,7 @@ public final class ChatInterfaceState: Codable, Equatable {
public let inputLanguage: String?
public var synchronizeableInputState: SynchronizeableChatInputState? {
if self.composeInputState.inputText.length == 0 {
if self.composeInputState.inputText.string.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && self.replyMessageId == nil {
return nil
} else {
return SynchronizeableChatInputState(replyToMessageId: self.replyMessageId, text: self.composeInputState.inputText.string, entities: generateChatInputTextEntities(self.composeInputState.inputText), timestamp: self.timestamp, textSelection: self.composeInputState.selectionRange)

1
submodules/ChatListUI/Sources/ChatListFilterPresetCategoryItem.swift
View File

@ -332,6 +332,7 @@ class ChatListFilterPresetCategoryItemNode: ItemListRevealOptionsItemNode, ItemL
case .sameSection(false):
bottomStripeInset = leftInset + editingOffset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/ChatListUI/Sources/ChatListFilterPresetListItem.swift
View File

@ -343,6 +343,7 @@ private final class ChatListFilterPresetListItemNode: ItemListRevealOptionsItemN
case .sameSection(false):
bottomStripeInset = leftInset + editingOffset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/ChatListUI/Sources/ChatListFilterPresetListSuggestedItem.swift
View File

@ -294,6 +294,7 @@ public class ChatListFilterPresetListSuggestedItemNode: ListViewItemNode, ItemLi
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ComposePollUI/Sources/CreatePollOptionActionItem.swift
View File

@ -203,6 +203,7 @@ class CreatePollOptionActionItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = leftInset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/ComposePollUI/Sources/CreatePollTextInputItem.swift
View File

@ -416,6 +416,7 @@ public class CreatePollTextInputItemNode: ListViewItemNode, ASEditableTextNodeDe
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

13
submodules/Display/Source/TextNode.swift
View File

@ -208,7 +208,13 @@ public final class TextNodeLayout: NSObject {
hasRTL = true
}
let lineFrame = displayLineFrame(frame: line.frame, isRTL: line.isRTL, boundingRect: CGRect(origin: CGPoint(), size: size), cutout: cutout)
let lineFrame: CGRect
switch self.resolvedAlignment {
case .center:
lineFrame = CGRect(origin: CGPoint(x: floor((size.width - line.frame.size.width) / 2.0), y: line.frame.minY), size: line.frame.size)
default:
lineFrame = displayLineFrame(frame: line.frame, isRTL: line.isRTL, boundingRect: CGRect(origin: CGPoint(), size: size), cutout: cutout)
}
spoilers.append(contentsOf: line.spoilers.map { ( $0.range, $0.frame.offsetBy(dx: lineFrame.minX, dy: lineFrame.minY)) })
spoilerWords.append(contentsOf: line.spoilerWords.map { ( $0.range, $0.frame.offsetBy(dx: lineFrame.minX, dy: lineFrame.minY)) })
@ -1073,7 +1079,6 @@ public class TextNode: ASDisplayNode {
break
}
}
// brokenLineRange.length = CTLineGetGlyphCount(coreTextLine) - 1
if brokenLineRange.location + brokenLineRange.length > attributedString.length {
brokenLineRange.length = attributedString.length - brokenLineRange.location
}
@ -1338,7 +1343,7 @@ public class TextNode: ASDisplayNode {
context.saveGState()
var clipRects: [CGRect] = []
for spoiler in line.spoilerWords {
var spoilerClipRect = spoiler.frame.offsetBy(dx: lineFrame.minX, dy: lineFrame.minY)
var spoilerClipRect = spoiler.frame.offsetBy(dx: lineFrame.minX, dy: lineFrame.minY - UIScreenPixel)
spoilerClipRect.size.height += 1.0 + UIScreenPixel
clipRects.append(spoilerClipRect)
}
@ -1375,7 +1380,7 @@ public class TextNode: ASDisplayNode {
context.restoreGState()
} else {
for spoiler in line.spoilerWords {
var spoilerClearRect = spoiler.frame.offsetBy(dx: lineFrame.minX, dy: lineFrame.minY)
var spoilerClearRect = spoiler.frame.offsetBy(dx: lineFrame.minX, dy: lineFrame.minY - UIScreenPixel)
spoilerClearRect.size.height += 1.0 + UIScreenPixel
clearRects.append(spoilerClearRect)
}

3
submodules/InvisibleInkDustNode/Sources/InvisibleInkDustNode.swift
View File

@ -122,7 +122,6 @@ public class InvisibleInkDustNode: ASDisplayNode {
emitterLayer.emitterSize = CGSize(width: 1, height: 1)
emitterLayer.emitterShape = CAEmitterLayerEmitterShape(rawValue: "rectangles")
emitterLayer.setValue(behaviors, forKey: "emitterBehaviors")
// emitterLayer.setValue(0.0322, forKey: "updateInterval")
emitterLayer.setValue(4.0, forKeyPath: "emitterBehaviors.fingerAttractor.stiffness")
emitterLayer.setValue(false, forKeyPath: "emitterBehaviors.fingerAttractor.enabled")
@ -188,7 +187,7 @@ public class InvisibleInkDustNode: ASDisplayNode {
var scaleAddition = maxFactor * 4.0
var durationAddition = -maxFactor * 0.2
if self.emitterNode.frame.height > 0.0, self.emitterNode.frame.width / self.emitterNode.frame.height < 0.3 {
if self.emitterNode.frame.height > 0.0, self.emitterNode.frame.width / self.emitterNode.frame.height < 0.7 {
scaleAddition *= 5.0
durationAddition *= 2.0
}

1
submodules/InviteLinksUI/Sources/ItemListDatePickerItem.swift
View File

@ -196,6 +196,7 @@ public class ItemListDatePickerItemNode: ListViewItemNode, ItemListItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/InviteLinksUI/Sources/ItemListInviteLinkDateLimitItem.swift
View File

@ -318,6 +318,7 @@ private final class ItemListInviteLinkTimeLimitItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0 //params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/InviteLinksUI/Sources/ItemListInviteLinkItem.swift
View File

@ -558,6 +558,7 @@ public class ItemListInviteLinkItemNode: ListViewItemNode, ItemListItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/InviteLinksUI/Sources/ItemListInviteLinkUsageLimitItem.swift
View File

@ -328,6 +328,7 @@ private final class ItemListInviteLinkUsageLimitItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0 //params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/InviteLinksUI/Sources/ItemListInviteRequestItem.swift
View File

@ -713,6 +713,7 @@ public class ItemListInviteRequestItemNode: ListViewItemNode, ItemListItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/InviteLinksUI/Sources/ItemListPermanentInviteLinkItem.swift
View File

@ -416,6 +416,7 @@ public class ItemListPermanentInviteLinkItemNode: ListViewItemNode, ItemListItem
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ItemListAddressItem/Sources/ItemListAddressItem.swift
View File

@ -327,6 +327,7 @@ public class ItemListAddressItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 16.0 + params.leftInset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/ItemListAvatarAndNameInfoItem/Sources/ItemListAvatarAndNameItem.swift
View File

@ -627,6 +627,7 @@ public class ItemListAvatarAndNameInfoItemNode: ListViewItemNode, ItemListItemNo
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ItemListStickerPackItem/Sources/ItemListStickerPackItem.swift
View File

@ -715,6 +715,7 @@ class ItemListStickerPackItemNode: ItemListRevealOptionsItemNode {
case .sameSection(false):
bottomStripeInset = leftInset + editingOffset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/ItemListUI/Sources/Items/ItemListActionItem.swift
View File

@ -251,6 +251,7 @@ public class ItemListActionItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = 16.0 + params.leftInset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/ItemListUI/Sources/Items/ItemListCheckboxItem.swift
View File

@ -253,6 +253,7 @@ public class ItemListCheckboxItemNode: ListViewItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ItemListUI/Sources/Items/ItemListDisclosureItem.swift
View File

@ -429,6 +429,7 @@ public class ItemListDisclosureItemNode: ListViewItemNode, ItemListItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ItemListUI/Sources/Items/ItemListInfoItem.swift
View File

@ -311,6 +311,7 @@ public class InfoItemNode: ListViewItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ItemListUI/Sources/Items/ItemListMultilineInputItem.swift
View File

@ -319,6 +319,7 @@ public class ItemListMultilineInputItemNode: ListViewItemNode, ASEditableTextNod
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ItemListUI/Sources/Items/ItemListMultilineTextItem.swift
View File

@ -279,6 +279,7 @@ public class ItemListMultilineTextItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/ItemListUI/Sources/Items/ItemListSingleLineInputItem.swift
View File

@ -399,6 +399,7 @@ public class ItemListSingleLineInputItemNode: ListViewItemNode, UITextFieldDeleg
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ItemListUI/Sources/Items/ItemListSwitchItem.swift
View File

@ -346,6 +346,7 @@ public class ItemListSwitchItemNode: ListViewItemNode, ItemListItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = 16.0 + params.leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/ItemListUI/Sources/Items/ItemListTextWithLabelItem.swift
View File

@ -325,6 +325,7 @@ public class ItemListTextWithLabelItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 16.0 + params.leftInset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/ItemListVenueItem/Sources/ItemListVenueItem.swift
View File

@ -344,6 +344,7 @@ public class ItemListVenueItemNode: ListViewItemNode, ItemListItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/PeerInfoUI/Sources/ChatSlowmodeItem.swift
View File

@ -240,6 +240,7 @@ class ChatSlowmodeItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/PeerInfoUI/Sources/ItemListReactionItem.swift
View File

@ -343,6 +343,7 @@ public class ItemListReactionItemNode: ListViewItemNode, ItemListItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = 16.0 + params.leftInset + sideImageInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/PeerInfoUI/Sources/PeerAutoremoveTimeoutItem.swift
View File

@ -242,6 +242,7 @@ class PeerRemoveTimeoutItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/AutodownloadDataUsagePickerItem.swift
View File

@ -269,6 +269,7 @@ private final class AutodownloadDataUsagePickerItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0 //params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/AutodownloadSizeLimitItem.swift
View File

@ -243,6 +243,7 @@ private final class AutodownloadSizeLimitItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/CalculatingCacheSizeItem.swift
View File

@ -201,6 +201,7 @@ private final class CalculatingCacheSizeItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 16.0 + params.leftInset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/KeepMediaDurationPickerItem.swift
View File

@ -229,6 +229,7 @@ private final class KeepMediaDurationPickerItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/MaximumCacheSizePickerItem.swift
View File

@ -244,6 +244,7 @@ private final class MaximumCacheSizePickerItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/ProxySettingsActionItem.swift
View File

@ -206,6 +206,7 @@ private final class ProxySettingsActionItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = leftInset + editingOffset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/ProxySettingsServerItem.swift
View File

@ -389,6 +389,7 @@ private final class ProxySettingsServerItemNode: ItemListRevealOptionsItemNode {
case .sameSection(false):
bottomStripeInset = leftInset + editingOffset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/StorageUsageItem.swift
View File

@ -254,6 +254,7 @@ private final class StorageUsageItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Data and Storage/WebBrowserItem.swift
View File

@ -237,6 +237,7 @@ private final class WebBrowserItemNode: ListViewItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/SettingsUI/Sources/Language Selection/LocalizationListItem.swift
View File

@ -307,6 +307,7 @@ class LocalizationListItemNode: ItemListRevealOptionsItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/SettingsUI/Sources/Notifications/NotificationsCategoryItemListItem.swift
View File

@ -325,6 +325,7 @@ public class NotificationsCategoryItemListItemNode: ListViewItemNode, ItemListIt
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/SettingsUI/Sources/Privacy and Security/ForwardPrivacyChatPreviewItem.swift
View File

@ -252,6 +252,7 @@ class ForwardPrivacyChatPreviewItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Privacy and Security/Recent Sessions/ItemListWebsiteItem.swift
View File

@ -388,6 +388,7 @@ class ItemListWebsiteItemNode: ItemListRevealOptionsItemNode {
case .sameSection(false):
bottomStripeInset = leftInset + editingOffset
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Reactions/ReactionChatPreviewItem.swift
View File

@ -306,6 +306,7 @@ class ReactionChatPreviewItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Text Size/TextSizeSelectionItem.swift
View File

@ -232,6 +232,7 @@ class BubbleSettingsRadiusItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/ThemeCarouselItem.swift
View File

@ -729,6 +729,7 @@ class ThemeCarouselThemeItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/ThemePickerGridItem.swift
View File

@ -479,6 +479,7 @@ class ThemeGridThemeItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Themes/ThemeSettingsAccentColorItem.swift
View File

@ -833,6 +833,7 @@ class ThemeSettingsAccentColorItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Themes/ThemeSettingsAppIconItem.swift
View File

@ -256,6 +256,7 @@ class ThemeSettingsAppIconItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Themes/ThemeSettingsBrightnessItem.swift
View File

@ -184,6 +184,7 @@ class ThemeSettingsBrightnessItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Themes/ThemeSettingsChatPreviewItem.swift
View File

@ -254,6 +254,7 @@ class ThemeSettingsChatPreviewItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 0.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Themes/ThemeSettingsFontSizeItem.swift
View File

@ -241,6 +241,7 @@ class ThemeSettingsFontSizeItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

1
submodules/SettingsUI/Sources/Themes/ThemeSettingsThemeItem.swift
View File

@ -586,6 +586,7 @@ class ThemeSettingsThemeItemNode: ListViewItemNode, ItemListItemNode {
case .sameSection(false):
bottomStripeInset = params.leftInset + 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0

12
submodules/ShareController/Sources/ShareController.swift
View File

@ -672,7 +672,7 @@ public final class ShareController: ViewController {
subject = selectedValue.subject
}
var messageUrl: String?
var messagesToShare: [Message]?
// var messagesToShare: [Message]?
switch subject {
case let .url(text):
collectableItems.append(CollectableExternalShareItem(url: explicitUrl(text), text: "", author: nil, timestamp: nil, mediaReference: nil))
@ -689,7 +689,7 @@ public final class ShareController: ViewController {
let latLong = "\(media.latitude),\(media.longitude)"
collectableItems.append(CollectableExternalShareItem(url: "https://maps.apple.com/maps?ll=\(latLong)&q=\(latLong)&t=m", text: "", author: nil, timestamp: nil, mediaReference: nil))
case let .messages(messages):
messagesToShare = messages
// messagesToShare = messages
for message in messages {
var url: String?
var selectedMedia: Media?
@ -779,16 +779,16 @@ public final class ShareController: ViewController {
|> filter { $0 }
|> take(1)
|> deliverOnMainQueue).start(next: { [weak self] _ in
if asImage, let messages = messagesToShare {
self?.openShareAsImage?(messages)
} else {
// if asImage, let messages = messagesToShare {
// self?.openShareAsImage?(messages)
// } else {
let activityController = UIActivityViewController(activityItems: activityItems, applicationActivities: activities)
if let strongSelf = self, let window = strongSelf.view.window, let rootViewController = window.rootViewController {
activityController.popoverPresentationController?.sourceView = window
activityController.popoverPresentationController?.sourceRect = CGRect(origin: CGPoint(x: window.bounds.width / 2.0, y: window.bounds.size.height - 1.0), size: CGSize(width: 1.0, height: 1.0))
rootViewController.present(activityController, animated: true, completion: nil)
}
}
// }
})
}
return .done

1
submodules/StatisticsUI/Sources/MessageStatsOverviewItem.swift
View File

@ -236,6 +236,7 @@ class MessageStatsOverviewItemNode: ListViewItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/StatisticsUI/Sources/StatsGraphItem.swift
View File

@ -238,6 +238,7 @@ class StatsGraphItemNode: ListViewItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/StatisticsUI/Sources/StatsMessageItem.swift
View File

@ -428,6 +428,7 @@ public class StatsMessageItemNode: ListViewItemNode, ItemListItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

1
submodules/StatisticsUI/Sources/StatsOverviewItem.swift
View File

@ -422,6 +422,7 @@ class StatsOverviewItemNode: ListViewItemNode {
switch neighbors.bottom {
case .sameSection(false):
bottomStripeInset = leftInset
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
hasBottomCorners = true

15
submodules/TelegramStringFormatting/Sources/ServiceMessageStrings.swift
View File

@ -252,17 +252,22 @@ public func universalServiceMessageString(presentationData: (PresentationTheme,
}
let string = textWithRanges._tuple.0
let stringLength = (clippedText as NSString).length
let stringLength = (string as NSString).length
let messageLength = (clippedText as NSString).length
var ranges = textWithRanges._tuple.1
let entityOffset = ranges.first(where: { $0.0 == 1 })?.1.location ?? 0
var attributes = peerMentionsAttributes(primaryTextColor: primaryTextColor, peerIds: [(0, message.author?.id)])
for entity in entities {
if entity.range.startIndex >= stringLength {
if entity.range.startIndex >= messageLength {
continue
}
let index = ranges.count
ranges.append((ranges.count, NSRange(location: entityOffset + entity.range.startIndex, length: entity.range.count)))
attributes[index] = spoilerAttributes(primaryTextColor: primaryTextColor)
let location = entityOffset + entity.range.startIndex
let length = max(0, min(entity.range.count, stringLength - location - 1))
if length > 0 {
let index = ranges.count
ranges.append((ranges.count, NSRange(location: location, length: length)))
attributes[index] = spoilerAttributes(primaryTextColor: primaryTextColor)
}
}
attributedString = addAttributesToStringWithRanges((string, ranges), body: bodyAttributes, argumentAttributes: attributes)
case .game:

3
submodules/TelegramUI/Sources/ChatController.swift
View File

@ -8718,9 +8718,6 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
interfaceState = interfaceState.withUpdatedHistoryScrollState(scrollState)
}
interfaceState = interfaceState.withUpdatedInputLanguage(self.chatDisplayNode.currentTextInputLanguage)
if interfaceState.composeInputState.inputText.string.trimmingCharacters(in: .whitespacesAndNewlines).isEmpty && interfaceState.replyMessageId == nil {
interfaceState = interfaceState.withUpdatedComposeInputState(ChatTextInputState(inputText: NSAttributedString(string: "")))
}
let _ = ChatInterfaceState.update(engine: self.context.engine, peerId: peerId, threadId: threadId, { _ in
return interfaceState
}).start()

1
submodules/TelegramUpdateUI/Sources/UpdateInfoItem.swift
View File

@ -301,6 +301,7 @@ class UpdateInfoItemNode: ListViewItemNode {
case .sameSection(false):
bottomStripeInset = 16.0
bottomStripeOffset = -separatorHeight
strongSelf.bottomStripeNode.isHidden = false
default:
bottomStripeInset = 0.0
bottomStripeOffset = 0.0