mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-11-07 17:30:12 +00:00
Merge commit '19007dfbcb31e7f1a811b22381d374f7b572b741'
This commit is contained in:
commit
fb2d16a75e
@ -1083,7 +1083,8 @@ private final class TimePickerNode: ASDisplayNode {
|
|||||||
|
|
||||||
init(theme: DatePickerTheme, date: Date, valueChanged: @escaping (Date) -> Void) {
|
init(theme: DatePickerTheme, date: Date, valueChanged: @escaping (Date) -> Void) {
|
||||||
self.theme = theme
|
self.theme = theme
|
||||||
|
UILabel.setDateLabel(theme.textColor)
|
||||||
|
|
||||||
self.valueChanged = valueChanged
|
self.valueChanged = valueChanged
|
||||||
|
|
||||||
self.pickerView = UIDatePicker()
|
self.pickerView = UIDatePicker()
|
||||||
|
|||||||
@ -208,16 +208,7 @@ public enum PresentationResourceKey: Int32 {
|
|||||||
case chatInputSearchPanelDownDisabledImage
|
case chatInputSearchPanelDownDisabledImage
|
||||||
case chatInputSearchPanelCalendarImage
|
case chatInputSearchPanelCalendarImage
|
||||||
case chatInputSearchPanelMembersImage
|
case chatInputSearchPanelMembersImage
|
||||||
|
|
||||||
case chatTitlePanelInfoImage
|
|
||||||
case chatTitlePanelSearchImage
|
|
||||||
case chatTitlePanelUnarchiveImage
|
|
||||||
case chatTitlePanelMuteImage
|
|
||||||
case chatTitlePanelUnmuteImage
|
|
||||||
case chatTitlePanelCallImage
|
|
||||||
case chatTitlePanelReportImage
|
|
||||||
case chatTitlePanelGroupingImage
|
|
||||||
|
|
||||||
case chatHistoryNavigationButtonImage
|
case chatHistoryNavigationButtonImage
|
||||||
case chatHistoryMentionsButtonImage
|
case chatHistoryMentionsButtonImage
|
||||||
case chatHistoryReactionsButtonImage
|
case chatHistoryReactionsButtonImage
|
||||||
|
|||||||
@ -777,61 +777,7 @@ public struct PresentationResourcesChat {
|
|||||||
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Input/Search/Members"), color: theme.chat.inputPanel.panelControlAccentColor)
|
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? {
|
public static func chatMessageAttachedContentButtonIncoming(_ theme: PresentationTheme) -> UIImage? {
|
||||||
return theme.image(PresentationResourceKey.chatMessageAttachedContentButtonIncoming.rawValue, { theme in
|
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)
|
return generateStretchableFilledCircleImage(diameter: 16.0, color: nil, strokeColor: theme.chat.message.incoming.accentControlColor, strokeWidth: 1.0, backgroundColor: nil)
|
||||||
|
|||||||
@ -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"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 700 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.1 KiB |
@ -1,6 +0,0 @@
|
|||||||
{
|
|
||||||
"info" : {
|
|
||||||
"author" : "xcode",
|
|
||||||
"version" : 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"filename" : "ic_info.pdf"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"version" : 1,
|
|
||||||
"author" : "xcode"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"filename" : "ic_report.pdf"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"version" : 1,
|
|
||||||
"author" : "xcode"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"filename" : "ic_search (2).pdf"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"version" : 1,
|
|
||||||
"author" : "xcode"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"filename" : "ic_unarchive.pdf"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"version" : 1,
|
|
||||||
"author" : "xcode"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
@ -1,12 +0,0 @@
|
|||||||
{
|
|
||||||
"images" : [
|
|
||||||
{
|
|
||||||
"idiom" : "universal",
|
|
||||||
"filename" : "ic_unmute.pdf"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"info" : {
|
|
||||||
"version" : 1,
|
|
||||||
"author" : "xcode"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user