ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-10-09 03:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2022-09-17 20:28:11 +03:00
parent ba1c3c09d8
commit b825d09009
7 changed files with 29 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Telegram/Telegram-iOS/en.lproj/Localizable.strings
View File

@ -8080,3 +8080,18 @@ Sorry for the inconvenience.";
"PeerInfo.LabelAllReactions" = "All Reactions";
"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.";

9
submodules/Display/Source/DeviceMetrics.swift
View File

@ -320,13 +320,4 @@ public enum DeviceMetrics: CaseIterable, Equatable {
return false
}
}
public var maybeHasDynamicIsland: Bool {
switch self {
case .iPhone12, .iPhone12ProMax, .iPhone14Pro, .iPhone14ProMax:
return true
default:
return false
}
}
}

4
submodules/Display/Source/WindowContent.swift
View File

@ -679,10 +679,10 @@ public class Window1 {
}
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 {
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 {
self.badgeView.isHidden = badgeIsHidden
}

6
submodules/GalleryUI/Sources/ChatItemGalleryFooterContentNode.swift
View File

@ -615,9 +615,11 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
if media is TelegramMediaImage {
canEdit = true
} else if let media = media as? TelegramMediaFile, !media.isAnimated {
var isVideo = false
for attribute in media.attributes {
switch attribute {
case let .Video(_, dimensions, _):
isVideo = true
if dimensions.height > 0 {
if CGFloat(dimensions.width) / CGFloat(dimensions.height) > 1.33 {
canFullscreen = true
@ -627,6 +629,10 @@ final class ChatItemGalleryFooterContentNode: GalleryFooterContentNode, UIScroll
break
}
}
if !isVideo {
canEdit = true
}
} else if let media = media as? TelegramMediaWebpage, case let .Loaded(content) = media.content {
let type = webEmbedType(content: content)
switch type {

1
submodules/TelegramPresentationData/Sources/PresentationThemeCodable.swift
View File

@ -1045,6 +1045,7 @@ extension PresentationThemeChatList: Codable {
try encodeColor(&values, self.itemBackgroundColor, .itemBg)
try encodeColor(&values, self.pinnedItemBackgroundColor, .pinnedItemBg)
try encodeColor(&values, self.itemHighlightedBackgroundColor, .itemHighlightedBg)
try encodeColor(&values, self.pinnedItemHighlightedBackgroundColor, .pinnedItemHighlightedBg)
try encodeColor(&values, self.itemSelectedBackgroundColor, .itemSelectedBg)
try encodeColor(&values, self.titleColor, .title)
try encodeColor(&values, self.secretTitleColor, .secretTitle)

6
submodules/TelegramUI/Sources/ChatController.swift
View File

@ -929,9 +929,11 @@ public final class ChatControllerImpl: TelegramBaseController, ChatController, G
}
var mediaReference: AnyMediaReference?
for m in message.media {
if let image = m as? TelegramMediaImage {
for media in message.media {
if let image = media as? TelegramMediaImage {
mediaReference = AnyMediaReference.standalone(media: image)
} else if let file = media as? TelegramMediaFile {
mediaReference = AnyMediaReference.standalone(media: file)
}
}

2
submodules/TelegramUI/Sources/ChatMessageAnimatedStickerItemNode.swift
View File

@ -2348,7 +2348,7 @@ class ChatMessageAnimatedStickerItemNode: ChatMessageItemView {
let offset: CGFloat = incoming ? 42.0 : 0.0
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))
selectionNode.frame = selectionFrame
selectionNode.updateLayout(size: selectionFrame.size, leftInset: self.safeInsets.left)