Contest UI 23

build-system/template_minimal_development_configuration.json

@@ -1,8 +1,8 @@
 {
-	"bundle_id": "org.{! a random string !}.Telegram",
-	"api_id": "{! get one at https://my.telegram.org/apps !}",
-	"api_hash": "{! get one at https://my.telegram.org/apps !}",
-	"team_id": "{! check README.md !}",
+	"bundle_id": "org.31375bc829c0233d.Telegraph",
+	"api_id": "8",
+	"api_hash": "7245de8e747a0d6fbe11f7cc14fcc0bb",
+	"team_id": "JTVJ6L7R86",
 	"app_center_id": "0",
 	"is_internal_build": "true",
 	"is_appstore_build": "false",

submodules/AccountContext/Sources/ChatController.swift

@@ -559,6 +559,17 @@ public enum ChatControllerPresentationMode: Equatable {
     case inline(NavigationController?)
 }
 
+public final class ChatListPreviewPresentationData {
+
+    public let sourceNodeAndRect: (() -> (ASDisplayNode, CGRect)?)
+    public let contentArea: (() -> (CGRect))
+
+    public init(sourceNodeAndRect: @escaping (() -> (ASDisplayNode, CGRect)?), contentArea: @escaping (() -> (CGRect))) {
+        self.sourceNodeAndRect = sourceNodeAndRect
+        self.contentArea = contentArea
+    }
+}
+
 public enum ChatPresentationInputQueryResult: Equatable {
     case stickers([FoundStickerItem])
     case hashtags([String])

submodules/AvatarNode/Sources/AvatarNode.swift

@@ -92,10 +92,11 @@ private func calculateColors(explicitColorIndex: Int?, peerId: EnginePeer.Id?, i
         } else if case let .archivedChatsIcon(hiddenByDefault) = icon, let theme = theme {
             let backgroundColors: (UIColor, UIColor)
             if hiddenByDefault {
-                backgroundColors = theme.chatList.unpinnedArchiveAvatarColor.backgroundColors.colors
-            } else {
-                backgroundColors = theme.chatList.pinnedArchiveAvatarColor.backgroundColors.colors
-            }
+                print("hidden by default")
+//                backgroundColors = theme.chatList.unpinnedArchiveAvatarColor.backgroundColors.colors
+            } //else {
+            backgroundColors = theme.chatList.pinnedArchiveAvatarColor.backgroundColors.colors
+//            }
             colors = [backgroundColors.1, backgroundColors.0]
         } else {
             colors = AvatarNode.grayscaleColors
@@ -348,12 +349,13 @@ public final class AvatarNode: ASDisplayNode {
             if let overrideImage = self.overrideImage, case let .archivedChatsIcon(hiddenByDefault) = overrideImage {
                 let backgroundColors: (UIColor, UIColor)
                 if hiddenByDefault {
-                    backgroundColors = theme.chatList.unpinnedArchiveAvatarColor.backgroundColors.colors
-                    iconColor = theme.chatList.unpinnedArchiveAvatarColor.foregroundColor
-                } else {
+//                    backgroundColors = theme.chatList.unpinnedArchiveAvatarColor.backgroundColors.colors
+//                    iconColor = theme.chatList.unpinnedArchiveAvatarColor.foregroundColor
+                    print("archieve hidden by default")
+                } //else {
                     backgroundColors = theme.chatList.pinnedArchiveAvatarColor.backgroundColors.colors
                     iconColor = theme.chatList.pinnedArchiveAvatarColor.foregroundColor
-                }
+//                }
                 let colors: NSArray = [backgroundColors.1.cgColor, backgroundColors.0.cgColor]
                 backgroundColor = backgroundColors.1.mixedWith(backgroundColors.0, alpha: 0.5)
                 animationBackgroundNode.image = generateGradientFilledCircleImage(diameter: self.imageNode.frame.width, colors: colors)
@@ -566,10 +568,11 @@ public final class AvatarNode: ASDisplayNode {
             if let parameters = parameters as? AvatarNodeParameters, parameters.icon != .none {
                 if case let .archivedChatsIcon(hiddenByDefault) = parameters.icon, let theme = parameters.theme {
                     if hiddenByDefault {
-                        iconColor = theme.chatList.unpinnedArchiveAvatarColor.foregroundColor
-                    } else {
+//                        iconColor = theme.chatList.unpinnedArchiveAvatarColor.foregroundColor
+
+                    } //else {
                         iconColor = theme.chatList.pinnedArchiveAvatarColor.foregroundColor
-                    }
+//                    }
                 }
             }
 

submodules/ChatListUI/BUILD

@@ -99,6 +99,7 @@ swift_library(
         "//submodules/TelegramUI/Components/Stories/AvatarStoryIndicatorComponent",
         "//submodules/TelegramUI/Components/PeerInfo/PeerInfoStoryGridScreen",
         "//submodules/TelegramUI/Components/Settings/ArchiveInfoScreen",
+        "//submodules/TelegramUI/Components/Chat/ChatAvatarNavigationNode",
     ],
     visibility = [
         "//visibility:public",

submodules/ChatListUI/Sources/ChatListController.swift

@@ -1098,10 +1098,10 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 }
 
                 if !didDisplayTip {
-                    #if DEBUG
-                    #else
+//                    #if DEBUG
+//                    #else
                     let _ = ApplicationSpecificNotice.setDisplayChatListArchiveTooltip(accountManager: self.context.sharedContext.accountManager).start()
-                    #endif
+//                    #endif
 
                     self.push(ArchiveInfoScreen(context: self.context, settings: settings))
                 }
@@ -1289,6 +1289,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 }
             }
 
+
             switch item.content {
             case let .groupReference(groupReference):
                 let chatListController = ChatListControllerImpl(context: strongSelf.context, location: .chatList(groupId: groupReference.groupId), controlsHistoryPreload: false, hideNetworkActivityStatus: true, previewing: true, enableDebugActions: false)
@@ -1304,33 +1305,66 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 case .chatList:
                     if case let .channel(channel) = peer.peer, channel.flags.contains(.isForum) {
                         if let threadId = threadId {
-                            let source: ContextContentSource
+//                            let source: ContextContentSource
                             let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .replyThread(message: ChatReplyThreadMessage(
                                 messageId: MessageId(peerId: peer.peerId, namespace: Namespaces.Message.Cloud, id: Int32(clamping: threadId)), channelMessageId: nil, isChannelPost: false, isForumPost: true, maxMessage: nil, maxReadIncomingMessageId: nil, maxReadOutgoingMessageId: nil, unreadCount: 0, initialFilledHoles: IndexSet(), initialAnchor: .automatic, isNotAvailable: false
                             )), subject: nil, botStart: nil, mode: .standard(previewing: true))
                             chatController.canReadHistory.set(false)
-                            source = .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController))
 
-                            let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: source, items: chatForumTopicMenuItems(context: strongSelf.context, peerId: peer.peerId, threadId: threadId, isPinned: nil, isClosed: nil, chatListController: strongSelf, joined: joined, canSelect: false) |> map { ContextController.Items(content: .list($0)) }, gesture: gesture)
-                            strongSelf.presentInGlobalOverlay(contextController)
+
+
+                            strongSelf.present(chatController, in: .window(.root), with: ChatListPreviewPresentationData(sourceNodeAndRect: {
+                                return (node, node.frame)
+                            }, contentArea: {
+                                let baseContentFrame = strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.frame
+                                if case let .known(topOffset) = strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.visibleContentOffset(),
+                                   case let .known(bottomOffset) = strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.visibleBottomContentOffset() {
+                                    return baseContentFrame.inset(by: .init(top: topOffset, left: .zero, bottom: bottomOffset, right: .zero))
+                                } else {
+                                    return baseContentFrame.inset(by: strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.headerInsets)
+                                }
+                            }))
+
+//                            source = .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController))
+
+
+//                            let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: source, items: chatForumTopicMenuItems(context: strongSelf.context, peerId: peer.peerId, threadId: threadId, isPinned: nil, isClosed: nil, chatListController: strongSelf, joined: joined, canSelect: false) |> map { ContextController.Items(content: .list($0)) }, gesture: gesture)
+//                            strongSelf.presentInGlobalOverlay(contextController)
                         } else {
                             let chatListController = ChatListControllerImpl(context: strongSelf.context, location: .forum(peerId: channel.id), controlsHistoryPreload: false, hideNetworkActivityStatus: true, previewing: true, enableDebugActions: false)
                             chatListController.navigationPresentation = .master
                             let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: .controller(ContextControllerContentSourceImpl(controller: chatListController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController)), items: chatContextMenuItems(context: strongSelf.context, peerId: peer.peerId, promoInfo: promoInfo, source: .chatList(filter: strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.chatListFilter), chatListController: strongSelf, joined: joined) |> map { ContextController.Items(content: .list($0)) }, gesture: gesture)
                             strongSelf.presentInGlobalOverlay(contextController)
                         }
                     } else {
-                        let source: ContextContentSource
-                        if let location = location {
-                            source = .location(ChatListContextLocationContentSource(controller: strongSelf, location: location))
-                        } else {
-                            let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(id: peer.peerId), subject: nil, botStart: nil, mode: .standard(previewing: true))
-                            chatController.canReadHistory.set(false)
-                            source = .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController))
-                        }
+//                        let source: ContextContentSource
+//                        if let location = location {
+//                            source = .location(ChatListContextLocationContentSource(controller: strongSelf, location: location))
+//                        } else {
+//                            let chatController = strongSelf.context.sharedContext.makeChatController(context: strongSelf.context, chatLocation: .peer(id: peer.peerId), subject: nil, botStart: nil, mode: .standard(previewing: true))
+//                            chatController.canReadHistory.set(false)
+//                        strongSelf.present(chatController, in: .window(.root), with: ChatListPreviewPresentationData(sourceNodeAndRect: {
+//                            return (node, node.frame)
+//                        }))
+
+                        let chatPreviewController = ChatListPreviewController(context: strongSelf.context, chatLocation: .peer(id: peer.peerId))
+                        strongSelf.present(chatPreviewController, in: .window(.root), with: ChatListPreviewPresentationData(sourceNodeAndRect: {
+                            return (node, node.frame)
+                        }, contentArea: {
+                            let baseContentFrame = strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.frame
+                            if case let .known(topOffset) = strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.visibleContentOffset(),
+                               case let .known(bottomOffset) = strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.visibleBottomContentOffset() {
+                                return baseContentFrame.inset(by: .init(top: topOffset, left: .zero, bottom: bottomOffset, right: .zero))
+                            } else {
+                                return baseContentFrame.inset(by: strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.headerInsets)
+                            }
+                        }))
+
+//                            source = .controller(ContextControllerContentSourceImpl(controller: chatController, sourceNode: node, navigationController: strongSelf.navigationController as? NavigationController))
+//                        }
 
-                        let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: source, items: chatContextMenuItems(context: strongSelf.context, peerId: peer.peerId, promoInfo: promoInfo, source: .chatList(filter: strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.chatListFilter), chatListController: strongSelf, joined: joined) |> map { ContextController.Items(content: .list($0)) }, gesture: gesture)
-                        strongSelf.presentInGlobalOverlay(contextController)
+//                        let contextController = ContextController(account: strongSelf.context.account, presentationData: strongSelf.presentationData, source: source, items: chatContextMenuItems(context: strongSelf.context, peerId: peer.peerId, promoInfo: promoInfo, source: .chatList(filter: strongSelf.chatListDisplayNode.mainContainerNode.currentItemNode.chatListFilter), chatListController: strongSelf, joined: joined) |> map { ContextController.Items(content: .list($0)) }, gesture: gesture)
+//                        strongSelf.presentInGlobalOverlay(contextController)
                     }
                 case let .forum(pinnedIndex, _, threadId, _, _):
                     let isPinned: Bool
@@ -4648,6 +4682,8 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 if updatedValue {
                     state.hiddenItemShouldBeTemporaryRevealed = false
                 }
+                state.archiveParams.updateVisibility(isRevealed: state.hiddenItemShouldBeTemporaryRevealed,
+                                                     isHiddenByDefault: updatedValue)
                 state.peerIdWithRevealedOptions = nil
                 return state
             }
@@ -5117,6 +5153,7 @@ public class ChatListControllerImpl: TelegramBaseController, ChatListController
                 strongSelf.chatListDisplayNode.effectiveContainerNode.updateState { state in
                     var state = state
                     state.hiddenItemShouldBeTemporaryRevealed = false
+                    state.archiveParams.updateVisibility(isRevealed: false)
                     return state
                 }