mirror of
https://github.com/Swiftgram/Telegram-iOS.git
synced 2025-10-09 03:20:48 +00:00
Various fixes
This commit is contained in:
parent
ba1c3c09d8
commit
b825d09009
@ -8080,3 +8080,18 @@ Sorry for the inconvenience.";
|
|||||||
"PeerInfo.LabelAllReactions" = "All Reactions";
|
"PeerInfo.LabelAllReactions" = "All Reactions";
|
||||||
|
|
||||||
"TextFormat.Format" = "Format";
|
"TextFormat.Format" = "Format";
|
||||||
|
|
||||||
|
"Group.Setup.PublicLink" = "PUBLIC LINK";
|
||||||
|
"Group.Setup.LinksOrder" = "LINKS ORDER";
|
||||||
|
"Group.Setup.LinksOrderInfo" = "Drag and drop links to change the order in which they will be displayed on the group info page.";
|
||||||
|
|
||||||
|
"Group.Setup.LinkActive" = "active";
|
||||||
|
"Group.Setup.LinkInactive" = "inactive";
|
||||||
|
|
||||||
|
"Channel.Setup.PublicLink" = "PUBLIC LINK";
|
||||||
|
"Channel.Setup.LinksOrder" = "LINKS ORDER";
|
||||||
|
"Channel.Setup.LinksOrderInfo" = "Drag and drop links to change the order in which they will be displayed on the channel info page.";
|
||||||
|
|
||||||
|
"Username.Username" = "USERNAME";
|
||||||
|
"Username.LinksOrder" = "USERNAMES ORDER";
|
||||||
|
"Username.LinksOrderInfo" = "Drag and drop links to change the order in which they will be displayed on your info page.";
|
||||||
|
@ -320,13 +320,4 @@ public enum DeviceMetrics: CaseIterable, Equatable {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public var maybeHasDynamicIsland: Bool {
|
|
||||||
switch self {
|
|
||||||
case .iPhone12, .iPhone12ProMax, .iPhone14Pro, .iPhone14ProMax:
|
|
||||||
return true
|
|
||||||
default:
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
@ -679,10 +679,10 @@ public class Window1 {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private func updateBadgeVisibility() {
|
private func updateBadgeVisibility() {
|
||||||
let badgeIsHidden = !self.deviceMetrics.hasTopNotch || self.deviceMetrics.hasDynamicIsland || self.deviceMetrics.maybeHasDynamicIsland || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height
|
let badgeIsHidden = !self.deviceMetrics.hasTopNotch || self.deviceMetrics.hasDynamicIsland || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height
|
||||||
if badgeIsHidden != self.badgeView.isHidden && !badgeIsHidden {
|
if badgeIsHidden != self.badgeView.isHidden && !badgeIsHidden {
|
||||||
Queue.mainQueue().after(0.4) {
|
Queue.mainQueue().after(0.4) {
|
||||||
let badgeShouldBeHidden = !self.deviceMetrics.hasTopNotch || self.deviceMetrics.hasDynamicIsland || self.deviceMetrics.maybeHasDynamicIsland || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height
|
let badgeShouldBeHidden = !self.deviceMetrics.hasTopNotch || self.deviceMetrics.hasDynamicIsland || self.forceBadgeHidden || self.windowLayout.size.width > self.windowLayout.size.height
|
||||||
if badgeShouldBeHidden == badgeIsHidden {
|
if badgeShouldBeHidden == badgeIsHidden {
|
||||||
self.badgeView.isHidden = badgeIsHidden
|
self.badgeView.isHidden = badgeIsHidden
|
||||||
}
|
}
|
||||||
|
@ -615,9 +615,11 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
|
|||||||
if media is TelegramMediaImage {
|
if media is TelegramMediaImage {
|
||||||
canEdit = true
|
canEdit = true
|
||||||
} else if let media = media as? TelegramMediaFile, !media.isAnimated {
|
} else if let media = media as? TelegramMediaFile, !media.isAnimated {
|
||||||
|
var isVideo = false
|
||||||
for attribute in media.attributes {
|
for attribute in media.attributes {
|
||||||
switch attribute {
|
switch attribute {
|
||||||
case let .Video(_, dimensions, _):
|
case let .Video(_, dimensions, _):
|
||||||
|
isVideo = true
|
||||||
if dimensions.height > 0 {
|
if dimensions.height > 0 {
|
||||||
if CGFloat(dimensions.width) / CGFloat(dimensions.height) > 1.33 {
|
if CGFloat(dimensions.width) / CGFloat(dimensions.height) > 1.33 {
|
||||||
canFullscreen = true
|
canFullscreen = true
|
||||||
@ -627,6 +629,10 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
|
|||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if !isVideo {
|
||||||
|
canEdit = true
|
||||||
|
}
|
||||||
} else if let media = media as? TelegramMediaWebpage, case let .Loaded(content) = media.content {
|
} else if let media = media as? TelegramMediaWebpage, case let .Loaded(content) = media.content {
|
||||||
let type = webEmbedType(content: content)
|
let type = webEmbedType(content: content)
|
||||||
switch type {
|
switch type {
|
||||||
|
@ -1045,6 +1045,7 @@ extension PresentationThemeChatList: Codable {
|
|||||||
try encodeColor(&values, self.itemBackgroundColor, .itemBg)
|
try encodeColor(&values, self.itemBackgroundColor, .itemBg)
|
||||||
try encodeColor(&values, self.pinnedItemBackgroundColor, .pinnedItemBg)
|
try encodeColor(&values, self.pinnedItemBackgroundColor, .pinnedItemBg)
|
||||||
try encodeColor(&values, self.itemHighlightedBackgroundColor, .itemHighlightedBg)
|
try encodeColor(&values, self.itemHighlightedBackgroundColor, .itemHighlightedBg)
|
||||||
|
try encodeColor(&values, self.pinnedItemHighlightedBackgroundColor, .pinnedItemHighlightedBg)
|
||||||
try encodeColor(&values, self.itemSelectedBackgroundColor, .itemSelectedBg)
|
try encodeColor(&values, self.itemSelectedBackgroundColor, .itemSelectedBg)
|
||||||
try encodeColor(&values, self.titleColor, .title)
|
try encodeColor(&values, self.titleColor, .title)
|
||||||
try encodeColor(&values, self.secretTitleColor, .secretTitle)
|
try encodeColor(&values, self.secretTitleColor, .secretTitle)
|
||||||
|
@ -929,9 +929,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
|
|||||||
}
|
}
|
||||||
|
|
||||||
var mediaReference: AnyMediaReference?
|
var mediaReference: AnyMediaReference?
|
||||||
for m in message.media {
|
for media in message.media {
|
||||||
if let image = m as? TelegramMediaImage {
|
if let image = media as? TelegramMediaImage {
|
||||||
mediaReference = AnyMediaReference.standalone(media: image)
|
mediaReference = AnyMediaReference.standalone(media: image)
|
||||||
|
} else if let file = media as? TelegramMediaFile {
|
||||||
|
mediaReference = AnyMediaReference.standalone(media: file)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2348,7 +2348,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
|
|||||||
let offset: CGFloat = incoming ? 42.0 : 0.0
|
let offset: CGFloat = incoming ? 42.0 : 0.0
|
||||||
|
|
||||||
if let selectionNode = self.selectionNode {
|
if let selectionNode = self.selectionNode {
|
||||||
selectionNode.updateSelected(selected, animated: false)
|
selectionNode.updateSelected(selected, animated: animated)
|
||||||
let selectionFrame = CGRect(origin: CGPoint(x: -offset, y: 0.0), size: CGSize(width: self.contentBounds.size.width, height: self.contentBounds.size.height))
|
let selectionFrame = CGRect(origin: CGPoint(x: -offset, y: 0.0), size: CGSize(width: self.contentBounds.size.width, height: self.contentBounds.size.height))
|
||||||
selectionNode.frame = selectionFrame
|
selectionNode.frame = selectionFrame
|
||||||
selectionNode.updateLayout(size: selectionFrame.size, leftInset: self.safeInsets.left)
|
selectionNode.updateLayout(size: selectionFrame.size, leftInset: self.safeInsets.left)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user