Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Notification Center: iPad adjustments #4152

Merged
merged 8 commits into from Apr 15, 2022
Merged

Notification Center: iPad adjustments #4152

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a44dc2f
add margins on ipad
Mar 11, 2022
698d1b4
prevent pop over from covering source
Mar 11, 2022
f7dc2ed
smaller ipad cells
Mar 11, 2022
1206092
improved readable content area for large cells
Apr 7, 2022
934aa55
PR feedback
Apr 7, 2022
652c864
PR feedback
Apr 12, 2022
5e5eee9
PR feedback
Apr 15, 2022
a523932
Merge branch 'main' into T286607
Apr 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 6 additions & 5 deletions Wikipedia/Code/NotificationsCenterCell.swift
View file
Open in desktop
Expand Up @@ -337,12 +337,13 @@ final class NotificationsCenterCell: UICollectionViewCell {
projectSourceContainer.addSubview(projectSourceLabel)
projectSourceContainer.addSubview(projectSourceImage)

let minimumSummaryHeight = (traitCollection.horizontalSizeClass == .regular) ? 40.0 : 64.0
tonisevener marked this conversation as resolved.
Show resolved Hide resolved
internalVerticalNotificationContentStack.addArrangedSubview(VerticalSpacerView.spacerWith(space: 6))
internalVerticalNotificationContentStack.addArrangedSubview(subheaderLabel)
internalVerticalNotificationContentStack.addArrangedSubview(VerticalSpacerView.spacerWith(space: 6))
internalVerticalNotificationContentStack.addArrangedSubview(messageSummaryLabel)
NSLayoutConstraint.activate([
messageSummaryLabel.heightAnchor.constraint(greaterThanOrEqualToConstant: 64)
messageSummaryLabel.heightAnchor.constraint(greaterThanOrEqualToConstant: minimumSummaryHeight)
])
internalVerticalNotificationContentStack.addArrangedSubview(VerticalSpacerView.spacerWith(space: 3))
internalVerticalNotificationContentStack.addArrangedSubview(metaStackView)
Expand Down Expand Up @@ -375,16 +376,16 @@ final class NotificationsCenterCell: UICollectionViewCell {
// Primary Hierarchy Constraints

NSLayoutConstraint.activate([
leadingContainer.leadingAnchor.constraint(equalTo: foregroundContentContainer.leadingAnchor),
leadingContainer.leadingAnchor.constraint(equalTo: contentView.readableContentGuide.leadingAnchor),
leadingContainer.topAnchor.constraint(equalTo: mainVerticalStackView.topAnchor),
leadingContainer.bottomAnchor.constraint(equalTo: foregroundContentContainer.bottomAnchor),
leadingContainer.trailingAnchor.constraint(equalTo: mainVerticalStackView.leadingAnchor),

mainVerticalStackView.topAnchor.constraint(equalTo: foregroundContentContainer.topAnchor, constant: topMargin),
mainVerticalStackView.bottomAnchor.constraint(equalTo: foregroundContentContainer.bottomAnchor, constant: -edgeMargin),
mainVerticalStackView.trailingAnchor.constraint(equalTo: foregroundContentContainer.trailingAnchor),
mainVerticalStackView.trailingAnchor.constraint(equalTo: contentView.readableContentGuide.trailingAnchor),

headerTextContainer.trailingAnchor.constraint(equalTo: foregroundContentContainer.trailingAnchor, constant: -edgeMargin),
headerTextContainer.trailingAnchor.constraint(equalTo: contentView.readableContentGuide.trailingAnchor, constant: -edgeMargin),

cellSeparator.heightAnchor.constraint(equalToConstant: 0.5),
cellSeparator.bottomAnchor.constraint(equalTo: contentView.bottomAnchor),
Expand Down Expand Up @@ -420,7 +421,7 @@ final class NotificationsCenterCell: UICollectionViewCell {

NSLayoutConstraint.activate([
projectSourceContainer.widthAnchor.constraint(equalToConstant: 50),
projectSourceContainer.trailingAnchor.constraint(equalTo: foregroundContentContainer.trailingAnchor, constant: -edgeMargin),
projectSourceContainer.trailingAnchor.constraint(equalTo: contentView.readableContentGuide.trailingAnchor, constant: -edgeMargin),

projectSourceLabel.topAnchor.constraint(equalTo: subheaderLabel.topAnchor),
projectSourceLabel.trailingAnchor.constraint(equalTo: projectSourceContainer.trailingAnchor),
Expand Down
6 changes: 4 additions & 2 deletions Wikipedia/Code/NotificationsCenterFilterView.swift
View file
Open in desktop
Expand Up @@ -3,9 +3,10 @@ import SwiftUI
import WMF

struct NotificationsCenterFilterItemView: View {
@Environment (\.horizontalSizeClass) private var horizontalSizeClass
@ObservedObject var itemViewModel: NotificationsCenterFiltersViewModel.ItemViewModel
let theme: Theme

var body: some View {

Group {
Expand Down Expand Up @@ -65,6 +66,7 @@ struct NotificationsCenterFilterItemView: View {
}
}
}
.padding(.horizontal, horizontalSizeClass == .regular ? (UIFont.preferredFont(forTextStyle: .body).pointSize) : 0)
.listRowBackground(Color(theme.colors.paperBackground).edgesIgnoringSafeArea([.all]))
}
}
Expand All @@ -82,7 +84,7 @@ extension Binding {
}

struct NotificationsCenterFilterView: View {

let viewModel: NotificationsCenterFiltersViewModel
let doneAction: () -> Void

Expand Down
4 changes: 3 additions & 1 deletion Wikipedia/Code/NotificationsCenterInboxView.swift
View file
Open in desktop
Expand Up @@ -47,7 +47,8 @@ struct NotificationsCenterInboxItemView: View {
}

struct NotificationsCenterInboxView: View {


@Environment (\.horizontalSizeClass) private var horizontalSizeClass
let viewModel: NotificationsCenterInboxViewModel
let doneAction: () -> Void

Expand Down Expand Up @@ -76,6 +77,7 @@ struct NotificationsCenterInboxView: View {
.foregroundColor(Color(viewModel.theme.colors.primaryText))
}
)
.padding(.horizontal, horizontalSizeClass == .regular ? (UIFont.preferredFont(forTextStyle: .body).pointSize) : 0)
.background(Color(viewModel.theme.colors.baseBackground).edgesIgnoringSafeArea(.all))
.navigationBarTitle(Text(WMFLocalizedString("notifications-center-inbox-title", value: "Projects", comment: "Navigation bar title text for the inbox view presented from notifications center. Allows for filtering out notifications by Wikimedia project type.")), displayMode: .inline)
.onAppear(perform: {
Expand Down
4 changes: 4 additions & 0 deletions Wikipedia/Code/NotificationsCenterView.swift
View file
Open in desktop
Expand Up @@ -79,6 +79,10 @@ final class NotificationsCenterView: SetupView {
emptyOverlaySubheaderLabel.font = UIFont.wmf_font(.subheadline, compatibleWithTraitCollection: traitCollection)
calculatedCellHeight = nil
}

if previousTraitCollection?.horizontalSizeClass != traitCollection.horizontalSizeClass {
calculatedCellHeight = nil
}
}

override func layoutSubviews() {
Expand Down
2 changes: 1 addition & 1 deletion Wikipedia/Code/NotificationsCenterViewController.swift
View file
Open in desktop
Expand Up @@ -798,7 +798,7 @@ extension NotificationsCenterViewController: NotificationsCenterCellDelegate {
if let activeCell = cellSwipeData.activeCell(in: notificationsView.collectionView) {
let sourceView = activeCell.swipeMoreStack
popoverController.sourceView = sourceView
popoverController.sourceRect = CGRect(x: sourceView.bounds.midX, y: sourceView.bounds.midY, width: 0, height: 0)
popoverController.sourceRect = sourceView.bounds
} else {
popoverController.sourceView = cell
popoverController.sourceRect = CGRect(x: cell.bounds.midX, y: cell.bounds.midY, width: 0, height: 0)
Expand Down