ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2026-02-02 09:06:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'b0b4381f01897fe4bc4ad259b225892aa7d86ebd'

Browse Source
This commit is contained in:
Isaac
2025-09-30 01:53:17 +08:00
parent 5bbc75fc7c b0b4381f01
commit 4f2bfb5d0d
2 changed files with 34 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
submodules/TelegramCallsUI/Sources/VideoChatScreen.swift
View File

@@ -35,7 +35,7 @@ import TextFormat
import ReactionSelectionNode
import EntityKeyboard
import GlassBackgroundComponent
import EdgeEffect
import PremiumUI
extension VideoChatCall {
var myAudioLevelAndSpeaking: Signal<(Float, Bool), NoError> {
@@ -3815,50 +3815,40 @@ final class VideoChatScreenComponent: Component {
}
reactionContextNode.premiumReactionsSelected = { [weak self] file in
guard let self, let component = self.component else {
guard let self, let component = self.component, let environment = self.environment, let controller = environment.controller() else {
return
}
let context = component.initialCall.accountContext
guard let file else {
var replaceImpl: ((ViewController) -> Void)?
let demoController = PremiumDemoScreen(context: context, subject: .uniqueReactions, forceDark: true, action: {
let introController = PremiumIntroScreen(context: context, source: .reactions)
replaceImpl?(introController)
})
replaceImpl = { [weak demoController] c in
demoController?.replace(with: c)
}
controller.push(demoController)
return
}
let _ = component
// guard let file else {
// let context = component.context
// var replaceImpl: ((ViewController) -> Void)?
// let controller = PremiumDemoScreen(context: context, subject: .uniqueReactions, forceDark: true, action: {
// let controller = PremiumIntroScreen(context: context, source: .reactions)
// replaceImpl?(controller)
// })
// controller.disposed = { [weak self] in
// self?.updateIsProgressPaused()
// }
// replaceImpl = { [weak controller] c in
// controller?.replace(with: c)
// }
// component.controller()?.push(controller)
// return
// }
//
// let presentationData = component.context.sharedContext.currentPresentationData.with { $0 }
// let undoController = UndoOverlayController(presentationData: presentationData, content: .sticker(context: component.context, file: file, loop: true, title: nil, text: presentationData.strings.Chat_PremiumReactionToastTitle, undoText: presentationData.strings.Chat_PremiumReactionToastAction, customAction: { [weak self] in
// guard let self, let component = self.component else {
// return
// }
//
// let context = component.context
// var replaceImpl: ((ViewController) -> Void)?
// let controller = PremiumDemoScreen(context: context, subject: .uniqueReactions, forceDark: true, action: {
// let controller = PremiumIntroScreen(context: context, source: .reactions)
// replaceImpl?(controller)
// })
// controller.disposed = { [weak self] in
// self?.updateIsProgressPaused()
// }
// replaceImpl = { [weak controller] c in
// controller?.replace(with: c)
// }
// component.controller()?.push(controller)
// }), elevatedLayout: false, animateInAsReplacement: false, appearance: UndoOverlayController.Appearance(isBlurred: true), action: { _ in true })
// component.controller()?.present(undoController, in: .current)
let presentationData = context.sharedContext.currentPresentationData.with { $0 }
let undoController = UndoOverlayController(presentationData: presentationData, content: .sticker(context: context, file: file, loop: true, title: nil, text: presentationData.strings.Chat_PremiumReactionToastTitle, undoText: presentationData.strings.Chat_PremiumReactionToastAction, customAction: { [weak controller] in
guard let controller else {
return
}
var replaceImpl: ((ViewController) -> Void)?
let demoController = PremiumDemoScreen(context: context, subject: .uniqueReactions, forceDark: true, action: {
let introController = PremiumIntroScreen(context: context, source: .reactions)
replaceImpl?(introController)
})
replaceImpl = { [weak demoController] c in
demoController?.replace(with: c)
}
controller.push(demoController)
}), elevatedLayout: false, animateInAsReplacement: false, appearance: UndoOverlayController.Appearance(isBlurred: true), action: { _ in true })
controller.present(undoController, in: .current)
}
}

3
submodules/TelegramUI/Components/Settings/PeerNameColorScreen/Sources/UserApperanceScreen.swift
View File

@@ -1891,7 +1891,7 @@ final class UserAppearanceScreenComponent: Component {
size: availableSize,
metrics: environment.metrics,
deviceMetrics: environment.deviceMetrics,
intrinsicInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: edgeEffectHeight, right: 0.0),
intrinsicInsets: UIEdgeInsets(top: 0.0, left: 0.0, bottom: availableSize.height - buttonFrame.minY, right: 0.0),
safeInsets: UIEdgeInsets(top: 0.0, left: environment.safeInsets.left, bottom: 0.0, right: environment.safeInsets.right),
additionalInsets: .zero,
statusBarHeight: environment.statusBarHeight,
@@ -2096,5 +2096,6 @@ private func generatePreviewShadowImage() -> UIImage {
drawShadow()
drawShadow()
drawShadow()
})!.stretchableImage(withLeftCapWidth: Int(shadowInset + cornerRadius + 5), topCapHeight: Int(shadowInset + cornerRadius + 5)).withRenderingMode(.alwaysTemplate)
}