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

Various improvements

Browse Source
This commit is contained in:
Ilya Laktyushin
2025-02-25 19:59:48 +04:00
parent 4aeab37c70
commit cb0b8c0b9e
63 changed files with 2420 additions and 560 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
submodules/StatisticsUI/Sources/ChannelStatsController.swift
View File

@@ -1565,7 +1565,7 @@ private func monetizationEntries(
presentationData: PresentationData,
state: ChannelStatsControllerState,
peer: EnginePeer?,
data: RevenueStats,
data: RevenueStats?,
boostData: ChannelBoostStatus?,
transactionsInfo: RevenueStatsTransactionsContext.State,
starsData: StarsRevenueStats?,
@@ -1584,7 +1584,7 @@ private func monetizationEntries(
isBot = true
}
if canViewRevenue {
if canViewRevenue, let data {
entries.append(.adsHeader(presentationData.theme, isBot ? presentationData.strings.Monetization_Bot_Header : presentationData.strings.Monetization_Header))
if !data.topHoursGraph.isEmpty {
@@ -1608,7 +1608,7 @@ private func monetizationEntries(
entries.append(.adsProceedsTitle(presentationData.theme, presentationData.strings.Monetization_StarsProceeds_Title))
entries.append(.adsProceedsOverview(presentationData.theme, canViewRevenue ? data : nil, canViewStarsRevenue ? starsData : nil))
let hasTonBalance = data.balances.overallRevenue > 0
let hasTonBalance = (data?.balances.overallRevenue ?? 0) > 0
let hasStarsBalance = (starsData?.balances.overallRevenue ?? StarsAmount.zero) > StarsAmount.zero
let proceedsInfo: String
@@ -1622,11 +1622,15 @@ private func monetizationEntries(
entries.append(.adsProceedsInfo(presentationData.theme, proceedsInfo))
var isCreator = false
var isGroup = false
if let peer, case let .channel(channel) = peer, channel.flags.contains(.isCreator) {
isCreator = true
if case .group = channel.info {
isGroup = true
}
}
if canViewRevenue {
if canViewRevenue, let data {
entries.append(.adsTonBalanceTitle(presentationData.theme, isBot ? presentationData.strings.Monetization_Bot_BalanceTitle : presentationData.strings.Monetization_TonBalanceTitle))
entries.append(.adsTonBalance(presentationData.theme, data, (isCreator || isBot) && data.balances.availableBalance > 0, data.balances.withdrawEnabled))
@@ -1643,12 +1647,14 @@ private func monetizationEntries(
}
}
if canViewStarsRevenue {
if let starsData, starsData.balances.overallRevenue > StarsAmount.zero {
entries.append(.adsStarsBalanceTitle(presentationData.theme, presentationData.strings.Monetization_StarsBalanceTitle))
entries.append(.adsStarsBalance(presentationData.theme, starsData, isCreator && starsData.balances.availableBalance > StarsAmount.zero, starsData.balances.withdrawEnabled, starsData.balances.nextWithdrawalTimestamp))
entries.append(.adsStarsBalanceInfo(presentationData.theme, presentationData.strings.Monetization_Balance_StarsInfo))
}
if canViewStarsRevenue, let starsData, starsData.balances.overallRevenue > StarsAmount.zero {
entries.append(.adsStarsBalanceTitle(presentationData.theme, presentationData.strings.Monetization_StarsBalanceTitle))
entries.append(.adsStarsBalance(presentationData.theme, starsData, isCreator && starsData.balances.availableBalance > StarsAmount.zero, starsData.balances.withdrawEnabled, starsData.balances.nextWithdrawalTimestamp))
entries.append(.adsStarsBalanceInfo(presentationData.theme, isGroup ? presentationData.strings.Monetization_Balance_StarsInfoGroup : presentationData.strings.Monetization_Balance_StarsInfo))
}
if canJoinRefPrograms && !isGroup {
entries.append(.earnStarsInfo)
}
var addedTransactionsTabs = false
@@ -1666,7 +1672,7 @@ private func monetizationEntries(
if canViewStarsRevenue && !starsTransactionsInfo.transactions.isEmpty && (transactionsInfo.transactions.isEmpty || state.starsSelected) {
displayStarsTransactions = true
}
if displayTonTransactions {
if !addedTransactionsTabs {
entries.append(.adsTransactionsTitle(presentationData.theme, isBot ? presentationData.strings.Monetization_TransactionsTitle.uppercased() : presentationData.strings.Monetization_TonTransactions.uppercased()))
@@ -1700,11 +1706,7 @@ private func monetizationEntries(
if displayStarsTransactions {
if !addedTransactionsTabs {
if canJoinRefPrograms {
entries.append(.earnStarsInfo)
}
entries.append(.adsTransactionsTitle(presentationData.theme, presentationData.strings.Monetization_StarsTransactions.uppercased()))
entries.append(.adsTransactionsTitle(presentationData.theme, isGroup ? presentationData.strings.Monetization_TransactionsTitle.uppercased() : presentationData.strings.Monetization_StarsTransactions.uppercased()))
}
var transactions = starsTransactionsInfo.transactions
@@ -1733,7 +1735,7 @@ private func monetizationEntries(
}
}
if isCreator && canViewRevenue {
if isCreator && canViewRevenue && !isGroup {
var switchOffAdds: Bool? = nil
if let boostData, boostData.level >= premiumConfiguration.minChannelRestrictAdsLevel {
switchOffAdds = adsRestricted
@@ -1797,7 +1799,7 @@ private func channelStatsControllerEntries(
)
}
case .monetization:
if let revenueState {
if revenueState != nil || starsState != nil {
return monetizationEntries(
presentationData: presentationData,
state: state,
@@ -1825,6 +1827,7 @@ public func channelStatsController(
peerId: PeerId,
section: ChannelStatsSection = .stats,
existingRevenueContext: RevenueStatsContext? = nil,
existingStarsRevenueContext: StarsRevenueStatsContext? = nil,
boostStatus: ChannelBoostStatus? = nil,
boostStatusUpdated: ((ChannelBoostStatus) -> Void)? = nil
) -> ViewController {
@@ -1888,7 +1891,7 @@ public func channelStatsController(
let revenueState = Promise<RevenueStatsContextState?>()
revenueState.set(.single(nil) |> then(revenueContext.state |> map(Optional.init)))
let starsContext = context.engine.payments.peerStarsRevenueContext(peerId: peerId)
let starsContext = existingStarsRevenueContext ?? context.engine.payments.peerStarsRevenueContext(peerId: peerId)
let starsState = Promise<StarsRevenueStatsContextState?>()
starsState.set(.single(nil) |> then(starsContext.state |> map(Optional.init)))
@@ -2157,8 +2160,9 @@ public func channelStatsController(
)
|> deliverOnMainQueue
|> map { presentationData, state, peer, data, messageView, stories, boostData, boostersState, giftsState, revenueState, revenueTransactions, starsState, starsTransactions, peerData, longLoading -> (ItemListControllerState, (ItemListNodeState, Any)) in
let (canViewStats, adsRestricted, _, canViewStarsRevenue) = peerData
let (canViewStats, adsRestricted, _, _) = peerData
var canViewRevenue = peerData.2
var canViewStarsRevenue = peerData.3
var canJoinRefPrograms = false
if let data = context.currentAppConfiguration.with({ $0 }).data, let value = data["starref_connect_allowed"] {
@@ -2192,7 +2196,7 @@ public func channelStatsController(
emptyStateItem = ItemListLoadingIndicatorEmptyStateItem(theme: presentationData.theme)
}
case .monetization:
if revenueState?.stats == nil {
if revenueState?.stats == nil && starsState?.stats == nil {
emptyStateItem = ItemListLoadingIndicatorEmptyStateItem(theme: presentationData.theme)
}
}
@@ -2222,7 +2226,10 @@ public func channelStatsController(
var headerItem: BoostHeaderItem?
var leftNavigationButton: ItemListNavigationButton?
var boostsOnly = false
if existingRevenueContext != nil {
if existingStarsRevenueContext != nil {
title = .text(presentationData.strings.Stats_Monetization)
canViewStarsRevenue = true
} else if existingRevenueContext != nil {
title = .text(presentationData.strings.Stats_TonBotRevenue_Title)
canViewRevenue = true
} else if section == .boosts {