From a5bd95564333835bcd1f5cf595fac3a2773df629 Mon Sep 17 00:00:00 2001 From: Ilya Laktyushin Date: Mon, 6 Feb 2023 15:19:48 +0400 Subject: [PATCH] Various fixes --- .../HorizontalPeerItem/Sources/HorizontalPeerItem.swift | 4 +--- submodules/TelegramUI/Sources/ChatHistoryListNode.swift | 2 +- .../TelegramUIPreferences/Sources/MediaInputSettings.swift | 2 +- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/submodules/HorizontalPeerItem/Sources/HorizontalPeerItem.swift b/submodules/HorizontalPeerItem/Sources/HorizontalPeerItem.swift index b35103ec43..db39d7e49c 100644 --- a/submodules/HorizontalPeerItem/Sources/HorizontalPeerItem.swift +++ b/submodules/HorizontalPeerItem/Sources/HorizontalPeerItem.swift @@ -217,17 +217,15 @@ public final class HorizontalPeerItemNode: ListViewItemNode { strongSelf.badgeBackgroundNode.isHidden = true } - var verticalOffset: CGFloat = 0.0 let state: RecentStatusOnlineIconState if case .actionSheet = item.mode { state = .panel - verticalOffset -= 9.0 } else { state = .regular } strongSelf.onlineNode.setImage(PresentationResourcesChatList.recentStatusOnlineIcon(item.theme, state: state), color: nil, transition: .immediate) - strongSelf.onlineNode.frame = CGRect(x: itemLayout.size.width - onlineLayout.width - 18.0, y: itemLayout.size.height - onlineLayout.height - 18.0 + verticalOffset, width: onlineLayout.width, height: onlineLayout.height) + strongSelf.onlineNode.frame = CGRect(x: itemLayout.size.width / 2.0 + 14.0, y: itemLayout.size.width - onlineLayout.height - 30.0, width: onlineLayout.width, height: onlineLayout.height) let _ = badgeApply() let _ = onlineApply(animateContent) diff --git a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift index 508a8e7d72..92b2fef89c 100644 --- a/submodules/TelegramUI/Sources/ChatHistoryListNode.swift +++ b/submodules/TelegramUI/Sources/ChatHistoryListNode.swift @@ -1362,7 +1362,7 @@ public final class ChatHistoryListNode: ListView, ChatHistoryNode { } }) } - if currentIsVisible { + if currentIsVisible && currentlyPlayingVideo { updatedScrollPosition = .index(index: .message(currentlyPlayingMessageId), position: .center(.bottom), directionHint: .Up, animated: true, highlight: true, displayLink: true) scrollAnimationCurve = .Spring(duration: 0.4) } diff --git a/submodules/TelegramUIPreferences/Sources/MediaInputSettings.swift b/submodules/TelegramUIPreferences/Sources/MediaInputSettings.swift index 85703b06da..bc85ba870d 100644 --- a/submodules/TelegramUIPreferences/Sources/MediaInputSettings.swift +++ b/submodules/TelegramUIPreferences/Sources/MediaInputSettings.swift @@ -20,7 +20,7 @@ public struct MediaInputSettings: Codable, Equatable { let container = try decoder.container(keyedBy: StringCodingKey.self) self.enableRaiseToSpeak = (try container.decode(Int32.self, forKey: "enableRaiseToSpeak")) != 0 - self.pauseMusicOnRecording = (try container.decodeIfPresent(Int32.self, forKey: "pauseMusicOnRecording_v2") ?? 0) != 0 + self.pauseMusicOnRecording = (try container.decodeIfPresent(Int32.self, forKey: "pauseMusicOnRecording_v2") ?? 1) != 0 } public func encode(to encoder: Encoder) throws {