From 837acfa7842005c1c71f3bfb0c7f404099fb4d6a Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Wed, 29 Apr 2026 04:26:58 +0200 Subject: [PATCH] Various fixes --- .../Sources/ChatTextInputPanelNode.swift | 3 --- .../ComposePollScreen/Sources/ComposePollScreen.swift | 3 ++- .../Sources/CountriesMultiselectionScreen.swift | 11 +++++++++-- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift b/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift index aace91290f..fcb5d7a3cb 100644 --- a/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift +++ b/submodules/TelegramUI/Components/Chat/ChatTextInputPanelNode/Sources/ChatTextInputPanelNode.swift @@ -5610,9 +5610,6 @@ public class ChatTextInputPanelNode: ChatInputPanelNode, ASEditableTextNodeDeleg } public func frameForInputActionButton() -> CGRect? { - if !self.sendActionButtons.alpha.isZero && self.sendActionButtons.frame.minX < self.bounds.width { - return self.sendActionButtons.frame.insetBy(dx: 0.0, dy: -4.0).offsetBy(dx: -3.0, dy: 0.0) - } if !self.mediaActionButtons.alpha.isZero && self.mediaActionButtons.frame.minX < self.bounds.width { return self.mediaActionButtons.frame.insetBy(dx: 0.0, dy: -4.0).offsetBy(dx: -3.0, dy: 0.0) } diff --git a/submodules/TelegramUI/Components/ComposePollScreen/Sources/ComposePollScreen.swift b/submodules/TelegramUI/Components/ComposePollScreen/Sources/ComposePollScreen.swift index d365dfc98a..c6f4d2a4f4 100644 --- a/submodules/TelegramUI/Components/ComposePollScreen/Sources/ComposePollScreen.swift +++ b/submodules/TelegramUI/Components/ComposePollScreen/Sources/ComposePollScreen.swift @@ -1248,7 +1248,8 @@ final class ComposePollScreenComponent: Component { let stateContext = CountriesMultiselectionScreen.StateContext( context: component.context, subject: .countries, - initialSelectedCountries: self.limitToCountries + initialSelectedCountries: self.limitToCountries, + showFragment: true ) let _ = (stateContext.ready |> filter { $0 } |> take(1) |> deliverOnMainQueue).startStandalone(next: { [weak self] _ in let controller = CountriesMultiselectionScreen( diff --git a/submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/CountriesMultiselectionScreen.swift b/submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/CountriesMultiselectionScreen.swift index 5f2781e32d..769bd06411 100644 --- a/submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/CountriesMultiselectionScreen.swift +++ b/submodules/TelegramUI/Components/ShareWithPeersScreen/Sources/CountriesMultiselectionScreen.swift @@ -1122,6 +1122,7 @@ public extension CountriesMultiselectionScreen { public let subject: Subject public let maxCount: Int32? public let initialSelectedCountries: [String] + public let showFragment: Bool private var stateDisposable: Disposable? private let stateSubject = Promise() @@ -1138,14 +1139,20 @@ public extension CountriesMultiselectionScreen { context: AccountContext, subject: Subject = .countries, maxCount: Int32? = nil, - initialSelectedCountries: [String] = [] + initialSelectedCountries: [String] = [], + showFragment: Bool = false ) { self.subject = subject self.maxCount = maxCount self.initialSelectedCountries = initialSelectedCountries + self.showFragment = showFragment let presentationData = context.sharedContext.currentPresentationData.with { $0 } - let countries = localizedCountryNamesAndCodes(strings: presentationData.strings).sorted { lhs, rhs in + var countryList = localizedCountryNamesAndCodes(strings: presentationData.strings) + if showFragment { + countryList.append((("Fragment", "Fragment"), "FT", [888])) + } + let countries = countryList.sorted { lhs, rhs in return lhs.0.1.lowercased() < rhs.0.1.lowercased() }