ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-07-25 12:40:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix build

Browse Source
This commit is contained in:
Ilya Laktyushin 2025-06-24 01:46:25 +02:00
parent 0da5f08f22
commit 212164b072
3 changed files with 15 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoData.swift
View File

@ -381,7 +381,6 @@ final class PeerInfoScreenData {
let hasBotPreviewItems: Bool let hasBotPreviewItems: Bool
let isPremiumRequiredForStoryPosting: Bool let isPremiumRequiredForStoryPosting: Bool
let personalChannel: PeerInfoPersonalChannelData? let personalChannel: PeerInfoPersonalChannelData?
let tonState: StarsContext.State?
let starsState: StarsContext.State? let starsState: StarsContext.State?
let tonState: StarsContext.State? let tonState: StarsContext.State?
let starsRevenueStatsState: StarsRevenueStats? let starsRevenueStatsState: StarsRevenueStats?
@ -434,7 +433,6 @@ final class PeerInfoScreenData {
hasBotPreviewItems: Bool, hasBotPreviewItems: Bool,
isPremiumRequiredForStoryPosting: Bool, isPremiumRequiredForStoryPosting: Bool,
personalChannel: PeerInfoPersonalChannelData?, personalChannel: PeerInfoPersonalChannelData?,
tonState: StarsContext.State?,
starsState: StarsContext.State?, starsState: StarsContext.State?,
tonState: StarsContext.State?, tonState: StarsContext.State?,
starsRevenueStatsState: StarsRevenueStats?, starsRevenueStatsState: StarsRevenueStats?,
@ -475,7 +473,6 @@ final class PeerInfoScreenData {
self.hasBotPreviewItems = hasBotPreviewItems self.hasBotPreviewItems = hasBotPreviewItems
self.isPremiumRequiredForStoryPosting = isPremiumRequiredForStoryPosting self.isPremiumRequiredForStoryPosting = isPremiumRequiredForStoryPosting
self.personalChannel = personalChannel self.personalChannel = personalChannel
self.tonState = tonState
self.starsState = starsState self.starsState = starsState
self.tonState = tonState self.tonState = tonState
self.starsRevenueStatsState = starsRevenueStatsState self.starsRevenueStatsState = starsRevenueStatsState
@ -852,13 +849,6 @@ func peerInfoScreenSettingsData(context: AccountContext, peerId: EnginePeer.Id,
} }
} }
let tonState: Signal<StarsContext.State?, NoError>
if let tonContext {
tonState = tonContext.state
} else {
tonState = .single(nil)
}
let starsState: Signal<StarsContext.State?, NoError> let starsState: Signal<StarsContext.State?, NoError>
if let starsContext { if let starsContext {
starsState = starsContext.state starsState = starsContext.state
@ -979,7 +969,6 @@ func peerInfoScreenSettingsData(context: AccountContext, peerId: EnginePeer.Id,
hasBotPreviewItems: false, hasBotPreviewItems: false,
isPremiumRequiredForStoryPosting: true, isPremiumRequiredForStoryPosting: true,
personalChannel: personalChannel, personalChannel: personalChannel,
tonState: tonState,
starsState: starsState, starsState: starsState,
tonState: tonState, tonState: tonState,
starsRevenueStatsState: nil, starsRevenueStatsState: nil,
@ -1031,7 +1020,6 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
hasBotPreviewItems: false, hasBotPreviewItems: false,
isPremiumRequiredForStoryPosting: true, isPremiumRequiredForStoryPosting: true,
personalChannel: nil, personalChannel: nil,
tonState: nil,
starsState: nil, starsState: nil,
tonState: nil, tonState: nil,
starsRevenueStatsState: nil, starsRevenueStatsState: nil,
@ -1492,7 +1480,6 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
hasBotPreviewItems: hasBotPreviewItems, hasBotPreviewItems: hasBotPreviewItems,
isPremiumRequiredForStoryPosting: false, isPremiumRequiredForStoryPosting: false,
personalChannel: personalChannel, personalChannel: personalChannel,
tonState: nil,
starsState: nil, starsState: nil,
tonState: nil, tonState: nil,
starsRevenueStatsState: starsRevenueContextAndState.1, starsRevenueStatsState: starsRevenueContextAndState.1,
@ -1725,7 +1712,6 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
hasBotPreviewItems: false, hasBotPreviewItems: false,
isPremiumRequiredForStoryPosting: isPremiumRequiredForStoryPosting, isPremiumRequiredForStoryPosting: isPremiumRequiredForStoryPosting,
personalChannel: personalChannel, personalChannel: personalChannel,
tonState: nil,
starsState: nil, starsState: nil,
tonState: nil, tonState: nil,
starsRevenueStatsState: starsRevenueContextAndState.1, starsRevenueStatsState: starsRevenueContextAndState.1,
@ -2059,7 +2045,6 @@ func peerInfoScreenData(context: AccountContext, peerId: PeerId, strings: Presen
hasBotPreviewItems: false, hasBotPreviewItems: false,
isPremiumRequiredForStoryPosting: isPremiumRequiredForStoryPosting, isPremiumRequiredForStoryPosting: isPremiumRequiredForStoryPosting,
personalChannel: nil, personalChannel: nil,
tonState: nil,
starsState: nil, starsState: nil,
tonState: nil, tonState: nil,
starsRevenueStatsState: starsRevenueContextAndState.1, starsRevenueStatsState: starsRevenueContextAndState.1,

10
submodules/TelegramUI/Components/PeerInfo/PeerInfoScreen/Sources/PeerInfoScreen.swift
View File

@ -10670,11 +10670,7 @@ final class PeerInfoScreenNode: ViewControllerTracingNode, PeerInfoScreenNodePro
} }
case .ton: case .ton:
if let tonContext = self.controller?.tonContext { if let tonContext = self.controller?.tonContext {
<<<<<<< HEAD
push(self.context.sharedContext.makeTonTransactionsScreen(context: self.context, tonContext: tonContext)) push(self.context.sharedContext.makeTonTransactionsScreen(context: self.context, tonContext: tonContext))
=======
push(self.context.sharedContext.makeStarsTransactionsScreen(context: self.context, starsContext: tonContext))
>>>>>>> 51a16c711078fab6940623bf1de0ec85516ba699
} }
} }
} }
@ -12992,12 +12988,6 @@ public final class PeerInfoScreenImpl: ViewController, PeerInfoScreen, KeyShortc
self.starsContext = nil self.starsContext = nil
self.tonContext = nil self.tonContext = nil
} }
if isSettings, let tonContext = context.tonContext {
self.tonContext = tonContext
tonContext.load(force: true)
} else {
self.tonContext = nil
}
if isMyProfile, let profileGiftsContext { if isMyProfile, let profileGiftsContext {
profileGiftsContext.updateFilter(.All) profileGiftsContext.updateFilter(.All)

18
submodules/TelegramUI/Components/Stars/StarsAvatarComponent/Sources/StarsAvatarComponent.swift
View File

@ -374,13 +374,19 @@ public final class StarsAvatarComponent: Component {
public final class StarsLabelComponent: CombinedComponent { public final class StarsLabelComponent: CombinedComponent {
let text: NSAttributedString let text: NSAttributedString
let subtext: NSAttributedString? let subtext: NSAttributedString?
let iconName: String
let iconColor: UIColor?
public init( public init(
text: NSAttributedString, text: NSAttributedString,
subtext: NSAttributedString? = nil subtext: NSAttributedString? = nil,
iconName: String = "Premium/Stars/StarMedium",
iconColor: UIColor? = nil
) { ) {
self.text = text self.text = text
self.subtext = subtext self.subtext = subtext
self.iconName = iconName
self.iconColor = iconColor
} }
public static func ==(lhs: StarsLabelComponent, rhs: StarsLabelComponent) -> Bool { public static func ==(lhs: StarsLabelComponent, rhs: StarsLabelComponent) -> Bool {
@ -390,6 +396,12 @@ public final class StarsLabelComponent: CombinedComponent {
if lhs.subtext != rhs.subtext { if lhs.subtext != rhs.subtext {
return false return false
} }
if lhs.iconName != rhs.iconName {
return false
}
if lhs.iconColor != rhs.iconColor {
return false
}
return true return true
} }
@ -420,8 +432,8 @@ public final class StarsLabelComponent: CombinedComponent {
let iconSize = CGSize(width: 20.0, height: 20.0) let iconSize = CGSize(width: 20.0, height: 20.0)
let icon = icon.update( let icon = icon.update(
component: BundleIconComponent( component: BundleIconComponent(
name: "Premium/Stars/StarMedium", name: component.iconName,
tintColor: nil tintColor: component.iconColor
), ),
availableSize: iconSize, availableSize: iconSize,
transition: context.transition transition: context.transition