Various improvements

Author: Isaac

submodules/AccountContext/Sources/AccountContext.swift

@@ -995,6 +995,11 @@ public enum SendInviteLinkScreenSubject {
     case groupCall(link: String)
 }
 
+public enum StarsWithdrawalScreenSubject {
+    case withdraw
+    case enterAmount(current: StarsAmount)
+}
+
 public protocol SharedAccountContext: AnyObject {
     var sharedContainerPath: String { get }
     var basePath: String { get }
@@ -1179,7 +1184,7 @@ public protocol SharedAccountContext: AnyObject {
     func makeStarsStatisticsScreen(context: AccountContext, peerId: EnginePeer.Id, revenueContext: StarsRevenueStatsContext) -> ViewController
     func makeStarsAmountScreen(context: AccountContext, initialValue: Int64?, completion: @escaping (Int64) -> Void) -> ViewController
     func makeStarsWithdrawalScreen(context: AccountContext, stats: StarsRevenueStats, completion: @escaping (Int64) -> Void) -> ViewController
-    func makeStarsWithdrawalScreen(context: AccountContext, completion: @escaping (Int64) -> Void) -> ViewController
+    func makeStarsWithdrawalScreen(context: AccountContext, subject: StarsWithdrawalScreenSubject, completion: @escaping (Int64) -> Void) -> ViewController
     func makeStarGiftResellScreen(context: AccountContext, update: Bool, completion: @escaping (Int64) -> Void) -> ViewController
     func makeStarsGiftScreen(context: AccountContext, message: EngineMessage) -> ViewController
     func makeStarsGiveawayBoostScreen(context: AccountContext, peerId: EnginePeer.Id, boost: ChannelBoostersContext.State.Boost) -> ViewController

submodules/PeerInfoUI/Sources/ChannelPermissionsController.swift

@@ -38,9 +38,10 @@ private final class ChannelPermissionsControllerArguments {
     let updateSlowmode: (Int32) -> Void
     let updateUnrestrictBoosters: (Int32) -> Void
     let updateStarsAmount: (StarsAmount?, Bool) -> Void
+    let openSetCustomStarsAmount: () -> Void
     let toggleIsOptionExpanded: (TelegramChatBannedRightsFlags) -> Void
 
-    init(context: AccountContext, updatePermission: @escaping (TelegramChatBannedRightsFlags, Bool) -> Void, setPeerIdWithRevealedOptions: @escaping (EnginePeer.Id?, EnginePeer.Id?) -> Void, addPeer: @escaping  () -> Void, removePeer: @escaping (EnginePeer.Id) -> Void, openPeer: @escaping (ChannelParticipant) -> Void, openPeerInfo: @escaping (EnginePeer) -> Void, openKicked: @escaping () -> Void, presentRestrictedPermissionAlert: @escaping (TelegramChatBannedRightsFlags) -> Void, presentConversionToBroadcastGroup: @escaping () -> Void, openChannelExample: @escaping () -> Void, updateSlowmode: @escaping (Int32) -> Void, updateUnrestrictBoosters: @escaping (Int32) -> Void, updateStarsAmount: @escaping (StarsAmount?, Bool) -> Void, toggleIsOptionExpanded: @escaping (TelegramChatBannedRightsFlags) -> Void) {
+    init(context: AccountContext, updatePermission: @escaping (TelegramChatBannedRightsFlags, Bool) -> Void, setPeerIdWithRevealedOptions: @escaping (EnginePeer.Id?, EnginePeer.Id?) -> Void, addPeer: @escaping  () -> Void, removePeer: @escaping (EnginePeer.Id) -> Void, openPeer: @escaping (ChannelParticipant) -> Void, openPeerInfo: @escaping (EnginePeer) -> Void, openKicked: @escaping () -> Void, presentRestrictedPermissionAlert: @escaping (TelegramChatBannedRightsFlags) -> Void, presentConversionToBroadcastGroup: @escaping () -> Void, openChannelExample: @escaping () -> Void, updateSlowmode: @escaping (Int32) -> Void, updateUnrestrictBoosters: @escaping (Int32) -> Void, updateStarsAmount: @escaping (StarsAmount?, Bool) -> Void, openSetCustomStarsAmount: @escaping () -> Void, toggleIsOptionExpanded: @escaping (TelegramChatBannedRightsFlags) -> Void) {
         self.context = context
         self.updatePermission = updatePermission
         self.addPeer = addPeer
@@ -55,6 +56,7 @@ private final class ChannelPermissionsControllerArguments {
         self.updateSlowmode = updateSlowmode
         self.updateUnrestrictBoosters = updateUnrestrictBoosters
         self.updateStarsAmount = updateStarsAmount
+        self.openSetCustomStarsAmount = openSetCustomStarsAmount
         self.toggleIsOptionExpanded = toggleIsOptionExpanded
     }
 }
@@ -427,7 +429,7 @@ private enum ChannelPermissionsEntry: ItemListNodeEntry {
             case let .messagePrice(_, value, maxValue, price):
                 return MessagePriceItem(theme: presentationData.theme, strings: presentationData.strings, isEnabled: true, minValue: 1, maxValue: maxValue, value: value, price: price, sectionId: self.section, updated: { value, apply in
                     arguments.updateStarsAmount(StarsAmount(value: value, nanos: 0), apply)
-                })
+                }, openSetCustom: nil)
             case let .messagePriceInfo(_, value):
                 return ItemListTextItem(presentationData: presentationData, text: .plain(value), sectionId: self.section)
             case let .unrestrictBoostersSwitch(_, title, value):
@@ -1267,6 +1269,7 @@ public func channelPermissionsController(context: AccountContext, updatedPresent
                 |> deliverOnMainQueue).start())
             })
         }
+    }, openSetCustomStarsAmount: {
     }, toggleIsOptionExpanded: { flags in
         updateState { state in
             var state = state

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

@@ -20,21 +20,24 @@ private final class IncomingMessagePrivacyScreenArguments {
     let infoLinkAction: () -> Void
     let openExceptions: () -> Void
     let openPremiumInfo: () -> Void
+    let openSetCustomStarsAmount: () -> Void
 
     init(
         context: AccountContext,
         updateValue: @escaping (GlobalPrivacySettings.NonContactChatsPrivacy) -> Void,
         disabledValuePressed: @escaping () -> Void,
         infoLinkAction: @escaping () -> Void,
         openExceptions: @escaping () -> Void,
-        openPremiumInfo: @escaping () -> Void
+        openPremiumInfo: @escaping () -> Void,
+        openSetCustomStarsAmount: @escaping () -> Void
     ) {
         self.context = context
         self.updateValue = updateValue
         self.disabledValuePressed = disabledValuePressed
         self.infoLinkAction = infoLinkAction
         self.openExceptions = openExceptions
         self.openPremiumInfo = openPremiumInfo
+        self.openSetCustomStarsAmount = openSetCustomStarsAmount
     }
 }
 
@@ -151,6 +154,8 @@ private enum GlobalAutoremoveEntry: ItemListNodeEntry {
         case let .price(value, maxValue, price, isEnabled):
             return MessagePriceItem(theme: presentationData.theme, strings: presentationData.strings, isEnabled: isEnabled, minValue: 1, maxValue: maxValue, value: value, price: price, sectionId: self.section, updated: { value, _ in
                 arguments.updateValue(.paidMessages(StarsAmount(value: value, nanos: 0)))
+            }, openSetCustom: {
+                arguments.openSetCustomStarsAmount()
             }, openPremiumInfo: {
                 arguments.openPremiumInfo()
             })
@@ -365,6 +370,20 @@ public func incomingMessagePrivacyScreen(context: AccountContext, value: GlobalP
                 controller?.replace(with: c)
             }
             pushControllerImpl?(controller)
+        },
+        openSetCustomStarsAmount: {
+            var currentAmount: StarsAmount = StarsAmount(value: 1, nanos: 0)
+            if case let .paidMessages(value) = stateValue.with({ $0 }).updatedValue {
+                currentAmount = value
+            }
+            let starsScreen = context.sharedContext.makeStarsWithdrawalScreen(context: context, subject: .enterAmount(current: currentAmount), completion: { amount in
+                updateState { state in
+                    var state = state
+                    state.updatedValue = .paidMessages(StarsAmount(value: amount, nanos: 0))
+                    return state
+                }
+            })
+            pushControllerImpl?(starsScreen)
         }
     )
 

submodules/TelegramCallsUI/BUILD

@@ -121,6 +121,7 @@ swift_library(
         "//submodules/FastBlur",
         "//submodules/InviteLinksUI",
         "//third-party/td:TdBinding",
+        "//submodules/TelegramUI/Components/AnimatedTextComponent",
     ],
     visibility = [
         "//visibility:public",