diff --git a/Mastodon/Scene/Notification/NotificationView/NotificationView+Configuration.swift b/Mastodon/Scene/Notification/NotificationView/NotificationView+Configuration.swift index 01ae0ab10..b296bcd90 100644 --- a/Mastodon/Scene/Notification/NotificationView/NotificationView+Configuration.swift +++ b/Mastodon/Scene/Notification/NotificationView/NotificationView+Configuration.swift @@ -39,9 +39,9 @@ extension NotificationView { switch notification.entity.type { case .follow: - setAuthorContainerBottomPaddingViewDisplay() + setAuthorContainerBottomPaddingViewDisplay(isHidden: true) case .followRequest: - setFollowRequestAdaptiveMarginContainerViewDisplay() + setFollowRequestAdaptiveMarginContainerViewDisplay(isHidden: true) case .mention, .status: if let status = notification.status { statusView.configure(status: status) diff --git a/Mastodon/Scene/Notification/NotificationView/NotificationView.swift b/Mastodon/Scene/Notification/NotificationView/NotificationView.swift index cf330350b..4da3ab81d 100644 --- a/Mastodon/Scene/Notification/NotificationView/NotificationView.swift +++ b/Mastodon/Scene/Notification/NotificationView/NotificationView.swift @@ -210,7 +210,7 @@ extension NotificationView { containerStackView.topAnchor.constraint(equalTo: topAnchor), containerStackView.leadingAnchor.constraint(equalTo: leadingAnchor), containerStackView.trailingAnchor.constraint(equalTo: trailingAnchor), - bottomAnchor.constraint(equalTo: containerStackView.bottomAnchor), + bottomAnchor.constraint(equalTo: containerStackView.bottomAnchor, constant: 8), ]) // author container: H - [ avatarButton | author meta container ] @@ -420,12 +420,12 @@ extension NotificationView { extension NotificationView { - public func setAuthorContainerBottomPaddingViewDisplay() { - authorContainerViewBottomPaddingView.isHidden = false + public func setAuthorContainerBottomPaddingViewDisplay(isHidden: Bool = false) { + authorContainerViewBottomPaddingView.isHidden = isHidden } - public func setFollowRequestAdaptiveMarginContainerViewDisplay() { - followRequestAdaptiveMarginContainerView.isHidden = false + public func setFollowRequestAdaptiveMarginContainerViewDisplay(isHidden: Bool = false) { + followRequestAdaptiveMarginContainerView.isHidden = isHidden } public func setStatusViewDisplay() { diff --git a/MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift b/MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift index eba7e1672..2de73dc5b 100644 --- a/MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift +++ b/MastodonSDK/Sources/MastodonUI/View/Control/ActionToolbarContainer.swift @@ -290,19 +290,3 @@ extension ActionToolbarContainer { set { } } } - -#if DEBUG -import SwiftUI - -struct ActionToolbarContainer_Previews: PreviewProvider { - static var previews: some View { - Group { - UIViewPreview(width: 300) { - ActionToolbarContainer() - } - .previewLayout(.fixed(width: 300, height: 44)) - .previewDisplayName("Inline") - } - } -} -#endif