Merge commit 'eee28fae4c2cfeef500a0512f1dec9b92a126890'

# Conflicts:
#	Telegram/Telegram-iOS/en.lproj/Localizable.strings
This commit is contained in:
Isaac
2024-04-19 00:00:57 +04:00
42 changed files with 583 additions and 477 deletions

View File

@@ -9,7 +9,7 @@ import SwiftSignalKit
import TelegramPresentationData
import AccountContext
import AttachmentUI
import CounterContollerTitleView
import CounterControllerTitleView
import ContextUI
import PresentationDataUtils
import HexColor
@@ -1711,7 +1711,7 @@ public final class WebAppController: ViewController, AttachmentContainable {
return self.displayNode as! Node
}
private var titleView: CounterContollerTitleView?
private var titleView: CounterControllerTitleView?
fileprivate let cancelButtonNode: WebAppCancelButtonNode
fileprivate let moreButtonNode: MoreButtonNode
@@ -1782,8 +1782,8 @@ public final class WebAppController: ViewController, AttachmentContainable {
self.navigationItem.rightBarButtonItem?.action = #selector(self.moreButtonPressed)
self.navigationItem.rightBarButtonItem?.target = self
let titleView = CounterContollerTitleView(theme: self.presentationData.theme)
titleView.title = CounterContollerTitle(title: params.botName, counter: self.presentationData.strings.Bot_GenericBotStatus)
let titleView = CounterControllerTitleView(theme: self.presentationData.theme)
titleView.title = CounterControllerTitle(title: params.botName, counter: self.presentationData.strings.Bot_GenericBotStatus)
self.navigationItem.titleView = titleView
self.titleView = titleView