ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-12-23 06:35:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various improvements

Browse Source
This commit is contained in:
Ali
2023-09-15 21:12:01 +02:00
parent b7e4fb3d57
commit 3453137463
20 changed files with 235 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
submodules/TelegramUI/Components/ButtonComponent/Sources/ButtonComponent.swift
View File

@@ -93,19 +93,22 @@ public final class ButtonTextContentComponent: Component {
public let textColor: UIColor
public let badgeBackground: UIColor
public let badgeForeground: UIColor
public let combinedAlignment: Bool
public init(
text: String,
badge: Int,
textColor: UIColor,
badgeBackground: UIColor,
badgeForeground: UIColor
badgeForeground: UIColor,
combinedAlignment: Bool = false
) {
self.text = text
self.badge = badge
self.textColor = textColor
self.badgeBackground = badgeBackground
self.badgeForeground = badgeForeground
self.combinedAlignment = combinedAlignment
}
public static func ==(lhs: ButtonTextContentComponent, rhs: ButtonTextContentComponent) -> Bool {
@@ -124,6 +127,9 @@ public final class ButtonTextContentComponent: Component {
if lhs.badgeForeground != rhs.badgeForeground {
return false
}
if lhs.combinedAlignment != rhs.combinedAlignment {
return false
}
return true
}
@@ -194,23 +200,26 @@ public final class ButtonTextContentComponent: Component {
}
var size = contentSize
var measurementSize = size
if let badgeSize {
//size.width += badgeSpacing
//size.width += badgeSize.width
if component.combinedAlignment {
measurementSize.width += badgeSpacing
measurementSize.width += badgeSize.width
}
size.height = max(size.height, badgeSize.height)
}
let contentFrame = CGRect(origin: CGPoint(x: floor((size.width - contentSize.width) * 0.5), y: floor((size.height - contentSize.height) * 0.5)), size: contentSize)
let contentFrame = CGRect(origin: CGPoint(x: floor((size.width - measurementSize.width) * 0.5), y: floor((size.height - measurementSize.height) * 0.5)), size: measurementSize)
if let contentView = self.content.view {
if contentView.superview == nil {
self.addSubview(contentView)
}
transition.setFrame(view: contentView, frame: contentFrame)
transition.setFrame(view: contentView, frame: CGRect(origin: contentFrame.origin, size: contentSize))
}
if let badgeSize, let badge = self.badge {
let badgeFrame = CGRect(origin: CGPoint(x: contentFrame.maxX + badgeSpacing, y: floor((size.height - badgeSize.height) * 0.5) + 1.0), size: badgeSize)
let badgeFrame = CGRect(origin: CGPoint(x: contentFrame.minX + contentSize.width + badgeSpacing, y: floor((size.height - badgeSize.height) * 0.5) + 1.0), size: badgeSize)
if let badgeView = badge.view {
var animateIn = false