diff --git a/submodules/PresentationDataUtils/Sources/SpecialTabBarIcons.swift b/submodules/PresentationDataUtils/Sources/SpecialTabBarIcons.swift index 0fa053ebd0..795da5bc1e 100644 --- a/submodules/PresentationDataUtils/Sources/SpecialTabBarIcons.swift +++ b/submodules/PresentationDataUtils/Sources/SpecialTabBarIcons.swift @@ -1,5 +1,5 @@ import Foundation public func useSpecialTabBarIcons() -> Bool { - return (Date(timeIntervalSince1970: 1581638400)...Date(timeIntervalSince1970: 1581724799)).contains(Date()) + return (Date(timeIntervalSince1970: 1608800400)...Date(timeIntervalSince1970: 1609545600)).contains(Date()) } diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift index 5519f41c0e..e7384f0e41 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatActionItem.swift @@ -149,7 +149,7 @@ class VoiceChatActionItemNode: ListViewItemNode { updatedTheme = item.presentationData.theme } - let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize) + let titleFont = Font.regular(17.0) var leftInset: CGFloat = 16.0 + params.leftInset if case .generic = item.icon { diff --git a/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift b/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift index 2fe5f9e7d8..9ddd978bdb 100644 --- a/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift +++ b/submodules/TelegramCallsUI/Sources/VoiceChatParticipantItem.swift @@ -297,8 +297,8 @@ class VoiceChatParticipantItemNode: ItemListRevealOptionsItemNode { let statusFontSize: CGFloat = floor(item.presentationData.fontSize.itemListBaseFontSize * 14.0 / 17.0) - let titleFont = Font.regular(item.presentationData.fontSize.itemListBaseFontSize) - let statusFont = Font.regular(statusFontSize) + let titleFont = Font.regular(17.0) + let statusFont = Font.regular(14.0) var titleAttributedString: NSAttributedString? var statusAttributedString: NSAttributedString? diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Calls@2x.png b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Calls@2x.png new file mode 100644 index 0000000000..3d12d7e27b Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Calls@2x.png differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Calls@3x.png b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Calls@3x.png new file mode 100644 index 0000000000..06f12c914e Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Calls@3x.png differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Contents.json index 6fe332016d..802b6afe81 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconCalls.imageset/Contents.json @@ -1,7 +1,18 @@ { "images" : [ { - "idiom" : "universal" + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Calls@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Calls@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Contents.json index 6fe332016d..b0d2ce266b 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Contents.json @@ -1,7 +1,18 @@ { "images" : [ { - "idiom" : "universal" + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Messages@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Messages@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Messages@2x.png b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Messages@2x.png new file mode 100644 index 0000000000..ffa49c3ae1 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Messages@2x.png differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Messages@3x.png b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Messages@3x.png new file mode 100644 index 0000000000..324a417e72 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconChats.imageset/Messages@3x.png differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contacts@2x.png b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contacts@2x.png new file mode 100644 index 0000000000..115d8526c5 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contacts@2x.png differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contacts@3x.png b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contacts@3x.png new file mode 100644 index 0000000000..aaddd096eb Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contacts@3x.png differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contents.json index 6fe332016d..1cc3b663ca 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconContacts.imageset/Contents.json @@ -1,7 +1,18 @@ { "images" : [ { - "idiom" : "universal" + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Contacts@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Contacts@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Contents.json index 6fe332016d..2ea1fc8abd 100644 --- a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Contents.json +++ b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Contents.json @@ -1,7 +1,18 @@ { "images" : [ { - "idiom" : "universal" + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "Settings@2x.png", + "idiom" : "universal", + "scale" : "2x" + }, + { + "filename" : "Settings@3x.png", + "idiom" : "universal", + "scale" : "3x" } ], "info" : { diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Settings@2x.png b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Settings@2x.png new file mode 100644 index 0000000000..c00ec0876d Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Settings@2x.png differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Settings@3x.png b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Settings@3x.png new file mode 100644 index 0000000000..27cad3a239 Binary files /dev/null and b/submodules/TelegramUI/Images.xcassets/Chat List/Tabs/Holiday/IconSettings.imageset/Settings@3x.png differ diff --git a/submodules/TelegramUI/Sources/ChatController.swift b/submodules/TelegramUI/Sources/ChatController.swift index 50b836c8f8..f2e2328cea 100644 --- a/submodules/TelegramUI/Sources/ChatController.swift +++ b/submodules/TelegramUI/Sources/ChatController.swift @@ -7164,7 +7164,7 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G self.saveInterfaceState(includeScrollState: false) } - if let navigationController = self.navigationController as? NavigationController, self.traceVisibility() && isTopmostChatController(self) { + if let navigationController = self.navigationController as? NavigationController, isTopmostChatController(self) { var voiceChatOverlayController: VoiceChatOverlayController? for controller in navigationController.globalOverlayControllers { if let controller = controller as? VoiceChatOverlayController {