diff --git a/submodules/DatePickerNode/Sources/DatePickerNode.swift b/submodules/DatePickerNode/Sources/DatePickerNode.swift index eb5ee57272..2e411799d9 100644 --- a/submodules/DatePickerNode/Sources/DatePickerNode.swift +++ b/submodules/DatePickerNode/Sources/DatePickerNode.swift @@ -1083,7 +1083,8 @@ private final class TimePickerNode: ASDisplayNode { init(theme: DatePickerTheme, date: Date, valueChanged: @escaping (Date) -> Void) { self.theme = theme - + UILabel.setDateLabel(theme.textColor) + self.valueChanged = valueChanged self.pickerView = UIDatePicker() diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift index 00dbfccf2f..91719b2439 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourceKey.swift @@ -208,16 +208,7 @@ public enum PresentationResourceKey: Int32 { case chatInputSearchPanelDownDisabledImage case chatInputSearchPanelCalendarImage case chatInputSearchPanelMembersImage - - case chatTitlePanelInfoImage - case chatTitlePanelSearchImage - case chatTitlePanelUnarchiveImage - case chatTitlePanelMuteImage - case chatTitlePanelUnmuteImage - case chatTitlePanelCallImage - case chatTitlePanelReportImage - case chatTitlePanelGroupingImage - + case chatHistoryNavigationButtonImage case chatHistoryMentionsButtonImage case chatHistoryReactionsButtonImage diff --git a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift index 041ad859be..bd8fdd22d6 100644 --- a/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift +++ b/submodules/TelegramPresentationData/Sources/Resources/PresentationResourcesChat.swift @@ -777,61 +777,7 @@ public struct PresentationResourcesChat { return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Search/Members"), color: theme.chat.inputPanel.panelControlAccentColor) }) } - - public static func chatTitlePanelInfoImage(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.chatTitlePanelInfoImage.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Title Panels/InfoIcon"), color: theme.chat.inputPanel.panelControlAccentColor) - }) - } - - public static func chatTitlePanelSearchImage(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.chatTitlePanelSearchImage.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Title Panels/SearchIcon"), color: theme.chat.inputPanel.panelControlAccentColor) - }) - } - - public static func chatTitlePanelUnarchiveImage(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.chatTitlePanelUnarchiveImage.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Title Panels/UnarchiveIcon"), color: theme.chat.inputPanel.panelControlAccentColor) - }) - } - - public static func chatTitlePanelMuteImage(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.chatTitlePanelMuteImage.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Title Panels/MuteIcon"), color: theme.chat.inputPanel.panelControlAccentColor) - }) - } - - public static func chatTitlePanelUnmuteImage(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.chatTitlePanelUnmuteImage.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Title Panels/UnmuteIcon"), color: theme.chat.inputPanel.panelControlAccentColor) - }) - } - - public static func chatTitlePanelCallImage(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.chatTitlePanelCallImage.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Info/CallButton"), color: theme.chat.inputPanel.panelControlAccentColor) - }) - } - - public static func chatTitlePanelReportImage(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.chatTitlePanelReportImage.rawValue, { theme in - return generateTintedImage(image: UIImage(bundleImageName: "Chat/Title Panels/ReportIcon"), color: theme.chat.inputPanel.panelControlAccentColor) - }) - } - - public static func chatTitlePanelGroupingImage(_ theme: PresentationTheme) -> UIImage? { - return theme.image(PresentationResourceKey.chatTitlePanelGroupingImage.rawValue, { theme in - return generateImage(CGSize(width: 32.0, height: 32.0), rotatedContext: { size, context in - context.clear(CGRect(origin: CGPoint(), size: size)) - - if let image = generateTintedImage(image: UIImage(bundleImageName: "Chat List/RevealActionGroupIcon"), color: theme.chat.inputPanel.panelControlAccentColor) { - context.draw(image.cgImage!, in: CGRect(origin: CGPoint(x: floor((size.width - image.size.width) / 2.0), y: floor((size.height - image.size.height) / 2.0) - 3.0), size: image.size)) - } - }) - }) - } - + public static func chatMessageAttachedContentButtonIncoming(_ theme: PresentationTheme) -> UIImage? { return theme.image(PresentationResourceKey.chatMessageAttachedContentButtonIncoming.rawValue, { theme in return generateStretchableFilledCircleImage(diameter: 16.0, color: nil, strokeColor: theme.chat.message.incoming.accentControlColor, strokeWidth: 1.0, backgroundColor: nil) diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/Contents.json deleted file mode 100644 index 35d325bde8..0000000000 --- a/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "swipedown@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "swipedown@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/swipedown@2x.png b/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/swipedown@2x.png deleted file mode 100644 index de9b12ad3e..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/swipedown@2x.png and /dev/null differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/swipedown@3x.png b/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/swipedown@3x.png deleted file mode 100644 index 9d77813325..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Chat List/HidArchiveUndoIcon.imageset/swipedown@3x.png and /dev/null differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat List/New Folder/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat List/New Folder/Contents.json deleted file mode 100644 index 73c00596a7..0000000000 --- a/submodules/TelegramUI/Images.xcassets/Chat List/New Folder/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "author" : "xcode", - "version" : 1 - } -} diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/InfoIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/InfoIcon.imageset/Contents.json deleted file mode 100644 index e6e063985c..0000000000 --- a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/InfoIcon.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_info.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/InfoIcon.imageset/ic_info.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/InfoIcon.imageset/ic_info.pdf deleted file mode 100644 index 03335ea456..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/InfoIcon.imageset/ic_info.pdf and /dev/null differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/ReportIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/ReportIcon.imageset/Contents.json deleted file mode 100644 index 24bbabc041..0000000000 --- a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/ReportIcon.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_report.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/ReportIcon.imageset/ic_report.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/ReportIcon.imageset/ic_report.pdf deleted file mode 100644 index 1c2c0e01e2..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/ReportIcon.imageset/ic_report.pdf and /dev/null differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/SearchIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/SearchIcon.imageset/Contents.json deleted file mode 100644 index 3c915fe3da..0000000000 --- a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/SearchIcon.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_search (2).pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/SearchIcon.imageset/ic_search (2).pdf b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/SearchIcon.imageset/ic_search (2).pdf deleted file mode 100644 index c4c39f8062..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/SearchIcon.imageset/ic_search (2).pdf and /dev/null differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnarchiveIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnarchiveIcon.imageset/Contents.json deleted file mode 100644 index 296d3314b2..0000000000 --- a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnarchiveIcon.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_unarchive.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnarchiveIcon.imageset/ic_unarchive.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnarchiveIcon.imageset/ic_unarchive.pdf deleted file mode 100644 index 97e2691eb7..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnarchiveIcon.imageset/ic_unarchive.pdf and /dev/null differ diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnmuteIcon.imageset/Contents.json b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnmuteIcon.imageset/Contents.json deleted file mode 100644 index 4cb9422c0f..0000000000 --- a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnmuteIcon.imageset/Contents.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "filename" : "ic_unmute.pdf" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnmuteIcon.imageset/ic_unmute.pdf b/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnmuteIcon.imageset/ic_unmute.pdf deleted file mode 100644 index e121627695..0000000000 Binary files a/submodules/TelegramUI/Images.xcassets/Chat/Title Panels/UnmuteIcon.imageset/ic_unmute.pdf and /dev/null differ