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

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin 2025-01-28 01:51:45 +04:00
parent d980d11551
commit 004ebd58ad
2 changed files with 70 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift
View File

@ -1743,9 +1743,11 @@ private final class GiftViewSheetContent: CombinedComponent {
canConvert = false canConvert = false
} }
} }
let valueComponent: AnyComponent<Empty>
if let convertStars, incoming && !converted && canConvert { if let convertStars, incoming && !converted && canConvert {
valueComponent = AnyComponent( tableItems.append(.init(
id: "value_convert",
title: strings.Gift_View_Value,
component: AnyComponent(
HStack([ HStack([
AnyComponentWithIdentity( AnyComponentWithIdentity(
id: AnyHashable(0), id: AnyHashable(0),
@ -1772,24 +1774,24 @@ private final class GiftViewSheetContent: CombinedComponent {
)) ))
) )
], spacing: 4.0) ], spacing: 4.0)
) ),
insets: UIEdgeInsets(top: 0.0, left: 10.0, bottom: 0.0, right: 12.0)
))
} else { } else {
valueComponent = AnyComponent(MultilineTextWithEntitiesComponent( tableItems.append(.init(
id: "value",
title: strings.Gift_View_Value,
component: AnyComponent(MultilineTextWithEntitiesComponent(
context: component.context, context: component.context,
animationCache: component.context.animationCache, animationCache: component.context.animationCache,
animationRenderer: component.context.animationRenderer, animationRenderer: component.context.animationRenderer,
placeholderColor: theme.list.mediaPlaceholderColor, placeholderColor: theme.list.mediaPlaceholderColor,
text: .plain(valueAttributedString), text: .plain(valueAttributedString),
maximumNumberOfLines: 0 maximumNumberOfLines: 0
)) )),
}
tableItems.append(.init(
id: "value",
title: strings.Gift_View_Value,
component: valueComponent,
insets: UIEdgeInsets(top: 0.0, left: 10.0, bottom: 0.0, right: 12.0) insets: UIEdgeInsets(top: 0.0, left: 10.0, bottom: 0.0, right: 12.0)
)) ))
}
if let limitTotal { if let limitTotal {
var remains: Int32 = 0 var remains: Int32 = 0

16
submodules/TelegramUI/Sources/SharedAccountContext.swift
View File

@ -2659,6 +2659,19 @@ public final class SharedAccountContextImpl: SharedAccountContext {
controllers = controllers.filter { !($0 is ContactSelectionController) } controllers = controllers.filter { !($0 is ContactSelectionController) }
if !isChannelGift { if !isChannelGift {
if peer.id.namespace == Namespaces.Peer.CloudChannel {
if let controller = context.sharedContext.makePeerInfoController(
context: context,
updatedPresentationData: nil,
peer: peer._asPeer(),
mode: .gifts,
avatarInitiallyExpanded: false,
fromChat: false,
requestsContext: nil
) {
controllers.append(controller)
}
} else {
var foundController = false var foundController = false
for controller in controllers.reversed() { for controller in controllers.reversed() {
if let chatController = controller as? ChatController, case .peer(id: peer.id) = chatController.chatLocation { if let chatController = controller as? ChatController, case .peer(id: peer.id) = chatController.chatLocation {
@ -2672,8 +2685,9 @@ public final class SharedAccountContextImpl: SharedAccountContext {
chatController.hintPlayNextOutgoingGift() chatController.hintPlayNextOutgoingGift()
controllers.append(chatController) controllers.append(chatController)
} }
navigationController.setViewControllers(controllers, animated: true)
} }
}
navigationController.setViewControllers(controllers, animated: true)
Queue.mainQueue().after(0.3) { Queue.mainQueue().after(0.3) {
let tooltipController = UndoOverlayController( let tooltipController = UndoOverlayController(