Merge commit '85b6a8ffe96bf8a5b1c7c5b5180024bc07770ba2'

Author: Isaac

Telegram/Telegram-iOS/en.lproj/Localizable.strings

@@ -13218,3 +13218,6 @@ Sorry for the inconvenience.";
 "Gift.Convert.Period.Unavailable.Text" = "Sorry, you can't convert this gift.\n\nStars can only be claimed within %@ after receiving a gift.";
 "Gift.Convert.Period.Unavailable.Days_1" = "%@ day";
 "Gift.Convert.Period.Unavailable.Days_any" = "%@ days";
+
+"Gift.Send.TitleTo" = "Gift to %@";
+"Gift.Send.SendShort" = "Send";

submodules/AccountContext/Sources/AccountContext.swift

@@ -278,6 +278,12 @@ public enum StickerPackUrlType {
     case emoji
 }
 
+public enum ResolvedStartAppMode {
+    case generic
+    case compact
+    case fullscreen
+}
+
 public enum ResolvedUrl {
     case externalUrl(String)
     case urlAuth(String)
@@ -1044,7 +1050,7 @@ public protocol SharedAccountContext: AnyObject {
     func makeMiniAppListScreenInitialData(context: AccountContext) -> Signal<MiniAppListScreenInitialData, NoError>
     func makeMiniAppListScreen(context: AccountContext, initialData: MiniAppListScreenInitialData) -> ViewController
 
-    func openWebApp(context: AccountContext, parentController: ViewController, updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?, peer: EnginePeer, threadId: Int64?, buttonText: String, url: String, simple: Bool, source: ChatOpenWebViewSource, skipTermsOfService: Bool, payload: String?)
+    func openWebApp(context: AccountContext, parentController: ViewController, updatedPresentationData: (initial: PresentationData, signal: Signal<PresentationData, NoError>)?, botPeer: EnginePeer, chatPeer: EnginePeer?, threadId: Int64?, buttonText: String, url: String, simple: Bool, source: ChatOpenWebViewSource, skipTermsOfService: Bool, payload: String?)
 
     func makeDebugSettingsController(context: AccountContext?) -> ViewController?
 

submodules/AccountContext/Sources/ChatController.swift

@@ -301,13 +301,13 @@ public struct ChatControllerInitialBotAppStart {
     public let botApp: BotApp?
     public let payload: String?
     public let justInstalled: Bool
-    public let compact: Bool
+    public let mode: ResolvedStartAppMode
 
-    public init(botApp: BotApp?, payload: String?, justInstalled: Bool, compact: Bool) {
+    public init(botApp: BotApp?, payload: String?, justInstalled: Bool, mode: ResolvedStartAppMode) {
         self.botApp = botApp
         self.payload = payload
         self.justInstalled = justInstalled
-        self.compact = compact
+        self.mode = mode
     }
 }
 

submodules/AttachmentUI/Sources/AttachmentContainer.swift

@@ -524,7 +524,7 @@ final class AttachmentContainer: ASDisplayNode, ASGestureRecognizerDelegate {
             }
 
             var containerTopInset: CGFloat
-            if isLandscape {
+            if isLandscape || controllers.last?.isFullscreen == true {
                 containerTopInset = 0.0
                 containerLayout = layout
 

submodules/AttachmentUI/Sources/AttachmentController.swift

@@ -124,7 +124,7 @@ public protocol AttachmentContainable: ViewController, MinimizableController {
     var isInnerPanGestureEnabled: (() -> Bool)? { get }
     var mediaPickerContext: AttachmentMediaPickerContext? { get }
     var getCurrentSendMessageContextMediaPreview: (() -> ChatSendMessageContextScreenMediaPreview?)? { get }
-    
+        
     func isContainerPanningUpdated(_ panning: Bool)
 
     func resetForReuse()
@@ -165,6 +165,10 @@ public extension AttachmentContainable {
         return nil
     }
 
+    var isFullscreen: Bool {
+        return false
+    }
+    
     var minimizedTopEdgeOffset: CGFloat? {
         return nil
     }
@@ -363,6 +367,10 @@ public class AttachmentController: ViewController, MinimizableController {
     public var minimizedIcon: UIImage? {
         return self.mainController.minimizedIcon
     }
+    
+    public var isFullscreen: Bool {
+        return self.mainController.isFullscreen
+    }
 
     private final class Node: ASDisplayNode {
         private weak var controller: AttachmentController?
@@ -1268,6 +1276,10 @@ public class AttachmentController: ViewController, MinimizableController {
 
     public var ensureUnfocused = true
 
+    public func requestMinimize(topEdgeOffset: CGFloat?, initialVelocity: CGFloat?) {
+        self.node.minimize()
+    }
+    
     public override func dismiss(animated flag: Bool, completion: (() -> Void)? = nil) {
         if self.ensureUnfocused {
             self.view.endEditing(true)
@@ -1397,7 +1409,9 @@ public class AttachmentController: ViewController, MinimizableController {
     public func makeContentSnapshotView() -> UIView? {
         let snapshotView = self.view.snapshotView(afterScreenUpdates: false)
         if let contentSnapshotView = self.mainController.makeContentSnapshotView() {
-            contentSnapshotView.frame = contentSnapshotView.frame.offsetBy(dx: 0.0, dy: 64.0 + 56.0)
+            if !self.mainController.isFullscreen {
+                contentSnapshotView.frame = contentSnapshotView.frame.offsetBy(dx: 0.0, dy: 64.0 + 56.0)
+            }
             snapshotView?.addSubview(contentSnapshotView)
         }
         return snapshotView

submodules/BrowserUI/Sources/BrowserWebContent.swift

@@ -638,8 +638,11 @@ final class BrowserWebContent: UIView, BrowserContent, WKNavigationDelegate, WKU
             self.webView.reloadInputViews()
         }
 
-        self.webView.customBottomInset = safeInsets.bottom * (1.0 - insets.bottom / fullInsets.bottom)
-
+        if fullInsets.bottom.isZero {
+            self.webView.customBottomInset = safeInsets.bottom
+        } else {
+            self.webView.customBottomInset = safeInsets.bottom * (1.0 - insets.bottom / fullInsets.bottom)
+        }
 //        self.webView.scrollView.scrollIndicatorInsets = UIEdgeInsets(top: 0.0, left: -insets.left, bottom: 0.0, right: -insets.right)
 //        self.webView.scrollView.horizontalScrollIndicatorInsets = UIEdgeInsets(top: 0.0, left: -insets.left, bottom: 0.0, right: -insets.right)
 
@@ -1457,8 +1460,7 @@ final class BrowserWebContent: UIView, BrowserContent, WKNavigationDelegate, WKU
                 }
             }
 
-            if result.isEmpty, let webViewUrl = self.webView.url {
-                let schemeAndHostUrl = webViewUrl.deletingPathExtension()
+            if result.isEmpty, let webViewUrl = self.webView.url,  let schemeAndHostUrl = URL(string: "/", relativeTo: webViewUrl) {
                 let url = schemeAndHostUrl.appendingPathComponent("favicon.ico")
                 result.insert(Favicon(url: url.absoluteString, dimensions: nil))
             }

submodules/ChatListUI/Sources/ChatListSearchListPaneNode.swift

@@ -3816,7 +3816,8 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                                     context: self.context,
                                     parentController: parentController,
                                     updatedPresentationData: nil,
-                                    peer: peer,
+                                    botPeer: peer,
+                                    chatPeer: nil,
                                     threadId: nil,
                                     buttonText: "",
                                     url: "",
@@ -3840,7 +3841,8 @@ final class ChatListSearchListPaneNode: ASDisplayNode, ChatListSearchPaneNode {
                                 context: self.context,
                                 parentController: parentController,
                                 updatedPresentationData: nil,
-                                peer: peer,
+                                botPeer: peer,
+                                chatPeer: nil,
                                 threadId: nil,
                                 buttonText: "",
                                 url: "",

submodules/Display/Source/Navigation/MinimizedContainer.swift

@@ -30,6 +30,7 @@ public protocol MinimizableController: ViewController {
     var isMinimizable: Bool { get }
     var minimizedIcon: UIImage? { get }
     var minimizedProgress: Float? { get }
+    var isFullscreen: Bool { get }
 
     func requestMinimize(topEdgeOffset: CGFloat?, initialVelocity: CGFloat?)
     func makeContentSnapshotView() -> UIView?
@@ -41,6 +42,10 @@ public protocol MinimizableController: ViewController {
 }
 
 public extension MinimizableController {
+    var isFullscreen: Bool {
+        return false
+    }
+    
     var minimizedTopEdgeOffset: CGFloat? {
         return nil
     }

submodules/LegacyComponents/Sources/TGAttachmentCarouselItemView.m

@@ -920,6 +920,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
         }
 
         TGPhotoEditorController *controller = [[TGPhotoEditorController alloc] initWithContext:[windowManager context] item:editableItem intent:intent adjustments:nil caption:nil screenImage:thumbnailImage availableTabs:[TGPhotoEditorController defaultTabsForAvatarIntent:!_disableStickers] selectedTab:TGPhotoEditorCropTab];
+        controller.modalPresentationStyle = UIModalPresentationFullScreen;
         controller.editingContext = _editingContext;
         controller.stickersContext = _stickersContext;
         controller.dontHideStatusBar = true;

submodules/LegacyComponents/Sources/TGMediaAssetsPickerController.m

@@ -449,6 +449,7 @@ - (void)collectionView:(UICollectionView *)collectionView didSelectItemAtIndexPa
         }
 
         TGPhotoEditorController *controller = [[TGPhotoEditorController alloc] initWithContext:_context item:editableItem intent:intent adjustments:nil caption:nil screenImage:thumbnailImage availableTabs:[TGPhotoEditorController defaultTabsForAvatarIntent:_intent != TGMediaAssetsControllerSetSignupProfilePhotoIntent] selectedTab:TGPhotoEditorCropTab];
+        controller.modalPresentationStyle = UIModalPresentationFullScreen;
         controller.stickersContext = self.stickersContext;
         controller.editingContext = self.editingContext;
         controller.didFinishRenderingFullSizeImage = ^(UIImage *resultImage)