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

chore: remove redundant background view

This commit is contained in:
CMK 2021-07-12 19:19:24 +08:00
parent e4687eda52
commit f99f25bfdb
4 changed files with 66 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Mastodon/Diffiable/Section/NotificationSection.swift
View File

@ -30,7 +30,8 @@ extension NotificationSection {
guard let dependency = dependency else { return nil }
switch notificationItem {
case .notification(let objectID, let attribute):
guard let notification = try? managedObjectContext.existingObject(with: objectID) as? MastodonNotification else {
guard let notification = try? managedObjectContext.existingObject(with: objectID) as? MastodonNotification,
!notification.isDeleted else {
return UITableViewCell()
}
@ -38,21 +39,21 @@ extension NotificationSection {
cell.delegate = delegate
// configure author
cell.avatarImageViewTask = Nuke.loadImage(
with: notification.account.avatarImageURL(),
options: ImageLoadingOptions(
placeholder: UIImage.placeholder(color: .systemFill),
transition: .fadeIn(duration: 0.2)
),
into: cell.avatarImageView
cell.configure(
with: AvatarConfigurableViewConfiguration(
avatarImageURL: notification.account.avatarImageURL()
)
)
cell.actionImageView.image = UIImage(
systemName: notification.notificationType.actionImageName,
withConfiguration: UIImage.SymbolConfiguration(
pointSize: 12, weight: .semibold
)
)?.withRenderingMode(.alwaysTemplate)
cell.actionImageBackground.backgroundColor = notification.notificationType.color
)?
.withRenderingMode(.alwaysTemplate)
.af.imageAspectScaled(toFit: CGSize(width: 14, height: 14))
cell.actionImageView.backgroundColor = notification.notificationType.color
// configure author name, notification description, timestamp
cell.nameLabel.configure(content: notification.account.displayNameWithFallback, emojiDict: notification.account.emojiDict)

2
Mastodon/Scene/Notification/NotificationViewModel+Diffable.swift
View File

@ -19,7 +19,7 @@ extension NotificationViewModel {
) {
diffableDataSource = NotificationSection.tableViewDiffableDataSource(
for: tableView,
managedObjectContext: context.managedObjectContext,
managedObjectContext: fetchedResultsController.managedObjectContext,
delegate: delegate,
dependency: dependency
)

5
Mastodon/Scene/Notification/NotificationViewModel+LoadOldestState.swift
View File

@ -71,8 +71,9 @@ extension NotificationViewModel.LoadOldestState {
sinceID: nil,
minID: nil,
limit: nil,
excludeTypes: [.followRequest],
accountID: nil)
excludeTypes: [],
accountID: nil
)
viewModel.context.apiService.allNotifications(
domain: activeMastodonAuthenticationBox.domain,
query: query,

54
Mastodon/Scene/Notification/TableViewCell/NotificationStatusTableViewCell.swift
View File

@ -37,6 +37,7 @@ final class NotificationStatusTableViewCell: UITableViewCell, StatusCell {
static let actionImageBorderWidth: CGFloat = 2
static let statusPadding = UIEdgeInsets(top: 50, left: 73, bottom: 24, right: 24)
static let actionImageViewSize = CGSize(width: 24, height: 24)
var disposeBag = Set<AnyCancellable>()
var pollCountdownSubscription: AnyCancellable?
@ -45,32 +46,26 @@ final class NotificationStatusTableViewCell: UITableViewCell, StatusCell {
var containerStackViewBottomLayoutConstraint: NSLayoutConstraint!
let containerStackView = UIStackView()
var avatarImageViewTask: ImageTask?
let avatarImageView: UIImageView = {
let imageView = FLAnimatedImageView()
imageView.layer.cornerRadius = 4
imageView.layer.cornerCurve = .continuous
imageView.clipsToBounds = true
return imageView
}()
let actionImageView: UIImageView = {
let imageView = UIImageView()
imageView.contentMode = .center
imageView.tintColor = Asset.Colors.Background.systemBackground.color
imageView.isOpaque = true
imageView.layer.masksToBounds = true
imageView.layer.cornerRadius = NotificationStatusTableViewCell.actionImageViewSize.width * 0.5
imageView.layer.cornerCurve = .circular
imageView.layer.borderWidth = NotificationStatusTableViewCell.actionImageBorderWidth
imageView.layer.borderColor = Asset.Colors.Background.systemBackground.color.cgColor
imageView.layer.shouldRasterize = true
imageView.layer.rasterizationScale = UIScreen.main.scale
return imageView
}()
let actionImageBackground: UIView = {
let view = UIView()
view.layer.cornerRadius = (24 + NotificationStatusTableViewCell.actionImageBorderWidth) / 2
view.layer.cornerCurve = .continuous
view.clipsToBounds = true
view.layer.borderWidth = NotificationStatusTableViewCell.actionImageBorderWidth
view.layer.borderColor = Asset.Colors.Background.systemBackground.color.cgColor
view.tintColor = Asset.Colors.Background.systemBackground.color
return view
}()
let avatarContainer: UIView = {
let view = UIView()
return view
@ -148,8 +143,6 @@ final class NotificationStatusTableViewCell: UITableViewCell, StatusCell {
override func prepareForReuse() {
super.prepareForReuse()
isFiltered = false
avatarImageViewTask?.cancel()
avatarImageViewTask = nil
statusView.updateContentWarningDisplay(isHidden: true, animated: false)
statusView.pollTableView.dataSource = nil
statusView.playerContainerView.reset()
@ -199,20 +192,13 @@ extension NotificationStatusTableViewCell {
avatarImageView.widthAnchor.constraint(equalToConstant: 35).priority(.required - 1),
])
actionImageBackground.translatesAutoresizingMaskIntoConstraints = false
avatarContainer.addSubview(actionImageBackground)
NSLayoutConstraint.activate([
actionImageBackground.heightAnchor.constraint(equalToConstant: 24 + NotificationStatusTableViewCell.actionImageBorderWidth).priority(.required - 1),
actionImageBackground.widthAnchor.constraint(equalToConstant: 24 + NotificationStatusTableViewCell.actionImageBorderWidth).priority(.required - 1),
actionImageBackground.centerYAnchor.constraint(equalTo: avatarImageView.bottomAnchor),
actionImageBackground.centerXAnchor.constraint(equalTo: avatarContainer.trailingAnchor),
])
actionImageView.translatesAutoresizingMaskIntoConstraints = false
actionImageBackground.addSubview(actionImageView)
avatarContainer.addSubview(actionImageView)
NSLayoutConstraint.activate([
actionImageView.centerXAnchor.constraint(equalTo: actionImageBackground.centerXAnchor),
actionImageView.centerYAnchor.constraint(equalTo: actionImageBackground.centerYAnchor),
actionImageView.centerYAnchor.constraint(equalTo: avatarContainer.bottomAnchor),
actionImageView.centerXAnchor.constraint(equalTo: avatarContainer.trailingAnchor),
actionImageView.widthAnchor.constraint(equalToConstant: NotificationStatusTableViewCell.actionImageViewSize.width),
actionImageView.heightAnchor.constraint(equalToConstant: NotificationStatusTableViewCell.actionImageViewSize.height),
])
containerStackView.addArrangedSubview(contentStackView)
@ -302,7 +288,7 @@ extension NotificationStatusTableViewCell {
super.traitCollectionDidChange(previousTraitCollection)
resetSeparatorLineLayout()
actionImageBackground.layer.borderColor = Asset.Colors.Background.systemBackground.color.cgColor
avatarImageView.layer.borderColor = Asset.Colors.Background.systemBackground.color.cgColor
statusContainerView.layer.borderColor = Asset.Colors.Border.notificationStatus.color.cgColor
}
@ -405,3 +391,11 @@ extension NotificationStatusTableViewCell {
}
}
// MARK: - AvatarConfigurableView
extension NotificationStatusTableViewCell: AvatarConfigurableView {
static var configurableAvatarImageSize: CGSize { CGSize(width: 35, height: 35) }
static var configurableAvatarImageCornerRadius: CGFloat { 4 }
var configurableAvatarImageView: UIImageView? { avatarImageView }
var configurableAvatarButton: UIButton? { nil }
}