Skip to content

Commit d3f42e6

Browse files
laktyushinlaktyushin
committed
Various improvements
1 parent deed790 commit d3f42e6

File tree

9 files changed

+37
-97
lines changed

9 files changed

+37
-97
lines changed

‎submodules/AccountContext/Sources/Premium.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public enum PremiumIntroSource {
4242
case folderTags
4343
case animatedEmoji
4444
case messageEffects
45-
case paidMessages
4645
case todo
4746
case auth(String)
4847
}
@@ -82,7 +81,6 @@ public enum PremiumDemoSubject {
8281
case folderTags
8382
case business
8483
case messageEffects
85-
case paidMessages
8684
case todo
8785

8886
case businessLocation

‎submodules/PremiumUI/Sources/PremiumDemoScreen.swift

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,26 +1098,7 @@ private final class DemoSheetContent: CombinedComponent {
10981098
)
10991099
)
11001100
)
1101-
1102-
availableItems[.paidMessages] = DemoPagerComponent.Item(
1103-
AnyComponentWithIdentity(
1104-
id: PremiumDemoScreen.Subject.paidMessages,
1105-
component: AnyComponent(
1106-
PageComponent(
1107-
content: AnyComponent(PhoneDemoComponent(
1108-
context: component.context,
1109-
position: .top,
1110-
videoFile: configuration.videos["paid_messages"],
1111-
decoration: .badgeStars
1112-
)),
1113-
title: strings.Premium_PaidMessages,
1114-
text: strings.Premium_PaidMessagesInfo,
1115-
textColor: textColor
1116-
)
1117-
)
1118-
)
1119-
)
1120-
1101+
11211102
availableItems[.todo] = DemoPagerComponent.Item(
11221103
AnyComponentWithIdentity(
11231104
id: PremiumDemoScreen.Subject.todo,
@@ -1234,8 +1215,6 @@ private final class DemoSheetContent: CombinedComponent {
12341215
text = strings.Premium_FolderTagsStandaloneInfo
12351216
case .messageEffects:
12361217
text = strings.Premium_MessageEffectsInfo
1237-
case .paidMessages:
1238-
text = strings.Premium_PaidMessagesInfo
12391218
case .todo:
12401219
text = strings.Premium_TodoInfo
12411220
default:
@@ -1322,8 +1301,6 @@ private final class DemoSheetContent: CombinedComponent {
13221301
case .emojiStatus:
13231302
buttonText = strings.Premium_EmojiStatus_Proceed
13241303
buttonAnimationName = "premium_unlock"
1325-
case .paidMessages:
1326-
buttonText = strings.Premium_PaidMessages_Proceed
13271304
case .todo:
13281305
buttonText = strings.Premium_PaidMessages_Proceed
13291306
default:
@@ -1515,7 +1492,6 @@ public class PremiumDemoScreen: ViewControllerComponentContainer {
15151492
case business
15161493
case folderTags
15171494
case messageEffects
1518-
case paidMessages
15191495
case todo
15201496

15211497
case businessLocation
@@ -1575,8 +1551,6 @@ public class PremiumDemoScreen: ViewControllerComponentContainer {
15751551
return .folderTags
15761552
case .messageEffects:
15771553
return .messageEffects
1578-
case .paidMessages:
1579-
return .paidMessages
15801554
case .todo:
15811555
return .todo
15821556
case .businessLocation:

‎submodules/PremiumUI/Sources/PremiumGiftScreen.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -539,8 +539,6 @@ private final class PremiumGiftScreenContentComponent: CombinedComponent {
539539
demoSubject = .messagePrivacy
540540
case .messageEffects:
541541
demoSubject = .messageEffects
542-
case .paidMessages:
543-
demoSubject = .paidMessages
544542
case .business:
545543
demoSubject = .business
546544
default:

‎submodules/PremiumUI/Sources/PremiumIntroScreen.swift

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -303,12 +303,6 @@ public enum PremiumSource: Equatable {
303303
} else {
304304
return false
305305
}
306-
case .paidMessages:
307-
if case .messageEffects = rhs {
308-
return true
309-
} else {
310-
return false
311-
}
312306
case .todo:
313307
if case .todo = rhs {
314308
return true
@@ -368,7 +362,6 @@ public enum PremiumSource: Equatable {
368362
case messageTags
369363
case folderTags
370364
case messageEffects
371-
case paidMessages
372365
case todo
373366
case auth(String)
374367

@@ -464,8 +457,6 @@ public enum PremiumSource: Equatable {
464457
return "folder_tags"
465458
case .messageEffects:
466459
return "effects"
467-
case .paidMessages:
468-
return "paid_messages"
469460
case .todo:
470461
return "todo"
471462
case .auth:
@@ -498,7 +489,6 @@ public enum PremiumPerk: CaseIterable {
498489
case business
499490
case folderTags
500491
case messageEffects
501-
case paidMessages
502492
case todo
503493

504494
case businessLocation
@@ -535,7 +525,7 @@ public enum PremiumPerk: CaseIterable {
535525
.folderTags,
536526
.business,
537527
.messageEffects,
538-
.paidMessages
528+
.todo
539529
]
540530
}
541531

@@ -609,8 +599,6 @@ public enum PremiumPerk: CaseIterable {
609599
return "folder_tags"
610600
case .messageEffects:
611601
return "effects"
612-
case .paidMessages:
613-
return "paid_messages"
614602
case .todo:
615603
return "todo"
616604
case .business:
@@ -682,8 +670,6 @@ public enum PremiumPerk: CaseIterable {
682670
return strings.Premium_Business
683671
case .messageEffects:
684672
return strings.Premium_MessageEffects
685-
case .paidMessages:
686-
return strings.Premium_PaidMessages
687673
case .todo:
688674
return strings.Premium_Todo
689675
case .businessLocation:
@@ -753,8 +739,6 @@ public enum PremiumPerk: CaseIterable {
753739
return strings.Premium_BusinessInfo
754740
case .messageEffects:
755741
return strings.Premium_MessageEffectsInfo
756-
case .paidMessages:
757-
return strings.Premium_PaidMessagesInfo
758742
case .todo:
759743
return strings.Premium_TodoInfo
760744
case .businessLocation:
@@ -824,8 +808,6 @@ public enum PremiumPerk: CaseIterable {
824808
return "Premium/Perk/Business"
825809
case .messageEffects:
826810
return "Premium/Perk/MessageEffects"
827-
case .paidMessages:
828-
return "Premium/Perk/PaidMessages"
829811
case .todo:
830812
return "Premium/Perk/Todo"
831813
case .businessLocation:
@@ -866,7 +848,6 @@ struct PremiumIntroConfiguration {
866848
.colors,
867849
.wallpapers,
868850
.profileBadge,
869-
.paidMessages,
870851
.messagePrivacy,
871852
.advancedChatManagement,
872853
.noAds,
@@ -2171,8 +2152,6 @@ private final class PremiumIntroScreenContentComponent: CombinedComponent {
21712152
demoSubject = .messagePrivacy
21722153
case .messageEffects:
21732154
demoSubject = .messageEffects
2174-
case .paidMessages:
2175-
demoSubject = .paidMessages
21762155
case .todo:
21772156
demoSubject = .todo
21782157
case .business:

‎submodules/PremiumUI/Sources/PremiumLimitsListScreen.swift

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -843,24 +843,6 @@ public class PremiumLimitsListScreen: ViewController {
843843
)
844844
)
845845
)
846-
availableItems[.paidMessages] = DemoPagerComponent.Item(
847-
AnyComponentWithIdentity(
848-
id: PremiumDemoScreen.Subject.paidMessages,
849-
component: AnyComponent(
850-
PageComponent(
851-
content: AnyComponent(PhoneDemoComponent(
852-
context: context,
853-
position: .top,
854-
videoFile: videos["paid_messages"],
855-
decoration: .badgeStars
856-
)),
857-
title: strings.Premium_PaidMessages,
858-
text: strings.Premium_PaidMessagesInfo,
859-
textColor: textColor
860-
)
861-
)
862-
)
863-
)
864846

865847
availableItems[.todo] = DemoPagerComponent.Item(
866848
AnyComponentWithIdentity(

‎submodules/SettingsUI/Sources/Privacy and Security/IncomingMessagePrivacyScreen.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ public func incomingMessagePrivacyScreen(context: AccountContext, value: GlobalP
363363
openPremiumInfo: {
364364
var replaceImpl: ((ViewController) -> Void)?
365365
let controller = context.sharedContext.makePremiumDemoController(context: context, subject: .messagePrivacy, forceDark: false, action: {
366-
let controller = context.sharedContext.makePremiumIntroController(context: context, source: .paidMessages, forceDark: false, dismissed: nil)
366+
let controller = context.sharedContext.makePremiumIntroController(context: context, source: .messageEffects, forceDark: false, dismissed: nil)
367367
replaceImpl?(controller)
368368
}, dismissed: nil)
369369
replaceImpl = { [weak controller] c in

‎submodules/StatisticsUI/Sources/ChannelStatsController.swift

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1165,15 +1165,20 @@ private enum StatsEntry: ItemListNodeEntry {
11651165
detailText = "\(fromDateString) – \(toDateString)"
11661166
}
11671167
} else if case .fragment = transaction.peer {
1168-
title = NSAttributedString(string: presentationData.strings.Monetization_Transaction_Withdrawal("Fragment").string, font: font, textColor: theme.list.itemPrimaryTextColor)
1169-
labelColor = theme.list.itemDestructiveColor
1170-
if transaction.flags.contains(.isPending) {
1171-
detailText = presentationData.strings.Monetization_Transaction_Pending
1172-
} else if transaction.flags.contains(.isFailed) {
1173-
detailText = stringForMediumCompactDate(timestamp: transaction.date, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, withTime: false) + " – \(presentationData.strings.Monetization_Transaction_Failed)"
1174-
detailColor = .destructive
1175-
} else {
1168+
if transaction.flags.contains(.isRefund) {
1169+
title = NSAttributedString(string: presentationData.strings.Monetization_Transaction_Refund, font: font, textColor: theme.list.itemPrimaryTextColor)
11761170
detailText = stringForMediumCompactDate(timestamp: transaction.date, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat)
1171+
} else {
1172+
title = NSAttributedString(string: presentationData.strings.Monetization_Transaction_Withdrawal("Fragment").string, font: font, textColor: theme.list.itemPrimaryTextColor)
1173+
labelColor = theme.list.itemDestructiveColor
1174+
if transaction.flags.contains(.isPending) {
1175+
detailText = presentationData.strings.Monetization_Transaction_Pending
1176+
} else if transaction.flags.contains(.isFailed) {
1177+
detailText = stringForMediumCompactDate(timestamp: transaction.date, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat, withTime: false) + " – \(presentationData.strings.Monetization_Transaction_Failed)"
1178+
detailColor = .destructive
1179+
} else {
1180+
detailText = stringForMediumCompactDate(timestamp: transaction.date, strings: presentationData.strings, dateTimeFormat: presentationData.dateTimeFormat)
1181+
}
11771182
}
11781183
} else if transaction.flags.contains(.isRefund) {
11791184
title = NSAttributedString(string: presentationData.strings.Monetization_Transaction_Refund, font: font, textColor: theme.list.itemPrimaryTextColor)

‎submodules/StatisticsUI/Sources/TransactionInfoScreen.swift

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -145,20 +145,28 @@ private final class SheetContent: CombinedComponent {
145145
explorerUrl = nil
146146
showPeer = true
147147
} else if case .fragment = component.transaction.peer {
148-
labelColor = theme.list.itemDestructiveColor
149-
amountString = tonAmountAttributedString(formatTonAmountText(component.transaction.count.amount.value, dateTimeFormat: dateTimeFormat), integralFont: integralFont, fractionalFont: fractionalFont, color: labelColor, decimalSeparator: dateTimeFormat.decimalSeparator).mutableCopy() as! NSMutableAttributedString
150-
dateString = stringForFullDate(timestamp: component.transaction.date, strings: strings, dateTimeFormat: dateTimeFormat)
151-
152-
if component.transaction.flags.contains(.isPending) {
153-
titleString = strings.Monetization_TransactionInfo_Pending
148+
if component.transaction.flags.contains(.isRefund) {
149+
labelColor = theme.list.itemDisclosureActions.constructive.fillColor
150+
titleString = strings.Monetization_TransactionInfo_Refund
151+
amountString = tonAmountAttributedString(formatTonAmountText(component.transaction.count.amount.value, dateTimeFormat: dateTimeFormat, showPlus: true), integralFont: integralFont, fractionalFont: fractionalFont, color: labelColor, decimalSeparator: dateTimeFormat.decimalSeparator).mutableCopy() as! NSMutableAttributedString
152+
dateString = stringForFullDate(timestamp: component.transaction.date, strings: strings, dateTimeFormat: dateTimeFormat)
154153
buttonTitle = strings.Common_OK
155-
} else if component.transaction.flags.contains(.isFailed) {
156-
titleString = strings.Monetization_TransactionInfo_Failed
157-
buttonTitle = strings.Common_OK
158-
titleColor = theme.list.itemDestructiveColor
159154
} else {
160-
titleString = strings.Monetization_TransactionInfo_Withdrawal("Fragment").string
161-
buttonTitle = strings.Monetization_TransactionInfo_ViewInExplorer
155+
labelColor = theme.list.itemDestructiveColor
156+
amountString = tonAmountAttributedString(formatTonAmountText(component.transaction.count.amount.value, dateTimeFormat: dateTimeFormat), integralFont: integralFont, fractionalFont: fractionalFont, color: labelColor, decimalSeparator: dateTimeFormat.decimalSeparator).mutableCopy() as! NSMutableAttributedString
157+
dateString = stringForFullDate(timestamp: component.transaction.date, strings: strings, dateTimeFormat: dateTimeFormat)
158+
159+
if component.transaction.flags.contains(.isPending) {
160+
titleString = strings.Monetization_TransactionInfo_Pending
161+
buttonTitle = strings.Common_OK
162+
} else if component.transaction.flags.contains(.isFailed) {
163+
titleString = strings.Monetization_TransactionInfo_Failed
164+
buttonTitle = strings.Common_OK
165+
titleColor = theme.list.itemDestructiveColor
166+
} else {
167+
titleString = strings.Monetization_TransactionInfo_Withdrawal("Fragment").string
168+
buttonTitle = strings.Monetization_TransactionInfo_ViewInExplorer
169+
}
162170
}
163171
explorerUrl = component.transaction.transactionUrl
164172
} else if component.transaction.flags.contains(.isRefund) {

‎submodules/TelegramUI/Sources/SharedAccountContext.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2720,10 +2720,8 @@ public final class SharedAccountContextImpl: SharedAccountContext {
27202720
mappedSource = .messageEffects
27212721
case .animatedEmoji:
27222722
mappedSource = .animatedEmoji
2723-
case .paidMessages:
2724-
mappedSource = .paidMessages
27252723
case .todo:
2726-
mappedSource = .paidMessages
2724+
mappedSource = .todo
27272725
case let .auth(price):
27282726
mappedSource = .auth(price)
27292727
}
@@ -2800,8 +2798,6 @@ public final class SharedAccountContextImpl: SharedAccountContext {
28002798
mappedSubject = .folderTags
28012799
case .messageEffects:
28022800
mappedSubject = .messageEffects
2803-
case .paidMessages:
2804-
mappedSubject = .paidMessages
28052801
case .todo:
28062802
mappedSubject = .todo
28072803
case .business:

0 commit comments

Comments
 (0)