Various fixes

teamgram · Aug 2, 2024 · aff6322 · aff6322
1 parent 4a44c61
commit aff6322
Show file tree

Hide file tree

Showing 62 changed files with 1,377 additions and 810 deletions.
diff --git a/submodules/AccountContext/Sources/AccountContext.swift b/submodules/AccountContext/Sources/AccountContext.swift
@@ -305,6 +305,7 @@ public enum ResolvedUrl {
     case startAttach(peerId: PeerId, payload: String?, choose: ResolvedBotChoosePeerTypes?)
     case invoice(slug: String, invoice: TelegramMediaInvoice?)
     case premiumOffer(reference: String?)
+    case starsTopup(amount: Int64?)
     case chatFolder(slug: String)
     case story(peerId: PeerId, id: Int32)
     case boost(peerId: PeerId?, status: ChannelBoostStatus?, myBoostStatus: MyBoostStatus?)
@@ -755,7 +756,7 @@ public class MediaEditorTransitionOutExternalState {
 }
 
 public protocol MediaEditorScreenResult {
-
+    var target: Stories.PendingTarget { get }
 }
 
 public protocol TelegramRootControllerInterface: NavigationController {
@@ -963,7 +964,8 @@ public protocol SharedAccountContext: AnyObject {
     func presentContactsWarningSuppression(context: AccountContext, present: (ViewController, Any?) -> Void)
     func openImagePicker(context: AccountContext, completion: @escaping (UIImage) -> Void, present: @escaping (ViewController) -> Void)
     func openAddPeerMembers(context: AccountContext, updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?, parentController: ViewController, groupPeer: Peer, selectAddMemberDisposable: MetaDisposable, addMemberDisposable: MetaDisposable)
-    func openChatInstantPage(context: AccountContext, message: Message, sourcePeerType: MediaAutoDownloadPeerType?, navigationController: NavigationController)
+    func makeInstantPageController(context: AccountContext, message: Message, sourcePeerType: MediaAutoDownloadPeerType?) -> ViewController?
+    func makeInstantPageController(context: AccountContext, webPage: TelegramMediaWebpage, anchor: String?, sourceLocation: InstantPageSourceLocation) -> ViewController
     func openChatWallpaper(context: AccountContext, message: Message, present: @escaping (ViewController, Any?) -> Void)
 
     func makeRecentSessionsController(context: AccountContext, activeSessionsContext: ActiveSessionsContext) -> ViewController & RecentSessionsController

diff --git a/submodules/AccountContext/Sources/ChatController.swift b/submodules/AccountContext/Sources/ChatController.swift
@@ -292,12 +292,12 @@ public struct ChatControllerInitialAttachBotStart {
 }
 
 public struct ChatControllerInitialBotAppStart {
-    public let botApp: BotApp
+    public let botApp: BotApp?
     public let payload: String?
     public let justInstalled: Bool
     public let compact: Bool
 
-    public init(botApp: BotApp, payload: String?, justInstalled: Bool, compact: Bool) {
+    public init(botApp: BotApp?, payload: String?, justInstalled: Bool, compact: Bool) {
         self.botApp = botApp
         self.payload = payload
         self.justInstalled = justInstalled

diff --git a/submodules/AccountContext/Sources/Premium.swift b/submodules/AccountContext/Sources/Premium.swift
@@ -123,7 +123,7 @@ public enum BoostSubject: Equatable {
 }
 
 public enum StarsPurchasePurpose: Equatable {
-    case generic
+    case generic(requiredStars: Int64?)
     case transfer(peerId: EnginePeer.Id, requiredStars: Int64)
     case subscription(peerId: EnginePeer.Id, requiredStars: Int64, renew: Bool)
     case gift(peerId: EnginePeer.Id)

diff --git a/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift b/submodules/AnimatedStickerNode/Sources/AnimatedStickerNode.swift
@@ -653,7 +653,7 @@ public final class DefaultAnimatedStickerNodeImpl: ASDisplayNode, AnimatedSticke
 
                             strongSelf.frameUpdated(frame.index, frame.totalFrames)
                             strongSelf.currentFrameIndex = frame.index
-                            strongSelf.currentFrameCount = frame.totalFrames;
+                            strongSelf.currentFrameCount = frame.totalFrames
                             strongSelf.currentFrameRate = frameRate
 
                             if frame.isLastFrame {

diff --git a/submodules/AttachmentUI/Sources/AttachmentController.swift b/submodules/AttachmentUI/Sources/AttachmentController.swift
@@ -713,7 +713,7 @@ public class AttachmentController: ViewController, MinimizableController {
             }
             if case .ended = recognizer.state {
                 if let lastController = self.currentControllers.last {
-                    if let controller = self.controller, controller.shouldMinimizeOnSwipe?(self.currentType) == true {
+                    if let controller = self.controller, let layout = self.validLayout, !layout.metrics.isTablet, controller.shouldMinimizeOnSwipe?(self.currentType) == true {
                         self.minimize()
                         return
                     }

diff --git a/submodules/BrowserUI/BUILD b/submodules/BrowserUI/BUILD
@@ -48,6 +48,7 @@ swift_library(
         "//submodules/SearchBarNode",
         "//submodules/TelegramUI/Components/SaveProgressScreen",
         "//submodules/TelegramUI/Components/ListActionItemComponent",
+        "//submodules/Utils/DeviceModel",
     ],
     visibility = [
         "//visibility:public",

diff --git a/submodules/BrowserUI/Sources/BrowserAddressBarComponent.swift b/submodules/BrowserUI/Sources/BrowserAddressBarComponent.swift
@@ -281,15 +281,7 @@ final class AddressBarContentComponent: Component {
             }
             let isActive = self.textField?.isFirstResponder ?? false
 
-            var title: String = ""
-            if let parsedUrl = URL(string: component.url) {
-                title = parsedUrl.host ?? component.url
-                if title.hasPrefix("www.") {
-                    title.removeSubrange(title.startIndex ..< title.index(title.startIndex, offsetBy: 4))
-                }
-                title = title.idnaDecoded ?? title
-            }
-
+            let title = getDisplayUrl(component.url, hostOnly: true)
             self.update(theme: component.theme, strings: component.strings, size: availableSize, isActive: isActive, title: title.lowercased(), isSecure: component.isSecure, collapseFraction: collapseFraction, isTablet: component.metrics.isTablet, transition: transition)
 
             return availableSize
@@ -449,19 +441,7 @@ final class AddressBarContentComponent: Component {
                 textField.addTarget(self, action: #selector(self.textFieldChanged(_:)), for: .editingChanged)
             }
 
-            var address = self.component?.url ?? ""
-            if let components = URLComponents(string: address) {
-                if #available(iOS 16.0, *), let encodedHost = components.encodedHost {
-                    if let decodedHost = components.host, encodedHost != decodedHost {
-                        address = address.replacingOccurrences(of: encodedHost, with: decodedHost)
-                    }
-                } else if let encodedHost = components.host {
-                    if let decodedHost = components.host?.idnaDecoded, encodedHost != decodedHost {
-                        address = address.replacingOccurrences(of: encodedHost, with: decodedHost)
-                    }
-                }
-            }
-
+            let address = getDisplayUrl(self.component?.url ?? "", trim: false)
             if textField.text != address {
                 textField.text = address
                 self.clearIconView.isHidden = address.isEmpty

diff --git a/submodules/BrowserUI/Sources/BrowserAddressListItemComponent.swift b/submodules/BrowserUI/Sources/BrowserAddressListItemComponent.swift
@@ -176,23 +176,7 @@ final class BrowserAddressListItemComponent: Component {
             if case let .Loaded(content) = component.webPage.content {
                 title = content.title ?? content.url
 
-                var address = content.url
-                if let components = URLComponents(string: address) {
-                    if #available(iOS 16.0, *), let encodedHost = components.encodedHost {
-                        if let decodedHost = components.host, encodedHost != decodedHost {
-                            address = address.replacingOccurrences(of: encodedHost, with: decodedHost)
-                        }
-                    } else if let encodedHost = components.host {
-                        if let decodedHost = components.host?.idnaDecoded, encodedHost != decodedHost {
-                            address = address.replacingOccurrences(of: encodedHost, with: decodedHost)
-                        }
-                    }
-                }
-                address = address.replacingOccurrences(of: "https://www.", with: "")
-                address = address.replacingOccurrences(of: "https://", with: "")
-                address = address.replacingOccurrences(of: "tonsite://", with: "")
-                address = address.trimmingCharacters(in: CharacterSet(charactersIn: "/"))
-                subtitle = address
+                subtitle = getDisplayUrl(content.url)
 
                 parsedUrl = URL(string: content.url)
 

diff --git a/submodules/BrowserUI/Sources/BrowserBookmarksScreen.swift b/submodules/BrowserUI/Sources/BrowserBookmarksScreen.swift
@@ -367,7 +367,7 @@ public final class BrowserBookmarksScreen: ViewController {
 
         self.navigationItem.backBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Back, style: .plain, target: nil, action: nil)
 
-        self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Cancel, style: .plain, target: self, action: #selector(self.cancelPressed))
+        self.navigationItem.leftBarButtonItem = UIBarButtonItem(title: self.presentationData.strings.Common_Close, style: .plain, target: self, action: #selector(self.cancelPressed))
         self.title = self.presentationData.strings.WebBrowser_Bookmarks_Title
 
         self.searchContentNode = NavigationBarSearchContentNode(theme: self.presentationData.theme, placeholder: self.presentationData.strings.Common_Search, activate: { [weak self] in