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

Various fixes

Browse Source
This commit is contained in:
Ilya Laktyushin 2025-08-31 22:36:46 +04:00
parent be54adbfa7
commit 9e099d6612
4 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
submodules/TelegramUI/Components/ChatThemeScreen/Sources/ChatThemeScreen.swift
View File

@ -975,11 +975,6 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelega
} }
self.otherButton.addTarget(self, action: #selector(self.otherButtonPressed), forControlEvents: .touchUpInside) self.otherButton.addTarget(self, action: #selector(self.otherButtonPressed), forControlEvents: .touchUpInside)
var ignoreGiftThemes = false
if let data = self.context.currentAppConfiguration.with({ $0 }).data, let _ = data["ios_killswitch_disable_gift_themes"] {
ignoreGiftThemes = true
}
self.disposable.set(combineLatest( self.disposable.set(combineLatest(
queue: Queue.mainQueue(), queue: Queue.mainQueue(),
self.context.engine.themes.getChatThemes(accountManager: self.context.sharedContext.accountManager), self.context.engine.themes.getChatThemes(accountManager: self.context.sharedContext.accountManager),
@ -1033,9 +1028,6 @@ private class ChatThemeScreenNode: ViewControllerTracingNode, ASScrollViewDelega
)) ))
var giftThemes = uniqueGiftChatThemesState.themes var giftThemes = uniqueGiftChatThemesState.themes
if ignoreGiftThemes {
giftThemes = []
}
var existingIds = Set<String>() var existingIds = Set<String>()
if let initiallySelectedTheme, case .gift = initiallySelectedTheme { if let initiallySelectedTheme, case .gift = initiallySelectedTheme {
let initialThemeIndex = giftThemes.firstIndex(where: { $0.id == initiallySelectedTheme.id }) let initialThemeIndex = giftThemes.firstIndex(where: { $0.id == initiallySelectedTheme.id })

13
submodules/TelegramUI/Components/Gifts/GiftViewScreen/Sources/GiftViewScreen.swift
View File

@ -826,7 +826,9 @@ private final class GiftViewSheetContent: CombinedComponent {
peerController.peerSelected = { [weak peerController, weak navigationController] peer, _ in peerController.peerSelected = { [weak peerController, weak navigationController] peer, _ in
if let navigationController { if let navigationController {
let proceed = { let proceed = {
let _ = context.engine.themes.setChatTheme(peerId: peer.id, chatTheme: .gift(.unique(gift), [])).start() let _ = context.engine.themes.setChatWallpaper(peerId: peer.id, wallpaper: nil, forBoth: true).startStandalone()
let _ = context.engine.themes.setChatTheme(peerId: peer.id, chatTheme: .gift(.unique(gift), [])).startStandalone()
peerController?.dismiss() peerController?.dismiss()
context.sharedContext.navigateToChatController(NavigateToChatControllerParams( context.sharedContext.navigateToChatController(NavigateToChatControllerParams(
@ -1211,12 +1213,7 @@ private final class GiftViewSheetContent: CombinedComponent {
self?.shareGift() self?.shareGift()
}))) })))
var ignoreGiftThemes = false if gift.flags.contains(.isThemeAvailable) {
if let data = self.context.currentAppConfiguration.with({ $0 }).data, let _ = data["ios_killswitch_disable_gift_themes"] {
ignoreGiftThemes = true
}
if gift.flags.contains(.isThemeAvailable) && !ignoreGiftThemes {
items.append(.action(ContextMenuActionItem(text: presentationData.strings.Gift_View_Context_SetAsTheme, icon: { theme in items.append(.action(ContextMenuActionItem(text: presentationData.strings.Gift_View_Context_SetAsTheme, icon: { theme in
return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/ApplyTheme"), color: theme.contextMenu.primaryColor) return generateTintedImage(image: UIImage(bundleImageName: "Chat/Context Menu/ApplyTheme"), color: theme.contextMenu.primaryColor)
}, action: { [weak self] c, _ in }, action: { [weak self] c, _ in
@ -4714,7 +4711,7 @@ public class GiftViewScreen: ViewControllerComponentContainer {
self.view.disablesInteractiveModalDismiss = true self.view.disablesInteractiveModalDismiss = true
if let arguments = self.subject.arguments, let _ = self.subject.arguments?.resellAmounts { if let arguments = self.subject.arguments, let resellAmounts = self.subject.arguments?.resellAmounts, !resellAmounts.isEmpty {
if case let .unique(uniqueGift) = arguments.gift, case .peerId(self.context.account.peerId) = uniqueGift.owner { if case let .unique(uniqueGift) = arguments.gift, case .peerId(self.context.account.peerId) = uniqueGift.owner {
} else { } else {
self.showBalance = true self.showBalance = true

2
submodules/TelegramUI/Sources/Chat/ChatControllerThemeManagement.swift
View File

@ -262,7 +262,7 @@ extension ChatControllerImpl {
return return
} }
if canResetWallpaper && chatTheme != nil { if canResetWallpaper && chatTheme != nil {
let _ = context.engine.themes.setChatWallpaper(peerId: peerId, wallpaper: nil, forBoth: false).startStandalone() let _ = context.engine.themes.setChatWallpaper(peerId: peerId, wallpaper: nil, forBoth: true).startStandalone()
} }
strongSelf.chatThemeAndDarkAppearancePreviewPromise.set(.single((chatTheme ?? .emoticon(""), nil))) strongSelf.chatThemeAndDarkAppearancePreviewPromise.set(.single((chatTheme ?? .emoticon(""), nil)))
let _ = context.engine.themes.setChatTheme(peerId: peerId, chatTheme: chatTheme ?? .emoticon("")).startStandalone(completed: { [weak self] in let _ = context.engine.themes.setChatTheme(peerId: peerId, chatTheme: chatTheme ?? .emoticon("")).startStandalone(completed: { [weak self] in

2
versions.json
View File

@ -1,5 +1,5 @@
{ {
"app": "11.15", "app": "12.0",
"xcode": "16.2", "xcode": "16.2",
"bazel": "8.3.1:0cac3a67dc5429c68272dc6944104952e9e4cf84b29d126a5ff3fbaa59045217", "bazel": "8.3.1:0cac3a67dc5429c68272dc6944104952e9e4cf84b29d126a5ff3fbaa59045217",
"macos": "15" "macos": "15"