mirror of
https://github.com/TelegramMessenger/Telegram-iOS.git
synced 2026-07-06 03:33:41 +02:00
Various improvements
This commit is contained in:
parent
1507e99c1d
commit
f610e8b3b3
9 changed files with 37 additions and 97 deletions
|
|
@ -1165,15 +1165,20 @@ private enum StatsEntry: ItemListNodeEntry {
|
|||
detailText = "\(fromDateString) – \(toDateString)"
|
||||
}
|
||||
} else if case .fragment = transaction.peer {
|
||||
title = NSAttributedString(string: presentationData.strings.Monetization_Transaction_Withdrawal("Fragment").string, font: font, textColor: theme.list.itemPrimaryTextColor)
|
||||
labelColor = theme.list.itemDestructiveColor
|
||||
if transaction.flags.contains(.isPending) {
|
||||
detailText = presentationData.strings.Monetization_Transaction_Pending
|
||||
} else if transaction.flags.contains(.isFailed) {
|
||||
detailText = stringForMediumCompactDate(timestamp: transaction.date, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, withTime: false) + " – \(presentationData.strings.Monetization_Transaction_Failed)"
|
||||
detailColor = .destructive
|
||||
} else {
|
||||
if transaction.flags.contains(.isRefund) {
|
||||
title = NSAttributedString(string: presentationData.strings.Monetization_Transaction_Refund, font: font, textColor: theme.list.itemPrimaryTextColor)
|
||||
detailText = stringForMediumCompactDate(timestamp: transaction.date, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat)
|
||||
} else {
|
||||
title = NSAttributedString(string: presentationData.strings.Monetization_Transaction_Withdrawal("Fragment").string, font: font, textColor: theme.list.itemPrimaryTextColor)
|
||||
labelColor = theme.list.itemDestructiveColor
|
||||
if transaction.flags.contains(.isPending) {
|
||||
detailText = presentationData.strings.Monetization_Transaction_Pending
|
||||
} else if transaction.flags.contains(.isFailed) {
|
||||
detailText = stringForMediumCompactDate(timestamp: transaction.date, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, withTime: false) + " – \(presentationData.strings.Monetization_Transaction_Failed)"
|
||||
detailColor = .destructive
|
||||
} else {
|
||||
detailText = stringForMediumCompactDate(timestamp: transaction.date, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat)
|
||||
}
|
||||
}
|
||||
} else if transaction.flags.contains(.isRefund) {
|
||||
title = NSAttributedString(string: presentationData.strings.Monetization_Transaction_Refund, font: font, textColor: theme.list.itemPrimaryTextColor)
|
||||
|
|
|
|||
|
|
@ -145,20 +145,28 @@ private final class SheetContent: CombinedComponent {
|
|||
explorerUrl = nil
|
||||
showPeer = true
|
||||
} else if case .fragment = component.transaction.peer {
|
||||
labelColor = theme.list.itemDestructiveColor
|
||||
amountString = tonAmountAttributedString(formatTonAmountText(component.transaction.count.amount.value, dateTimeFormat: dateTimeFormat), integralFont: integralFont, fractionalFont: fractionalFont, color: labelColor, decimalSeparator: dateTimeFormat.decimalSeparator).mutableCopy() as! NSMutableAttributedString
|
||||
dateString = stringForFullDate(timestamp: component.transaction.date, strings: strings, dateTimeFormat: dateTimeFormat)
|
||||
|
||||
if component.transaction.flags.contains(.isPending) {
|
||||
titleString = strings.Monetization_TransactionInfo_Pending
|
||||
if component.transaction.flags.contains(.isRefund) {
|
||||
labelColor = theme.list.itemDisclosureActions.constructive.fillColor
|
||||
titleString = strings.Monetization_TransactionInfo_Refund
|
||||
amountString = tonAmountAttributedString(formatTonAmountText(component.transaction.count.amount.value, dateTimeFormat: dateTimeFormat, showPlus: true), integralFont: integralFont, fractionalFont: fractionalFont, color: labelColor, decimalSeparator: dateTimeFormat.decimalSeparator).mutableCopy() as! NSMutableAttributedString
|
||||
dateString = stringForFullDate(timestamp: component.transaction.date, strings: strings, dateTimeFormat: dateTimeFormat)
|
||||
buttonTitle = strings.Common_OK
|
||||
} else if component.transaction.flags.contains(.isFailed) {
|
||||
titleString = strings.Monetization_TransactionInfo_Failed
|
||||
buttonTitle = strings.Common_OK
|
||||
titleColor = theme.list.itemDestructiveColor
|
||||
} else {
|
||||
titleString = strings.Monetization_TransactionInfo_Withdrawal("Fragment").string
|
||||
buttonTitle = strings.Monetization_TransactionInfo_ViewInExplorer
|
||||
labelColor = theme.list.itemDestructiveColor
|
||||
amountString = tonAmountAttributedString(formatTonAmountText(component.transaction.count.amount.value, dateTimeFormat: dateTimeFormat), integralFont: integralFont, fractionalFont: fractionalFont, color: labelColor, decimalSeparator: dateTimeFormat.decimalSeparator).mutableCopy() as! NSMutableAttributedString
|
||||
dateString = stringForFullDate(timestamp: component.transaction.date, strings: strings, dateTimeFormat: dateTimeFormat)
|
||||
|
||||
if component.transaction.flags.contains(.isPending) {
|
||||
titleString = strings.Monetization_TransactionInfo_Pending
|
||||
buttonTitle = strings.Common_OK
|
||||
} else if component.transaction.flags.contains(.isFailed) {
|
||||
titleString = strings.Monetization_TransactionInfo_Failed
|
||||
buttonTitle = strings.Common_OK
|
||||
titleColor = theme.list.itemDestructiveColor
|
||||
} else {
|
||||
titleString = strings.Monetization_TransactionInfo_Withdrawal("Fragment").string
|
||||
buttonTitle = strings.Monetization_TransactionInfo_ViewInExplorer
|
||||
}
|
||||
}
|
||||
explorerUrl = component.transaction.transactionUrl
|
||||
} else if component.transaction.flags.contains(.isRefund) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue