Stars ref

Author: Isaac

submodules/AccountContext/Sources/AccountContext.swift

@@ -1104,7 +1104,7 @@ public protocol SharedAccountContext: AnyObject {
     func makeAffiliateProgramSetupScreenInitialData(context: AccountContext, peerId: EnginePeer.Id, mode: AffiliateProgramSetupScreenMode) -> Signal<AffiliateProgramSetupScreenInitialData, NoError>
     func makeAffiliateProgramSetupScreen(context: AccountContext, initialData: AffiliateProgramSetupScreenInitialData) -> ViewController
 
-    func makeAffiliateProgramJoinScreen(context: AccountContext, sourcePeer: EnginePeer, commissionPermille: Int32, programDuration: Int32?, mode: JoinAffiliateProgramScreenMode) -> ViewController
+    func makeAffiliateProgramJoinScreen(context: AccountContext, sourcePeer: EnginePeer, commissionPermille: Int32, programDuration: Int32?, revenuePerUser: Double, mode: JoinAffiliateProgramScreenMode) -> ViewController
 
     func makeDebugSettingsController(context: AccountContext?) -> ViewController?
 

submodules/AvatarNode/Sources/PeerAvatar.swift

@@ -299,7 +299,7 @@ public func peerAvatarImage(postbox: Postbox, network: Network, peerReference: P
                     if let cutoutRect {
                         context.setBlendMode(.copy)
                         context.setFillColor(UIColor.clear.cgColor)
-                        context.fillEllipse(in: cutoutRect)
+                        context.fillEllipse(in: cutoutRect.offsetBy(dx: 0.0, dy: size.height - cutoutRect.maxY - cutoutRect.height))
                     }
                 })
                 let unroundedImage: UIImage?

submodules/ComponentFlow/Source/Components/TransformContents.swift

@@ -0,0 +1,54 @@
+import Foundation
+import UIKit
+
+public final class TransformContents<ChildEnvironment: Equatable>: CombinedComponent {
+    public typealias EnvironmentType = ChildEnvironment
+
+    private let content: AnyComponent<ChildEnvironment>
+    private let fixedSize: CGSize?
+    private let translation: CGPoint
+
+    public init(content: AnyComponent<ChildEnvironment>, fixedSize: CGSize? = nil, translation: CGPoint) {
+        self.content = content
+        self.fixedSize = fixedSize
+        self.translation = translation
+    }
+
+    public static func ==(lhs: TransformContents<ChildEnvironment>, rhs: TransformContents<ChildEnvironment>) -> Bool {
+        if lhs.content != rhs.content {
+            return false
+        }
+        if lhs.fixedSize != rhs.fixedSize {
+            return false
+        }
+        if lhs.translation != rhs.translation {
+            return false
+        }
+        return true
+    }
+
+    public static var body: Body {
+        let child = Child(environment: ChildEnvironment.self)
+
+        return { context in
+            let child = child.update(
+                component: context.component.content,
+                environment: { context.environment[ChildEnvironment.self] },
+                availableSize: context.availableSize,
+                transition: context.transition
+            )
+
+            let size = context.component.fixedSize ?? child.size
+
+            var childFrame = child.size.centered(in: CGRect(origin: CGPoint(), size: size))
+            childFrame.origin.x += context.component.translation.x
+            childFrame.origin.y += context.component.translation.y
+
+            context.add(child
+                .position(childFrame.center)
+            )
+
+            return size
+        }
+    }
+}

submodules/Display/Source/TextNode.swift

@@ -2529,7 +2529,16 @@ open class TextNode: ASDisplayNode, TextNodeProtocol {
                             textColor = color
                         }
                     }
-                    if let textColor {
+                    if image.renderingMode == .alwaysOriginal {
+                        let imageRect = CGRect(origin: CGPoint(x: attachment.frame.midX - image.size.width * 0.5, y: attachment.frame.midY - image.size.height * 0.5 + 1.0), size: image.size).offsetBy(dx: lineFrame.minX, dy: lineFrame.minY)
+                        context.translateBy(x: imageRect.midX, y: imageRect.midY)
+                        context.scaleBy(x: 1.0, y: -1.0)
+                        context.translateBy(x: -imageRect.midX, y: -imageRect.midY)
+                        context.draw(image.cgImage!, in: imageRect)
+                        context.translateBy(x: imageRect.midX, y: imageRect.midY)
+                        context.scaleBy(x: 1.0, y: -1.0)
+                        context.translateBy(x: -imageRect.midX, y: -imageRect.midY)
+                    } else if let textColor {
                         if let tintedImage = generateTintedImage(image: image, color: textColor) {
                             let imageRect = CGRect(origin: CGPoint(x: attachment.frame.midX - tintedImage.size.width * 0.5, y: attachment.frame.midY - tintedImage.size.height * 0.5 + 1.0), size: tintedImage.size).offsetBy(dx: lineFrame.minX, dy: lineFrame.minY)
                             context.translateBy(x: imageRect.midX, y: imageRect.midY)

submodules/TelegramUI/Components/Chat/ChatMessageInteractiveMediaNode/Sources/ChatMessageInteractiveMediaNode.swift

@@ -798,7 +798,7 @@ public final class ChatMessageInteractiveMediaNode: ASDisplayNode, GalleryItemTr
 
             var useInlineHLS = true
             if let data = context.currentAppConfiguration.with({ $0 }).data {
-                if let value = data["ios_inline_hls"] as? Double {
+                if let value = data["ios_inline_hls_v2"] as? Double {
                     useInlineHLS = value != 0.0
                 }
             }

submodules/TelegramUI/Components/PeerInfo/AffiliateProgramSetupScreen/Sources/AffiliateProgramSetupScreen.swift

@@ -368,6 +368,7 @@ If you end your affiliate program:
                     sourcePeer: bot.peer,
                     commissionPermille: bot.commissionPermille,
                     programDuration: bot.durationMonths,
+                    revenuePerUser: bot.participants == 0 ? 0.0 : Double(bot.revenue) / Double(bot.participants),
                     mode: .active(JoinAffiliateProgramScreenMode.Active(
                         targetPeer: targetPeer,
                         bot: bot,
@@ -1422,6 +1423,7 @@ If you end your affiliate program:
                                             sourcePeer: botPeer,
                                             commissionPermille: item.program.commissionPermille,
                                             programDuration: item.program.durationMonths,
+                                            revenuePerUser: item.program.dailyRevenuePerUser?.totalValue ?? 0.0,
                                             mode: .join(JoinAffiliateProgramScreenMode.Join(
                                                 initialTargetPeer: targetPeer,
                                                 canSelectTargetPeer: false,