ReceiveTempSMS
/
Kurdtvs-Live-Kurdish-TV-Kurdmax
forked from zelo72/mastodon-ios
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

feat: pause video playback when set reveal state to false

This commit is contained in:
CMK 2021-04-19 18:33:11 +08:00
parent f7aa5c123d
commit 81a1028f20
8 changed files with 38 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Mastodon/Diffiable/Item/Item.swift
View File

@ -39,7 +39,7 @@ extension Item {
var isSeparatorLineHidden: Bool
let isImageLoaded = CurrentValueSubject<Bool, Never>(false)
let isMediaRevealing = CurrentValueSubject<Bool, Never>(false)
let isRevealing = CurrentValueSubject<Bool, Never>(false)
init(isSeparatorLineHidden: Bool = false) {
self.isSeparatorLineHidden = isSeparatorLineHidden

19
Mastodon/Diffiable/Section/StatusSection.swift
View File

@ -235,7 +235,7 @@ extension StatusSection {
}
Publishers.CombineLatest(
statusItemAttribute.isImageLoaded,
statusItemAttribute.isMediaRevealing
statusItemAttribute.isRevealing
)
.receive(on: DispatchQueue.main)
.sink { isImageLoaded, isMediaRevealing in
@ -430,15 +430,16 @@ extension StatusSection {
statusView.revealContentWarningButton.isHidden = false
statusView.contentWarningOverlayView.isHidden = false
statusView.statusMosaicImageViewContainer.contentWarningOverlayView.isHidden = true
statusView.playerContainerView.contentWarningOverlayView.isHidden = true
if let revealedAt = status.revealedAt, revealedAt > appStartUpTimestamp {
statusView.updateRevealContentWarningButton(isRevealing: true)
statusView.updateContentWarningDisplay(isHidden: true, animated: animated)
attribute.isMediaRevealing.value = true
attribute.isRevealing.value = true
} else {
statusView.updateRevealContentWarningButton(isRevealing: false)
statusView.updateContentWarningDisplay(isHidden: false, animated: animated)
attribute.isMediaRevealing.value = false
attribute.isRevealing.value = false
}
case .media(let isSensitive):
if !isSensitive, documentStore.defaultRevealStatusDict[status.id] == nil {
@ -460,17 +461,15 @@ extension StatusSection {
return false
}()
attribute.isMediaRevealing.value = needsReveal
attribute.isRevealing.value = needsReveal
if needsReveal {
statusView.updateRevealContentWarningButton(isRevealing: true)
statusView.statusMosaicImageViewContainer.contentWarningOverlayView.blurVisualEffectView.effect = nil
statusView.statusMosaicImageViewContainer.contentWarningOverlayView.vibrancyVisualEffectView.alpha = 0.0
statusView.statusMosaicImageViewContainer.isUserInteractionEnabled = false
statusView.statusMosaicImageViewContainer.contentWarningOverlayView.update(isRevealing: true, style: .visualEffectView)
statusView.playerContainerView.contentWarningOverlayView.update(isRevealing: true, style: .visualEffectView)
} else {
statusView.updateRevealContentWarningButton(isRevealing: false)
statusView.statusMosaicImageViewContainer.contentWarningOverlayView.blurVisualEffectView.effect = ContentWarningOverlayView.blurVisualEffect
statusView.statusMosaicImageViewContainer.contentWarningOverlayView.vibrancyVisualEffectView.alpha = 1.0
statusView.statusMosaicImageViewContainer.isUserInteractionEnabled = true
statusView.statusMosaicImageViewContainer.contentWarningOverlayView.update(isRevealing: false, style: .visualEffectView)
statusView.playerContainerView.contentWarningOverlayView.update(isRevealing: false, style: .visualEffectView)
}
}
if animated {

5
Mastodon/Protocol/StatusProvider/StatusProvider+StatusTableViewCellDelegate.swift
View File

@ -63,12 +63,11 @@ extension StatusTableViewCellDelegate where Self: StatusProvider {
}
func statusTableViewCell(_ cell: StatusTableViewCell, mosaicImageViewContainer: MosaicImageViewContainer, contentWarningOverlayViewDidPressed contentWarningOverlayView: ContentWarningOverlayView) {
statusTableViewCell(cell, contentWarningOverlayViewDidPressed: contentWarningOverlayView)
StatusProviderFacade.responseToStatusContentWarningRevealAction(provider: self, cell: cell)
}
func statusTableViewCell(_ cell: StatusTableViewCell, playerContainerView: PlayerContainerView, contentWarningOverlayViewDidPressed contentWarningOverlayView: ContentWarningOverlayView) {
contentWarningOverlayView.isUserInteractionEnabled = false
statusTableViewCell(cell, contentWarningOverlayViewDidPressed: contentWarningOverlayView)
StatusProviderFacade.responseToStatusContentWarningRevealAction(provider: self, cell: cell)
}
func statusTableViewCell(_ cell: StatusTableViewCell, contentWarningOverlayViewDidPressed contentWarningOverlayView: ContentWarningOverlayView) {

6
Mastodon/Protocol/StatusProvider/StatusProviderFacade.swift
View File

@ -449,6 +449,12 @@ extension StatusProviderFacade {
provider.context.documentStore.defaultRevealStatusDict[status.id] = false
status.update(isReveal: !isRevealing)
status.reblog?.update(isReveal: !isRevealing)
// pause video playback if isRevealing before toggle
if isRevealing, let attachment = (status.reblog ?? status).mediaAttachments?.first,
let playerViewModel = provider.context.videoPlaybackService.dequeueVideoPlayerViewModel(for: attachment), playerViewModel.videoKind == .video {
playerViewModel.pause()
}
}
.map { result in
return status

2
Mastodon/Scene/Share/View/Container/MosaicImageViewContainer.swift
View File

@ -150,6 +150,7 @@ extension MosaicImageViewContainer {
blurhashOverlayImageView.bottomAnchor.constraint(equalTo: imageView.bottomAnchor),
])
contentWarningOverlayView.translatesAutoresizingMaskIntoConstraints = false
addSubview(contentWarningOverlayView)
NSLayoutConstraint.activate([
contentWarningOverlayView.topAnchor.constraint(equalTo: imageView.topAnchor),
@ -281,6 +282,7 @@ extension MosaicImageViewContainer {
])
}
contentWarningOverlayView.translatesAutoresizingMaskIntoConstraints = false
addSubview(contentWarningOverlayView)
NSLayoutConstraint.activate([
contentWarningOverlayView.topAnchor.constraint(equalTo: container.topAnchor),

1
Mastodon/Scene/Share/View/Container/PlayerContainerView.swift
View File

@ -71,6 +71,7 @@ extension PlayerContainerView {
mediaTypeIndicotorView.widthAnchor.constraint(equalToConstant: MediaTypeIndicotorView.indicatorViewSize.width).priority(.required - 1),
])
contentWarningOverlayView.translatesAutoresizingMaskIntoConstraints = false
addSubview(contentWarningOverlayView)
NSLayoutConstraint.activate([
contentWarningOverlayView.topAnchor.constraint(equalTo: topAnchor),

14
Mastodon/Scene/Share/View/Content/ContentWarningOverlayView.swift
View File

@ -70,7 +70,7 @@ class ContentWarningOverlayView: UIView {
extension ContentWarningOverlayView {
private func _init() {
backgroundColor = .clear
translatesAutoresizingMaskIntoConstraints = false
isUserInteractionEnabled = true
// visual effect style
// add blur visual effect view in the setup method
@ -169,6 +169,18 @@ extension ContentWarningOverlayView {
}
}
func update(isRevealing: Bool, style: Style) {
switch style {
case .visualEffectView:
blurVisualEffectView.effect = isRevealing ? nil : ContentWarningOverlayView.blurVisualEffect
vibrancyVisualEffectView.alpha = isRevealing ? 0 : 1
isUserInteractionEnabled = !isRevealing
case .blurContentImageView:
assertionFailure("not handle here")
break
}
}
}
extension ContentWarningOverlayView {

4
Mastodon/Scene/Share/View/TableviewCell/StatusTableViewCell.swift
View File

@ -73,8 +73,10 @@ final class StatusTableViewCell: UITableViewCell {
super.prepareForReuse()
selectionStyle = .default
statusView.updateContentWarningDisplay(isHidden: true, animated: false)
statusView.statusMosaicImageViewContainer.contentWarningOverlayView.isUserInteractionEnabled = true
statusView.pollTableView.dataSource = nil
statusView.playerContainerView.reset()
statusView.playerContainerView.contentWarningOverlayView.isUserInteractionEnabled = true
statusView.playerContainerView.isHidden = true
threadMetaView.isHidden = true
disposeBag.removeAll()
@ -94,6 +96,8 @@ final class StatusTableViewCell: UITableViewCell {
override func layoutSubviews() {
super.layoutSubviews()
// precondition: app is active
guard UIApplication.shared.applicationState == .active else { return }
DispatchQueue.main.async {
self.statusView.drawContentWarningImageView()
}