Skip to content

Commit d86362c

Browse files
author
Isaac
committed
Merge commit 'b83250ac634f00e263e4592ed31d27152af2e870'
2 parents 5e26b24 + b83250a commit d86362c

File tree

4 files changed

+27
-34
lines changed

4 files changed

+27
-34
lines changed

‎submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftAuctionBidScreen.swift‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2024,7 +2024,7 @@ private final class GiftAuctionBidScreenComponent: Component {
20242024
if let navigationController = controller.navigationController as? NavigationController {
20252025
var controllers = navigationController.viewControllers
20262026
controllers = controllers.filter { !($0 is GiftAuctionBidScreen) && !($0 is GiftSetupScreenProtocol) && !($0 is GiftOptionsScreenProtocol) && !($0 is PeerInfoScreen) && !($0 is ContactSelectionController) }
2027-
2027+
20282028
var foundController = false
20292029
for controller in controllers.reversed() {
20302030
if let chatController = controller as? ChatController, case .peer(id: bidPeerId) = chatController.chatLocation {
@@ -2039,6 +2039,12 @@ private final class GiftAuctionBidScreenComponent: Component {
20392039
controllers.append(chatController)
20402040
}
20412041
navigationController.setViewControllers(controllers, animated: true)
2042+
2043+
for controller in controllers {
2044+
if controller is MinimizableController {
2045+
controller.dismiss(animated: true)
2046+
}
2047+
}
20422048
}
20432049
} else {
20442050
self.resetSliderValue()

‎submodules/TelegramUI/Components/Stars/ItemShimmeringLoadingComponent/Sources/ItemShimmeringLoadingComponent.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public final class ItemShimmeringLoadingComponent: Component {
7676
self.component = component
7777

7878
if previousCornerRadius != component.cornerRadius {
79-
self.borderView.image = generateFilledRoundedRectImage(size: CGSize(width: 24.0, height: 24.0), cornerRadius: component.cornerRadius, color: nil, strokeColor: .white, strokeWidth: 1.0 + UIScreenPixel, backgroundColor: nil)?.stretchableImage(withLeftCapWidth: Int(component.cornerRadius), topCapHeight: Int(component.cornerRadius)).withRenderingMode(.alwaysTemplate)
79+
self.borderView.image = generateFilledRoundedRectImage(size: CGSize(width: component.cornerRadius * 2.0 + 2.0, height: component.cornerRadius * 2.0 + 2.0), cornerRadius: component.cornerRadius, color: nil, strokeColor: .white, strokeWidth: 1.0 + UIScreenPixel, backgroundColor: nil)?.stretchableImage(withLeftCapWidth: Int(component.cornerRadius), topCapHeight: Int(component.cornerRadius)).withRenderingMode(.alwaysTemplate)
8080
}
8181

8282
self.borderView.tintColor = component.color

‎submodules/TelegramUI/Components/Stars/StarsPurchaseScreen/Sources/StarsPurchaseScreen.swift‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -388,8 +388,8 @@ private final class StarsPurchaseScreenContentComponent: CombinedComponent {
388388
highlighting: .disabled,
389389
updateIsHighlighted: { view, isHighlighted in
390390
let transition: ComponentTransition = .easeInOut(duration: 0.25)
391-
if let superview = view.superview {
392-
transition.setScale(view: superview, scale: isHighlighted ? 0.9 : 1.0)
391+
if let superview = view.superview?.superview?.superview?.superview {
392+
transition.setScale(view: superview, scale: isHighlighted ? 1.05 : 1.0)
393393
}
394394
}
395395
)))]
@@ -427,7 +427,7 @@ private final class StarsPurchaseScreenContentComponent: CombinedComponent {
427427
style: .glass,
428428
title: titleCombinedComponent,
429429
titleAlignment: .center,
430-
contentInsets: UIEdgeInsets(top: 7.0, left: 0.0, bottom: 7.0, right: 0.0),
430+
contentInsets: UIEdgeInsets(top: 11.0, left: 0.0, bottom: 11.0, right: 0.0),
431431
leftIcon: nil,
432432
accessory: .none,
433433
action: { _ in

‎submodules/TelegramUI/Components/Stars/StarsTransactionsScreen/Sources/StarsTransactionsListPanelComponent.swift‎

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -472,43 +472,30 @@ final class StarsTransactionsListPanelComponent: Component {
472472
)))
473473
)
474474
if let itemSubtitle {
475-
let subtitleComponent: AnyComponent<Empty>
475+
var items: [AnyComponentWithIdentity<Empty>] = []
476476
if let itemFile {
477-
subtitleComponent = AnyComponent(
478-
HStack([
479-
AnyComponentWithIdentity(id: AnyHashable(0), component: AnyComponent(
480-
GiftAnimationComponent(
481-
context: component.context,
482-
theme: environment.theme,
483-
file: itemFile,
484-
still: true,
485-
size: CGSize(width: 20.0, height: 20.0)
486-
)
487-
)),
488-
AnyComponentWithIdentity(id: AnyHashable(1), component: AnyComponent(
489-
MultilineTextComponent(
490-
text: .plain(NSAttributedString(
491-
string: itemSubtitle,
492-
font: Font.regular(fontBaseDisplaySize * 16.0 / 17.0),
493-
textColor: environment.theme.list.itemPrimaryTextColor
494-
)
495-
)
496-
)))
497-
], spacing: 2.0)
498-
)
499-
} else {
500-
subtitleComponent = AnyComponent(MultilineTextComponent(
477+
items.append(AnyComponentWithIdentity(id: "icon", component: AnyComponent(
478+
GiftAnimationComponent(
479+
context: component.context,
480+
theme: environment.theme,
481+
file: itemFile,
482+
still: true,
483+
size: CGSize(width: 20.0, height: 20.0)
484+
)
485+
)))
486+
}
487+
items.append(AnyComponentWithIdentity(id: "title", component: AnyComponent(
488+
MultilineTextComponent(
501489
text: .plain(NSAttributedString(
502490
string: itemSubtitle,
503491
font: Font.regular(fontBaseDisplaySize * 16.0 / 17.0),
504492
textColor: environment.theme.list.itemPrimaryTextColor
505493
)),
506494
maximumNumberOfLines: 1
507-
))
508-
}
509-
495+
)
496+
)))
510497
titleComponents.append(
511-
AnyComponentWithIdentity(id: AnyHashable(1), component: subtitleComponent)
498+
AnyComponentWithIdentity(id: AnyHashable(1), component: AnyComponent(HStack(items, spacing: 2.0)))
512499
)
513500
}
514501
titleComponents.append(

0 commit comments

Comments
 (0)