ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c8d3af62fdb880f65fe4fb0e274cf2e1a45bcd41'

Browse Source
This commit is contained in:
Ali 2021-12-24 18:34:26 +04:00
commit 9ae71e61bf
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
submodules/TelegramUI/Sources/ChatMessageInstantVideoItemNode.swift
View File

@ -1343,6 +1343,13 @@ class ChatMessageInstantVideoItemNode: ChatMessageItemView, UIGestureRecognizerD
if let reactionButtonsNode = self.reactionButtonsNode { if let reactionButtonsNode = self.reactionButtonsNode {
let reactionButtonsSize = reactionButtonsNode.frame.size let reactionButtonsSize = reactionButtonsNode.frame.size
let reactionButtonsFrame = CGRect(origin: CGPoint(x: videoFrame.minX, y: videoFrame.maxY + 6.0), size: reactionButtonsSize) let reactionButtonsFrame = CGRect(origin: CGPoint(x: videoFrame.minX, y: videoFrame.maxY + 6.0), size: reactionButtonsSize)
if !incoming {
reactionButtonsFrame.origin.x = videoFrame.maxX - reactionButtonsSize.width
}
if let actionButtonsNode = self.actionButtonsNode {
let actionButtonsSize = actionButtonsNode.frame.size
reactionButtonsFrame.origin.y += 4.0 + actionButtonsSize.height
}
reactionButtonsNode.frame = reactionButtonsFrame reactionButtonsNode.frame = reactionButtonsFrame
} }
} }

1
submodules/TelegramUI/Sources/ChatRecentActionsFilterController.swift
View File

@ -277,7 +277,6 @@ private func channelRecentActionsFilterControllerEntries(presentationData: Prese
([.invites], presentationData.strings.Channel_AdminLogFilter_EventsInviteLinks), ([.invites], presentationData.strings.Channel_AdminLogFilter_EventsInviteLinks),
([.deleteMessages], presentationData.strings.Channel_AdminLogFilter_EventsDeletedMessages), ([.deleteMessages], presentationData.strings.Channel_AdminLogFilter_EventsDeletedMessages),
([.editMessages], presentationData.strings.Channel_AdminLogFilter_EventsEditedMessages), ([.editMessages], presentationData.strings.Channel_AdminLogFilter_EventsEditedMessages),
([.sendMessages], presentationData.strings.Channel_AdminLogFilter_EventsSentMessages),
([.pinnedMessages], presentationData.strings.Channel_AdminLogFilter_EventsPinned), ([.pinnedMessages], presentationData.strings.Channel_AdminLogFilter_EventsPinned),
([.leave], presentationData.strings.Channel_AdminLogFilter_EventsLeaving), ([.leave], presentationData.strings.Channel_AdminLogFilter_EventsLeaving),
([.calls], presentationData.strings.Channel_AdminLogFilter_EventsLiveStreams) ([.calls], presentationData.strings.Channel_AdminLogFilter_EventsLiveStreams)

4
submodules/TelegramUIPreferences/Sources/TranslationSettings.swift
View File

@ -8,7 +8,7 @@ public struct TranslationSettings: Codable, Equatable {
public var ignoredLanguages: [String]? public var ignoredLanguages: [String]?
public static var defaultSettings: TranslationSettings { public static var defaultSettings: TranslationSettings {
return TranslationSettings(showTranslate: true, ignoredLanguages: nil) return TranslationSettings(showTranslate: false, ignoredLanguages: nil)
} }
init(showTranslate: Bool, ignoredLanguages: [String]?) { init(showTranslate: Bool, ignoredLanguages: [String]?) {
@ -19,7 +19,7 @@ public struct TranslationSettings: Codable, Equatable {
public init(from decoder: Decoder) throws { public init(from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: StringCodingKey.self) let container = try decoder.container(keyedBy: StringCodingKey.self)
self.showTranslate = try container.decodeIfPresent(Bool.self, forKey: "showTranslate") ?? true self.showTranslate = try container.decodeIfPresent(Bool.self, forKey: "showTranslate") ?? false
self.ignoredLanguages = try container.decodeIfPresent([String].self, forKey: "ignoredLanguages") self.ignoredLanguages = try container.decodeIfPresent([String].self, forKey: "ignoredLanguages")
} }