Fahim
/
Tusker
forked from shadowfacts/Tusker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make various corners continuously rounded

This commit is contained in:
Shadowfacts 2023-05-09 14:39:15 -04:00
parent 8f6a012538
commit 9fc4aa8a40
22 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Packages/ComposeUI/Sources/ComposeUI/Controllers/PollController.swift
View File

@ -120,8 +120,8 @@ class PollController: ViewController {
}
.padding(8)
.background(
backgroundColor
.cornerRadius(10)
RoundedRectangle(cornerRadius: 10, style: .continuous)
.foregroundColor(backgroundColor)
)
.onChange(of: controller.duration) { newValue in
poll.duration = newValue.timeInterval

1
Packages/Duckable/Sources/Duckable/DuckableContainerViewController.swift
View File

@ -155,6 +155,7 @@ public class DuckableContainerViewController: UIViewController, DuckableViewCont
bottomConstraint.isActive = true
child.view.layer.cornerRadius = duckedCornerRadius
child.view.layer.cornerCurve = .continuous
child.view.layer.maskedCorners = [.layerMinXMaxYCorner, .layerMaxXMaxYCorner]
child.view.layer.masksToBounds = true
}

2
Packages/TuskerComponents/Sources/TuskerComponents/AvatarImageView.swift
View File

@ -27,7 +27,7 @@ public struct AvatarImageView: View {
imageView
.resizable()
.frame(width: size, height: size)
.cornerRadius(style.cornerRadiusFraction * size)
.clipShape(RoundedRectangle(cornerRadius: style.cornerRadiusFraction * size, style: .continuous))
.task { @MainActor in
image = nil
if let url {

3
Tusker/Screens/Explore/FeaturedProfileCollectionViewCell.swift
View File

@ -27,7 +27,9 @@ class FeaturedProfileCollectionViewCell: UICollectionViewCell {
super.awakeFromNib()
avatarContainerView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarContainerView)
avatarContainerView.layer.cornerCurve = .continuous
avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadius(for: avatarImageView)
avatarImageView.layer.cornerCurve = .continuous
displayNameLabel.font = UIFontMetrics(forTextStyle: .title1).scaledFont(for: .systemFont(ofSize: 20, weight: .semibold))
displayNameLabel.adjustsFontForContentSizeCategory = true
@ -41,6 +43,7 @@ class FeaturedProfileCollectionViewCell: UICollectionViewCell {
backgroundColor = .clear
clippingView.backgroundColor = .appBackground
clippingView.layer.cornerRadius = 5
clippingView.layer.cornerCurve = .continuous
clippingView.layer.borderWidth = 1
clippingView.layer.masksToBounds = true
layer.shadowOpacity = 0.2

3
Tusker/Screens/Explore/SuggestedProfileCardCollectionViewCell.swift
View File

@ -36,14 +36,17 @@ class SuggestedProfileCardCollectionViewCell: UICollectionViewCell {
layer.shadowOffset = .zero
layer.masksToBounds = false
contentView.layer.cornerRadius = 12.5
contentView.layer.cornerCurve = .continuous
contentView.backgroundColor = .appGroupedCellBackground
updateLayerColors()
headerImageView.cache = .headers
avatarContainerView.layer.masksToBounds = true
avatarContainerView.layer.cornerCurve = .continuous
avatarImageView.cache = .avatars
avatarImageView.layer.masksToBounds = true
avatarImageView.layer.cornerCurve = .continuous
displayNameLabel.font = UIFontMetrics(forTextStyle: .title1).scaledFont(for: .systemFont(ofSize: 24, weight: .semibold))
displayNameLabel.adjustsFontForContentSizeCategory = true

1
Tusker/Screens/Explore/TrendingLinkCardCollectionViewCell.swift
View File

@ -57,6 +57,7 @@ class TrendingLinkCardCollectionViewCell: UICollectionViewCell {
layer.shadowOffset = .zero
layer.masksToBounds = false
contentView.layer.cornerRadius = 12.5
contentView.layer.cornerCurve = .continuous
contentView.backgroundColor = .appGroupedCellBackground
updateLayerColors()

2
Tusker/Screens/Fast Account Switcher/FastSwitchingAccountView.swift
View File

@ -86,7 +86,9 @@ class FastSwitchingAccountView: UIView {
avatarImageView.translatesAutoresizingMaskIntoConstraints = false
avatarImageView.layer.masksToBounds = true
avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 40
avatarImageView.layer.cornerCurve = .continuous
avatarImageView.image = UIImage(systemName: Preferences.shared.avatarStyle == .circle ? "person.crop.circle" : "person.crop.square")
// todo: this should really be fit, but somehow the image view ends up being 37pt tall?
avatarImageView.contentMode = .scaleAspectFill
addSubview(avatarImageView)

1
Tusker/Screens/Notifications/ActionNotificationGroupCollectionViewCell.swift
View File

@ -149,6 +149,7 @@ class ActionNotificationGroupCollectionViewCell: UICollectionViewListCell {
imageView.contentMode = .scaleAspectFit
imageView.layer.masksToBounds = true
imageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30
imageView.layer.cornerCurve = .continuous
avatarStack.addArrangedSubview(imageView)
imageView.update(for: avatarURL)
}

1
Tusker/Screens/Notifications/FollowNotificationGroupCollectionViewCell.swift
View File

@ -123,6 +123,7 @@ class FollowNotificationGroupCollectionViewCell: UICollectionViewListCell {
let imageView = CachedImageView(cache: .avatars)
imageView.layer.masksToBounds = true
imageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 30
imageView.layer.cornerCurve = .continuous
imageView.update(for: avatarURL)
avatarStack.addArrangedSubview(imageView)
}

1
Tusker/Screens/Notifications/FollowRequestNotificationCollectionViewCell.swift
View File

@ -21,6 +21,7 @@ class FollowRequestNotificationCollectionViewCell: UICollectionViewListCell {
private let avatarImageView = CachedImageView(cache: .avatars).configure {
$0.layer.masksToBounds = true
$0.layer.cornerCurve = .continuous
NSLayoutConstraint.activate([
$0.widthAnchor.constraint(equalTo: $0.heightAnchor),
])

1
Tusker/Views/Account Cell/AccountCollectionViewCell.swift
View File

@ -22,6 +22,7 @@ class AccountCollectionViewCell: UICollectionViewListCell {
private let avatarImageView = CachedImageView(cache: .avatars).configure {
$0.layer.masksToBounds = true
$0.layer.cornerCurve = .continuous
NSLayoutConstraint.activate([
$0.widthAnchor.constraint(equalToConstant: 50),
$0.heightAnchor.constraint(equalToConstant: 50),

1
Tusker/Views/Account Cell/AccountTableViewCell.swift
View File

@ -28,6 +28,7 @@ class AccountTableViewCell: UITableViewCell {
super.awakeFromNib()
avatarImageView.layer.masksToBounds = true
avatarImageView.layer.cornerCurve = .continuous
usernameLabel.font = UIFontMetrics(forTextStyle: .body).scaledFont(for: .systemFont(ofSize: 15, weight: .light))
usernameLabel.adjustsFontForContentSizeCategory = true

1
Tusker/Views/Account Detail/LargeAccountDetailView.swift
View File

@ -22,6 +22,7 @@ class LargeAccountDetailView: UIView {
avatarImageView.translatesAutoresizingMaskIntoConstraints = false
avatarImageView.layer.masksToBounds = true
avatarImageView.layer.cornerCurve = .continuous
addSubview(avatarImageView)
displayNameLabel.translatesAutoresizingMaskIntoConstraints = false

2
Tusker/Views/Attachments/AttachmentView.swift
View File

@ -368,11 +368,13 @@ class AttachmentView: GIFImageView {
let first = stack.arrangedSubviews.first!
first.layer.masksToBounds = true
first.layer.cornerRadius = 4
first.layer.cornerCurve = .continuous
if stack.arrangedSubviews.count > 1 {
first.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
let last = stack.arrangedSubviews.last!
last.layer.masksToBounds = true
last.layer.cornerRadius = 4
last.layer.cornerCurve = .continuous
last.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
}

13
Tusker/Views/Attachments/AttachmentsContainerView.swift
View File

@ -85,6 +85,7 @@ class AttachmentsContainerView: UIView {
case 1:
let attachmentView = createAttachmentView(index: 0, hSize: .full, vSize: .full)
attachmentView.layer.cornerRadius = 5
attachmentView.layer.cornerCurve = .continuous
attachmentView.layer.masksToBounds = true
fillView(attachmentView)
sendSubviewToBack(attachmentView)
@ -95,10 +96,12 @@ class AttachmentsContainerView: UIView {
case 2:
let left = createAttachmentView(index: 0, hSize: .half, vSize: .full)
left.layer.cornerRadius = 5
left.layer.cornerCurve = .continuous
left.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
left.layer.masksToBounds = true
let right = createAttachmentView(index: 1, hSize: .half, vSize: .full)
right.layer.cornerRadius = 5
right.layer.cornerCurve = .continuous
right.layer.maskedCorners = [.layerMaxXMinYCorner, .layerMaxXMaxYCorner]
right.layer.masksToBounds = true
let stack = createAttachmentsStack(axis: .horizontal, arrangedSubviews: [
@ -116,14 +119,17 @@ class AttachmentsContainerView: UIView {
case 3:
let left = createAttachmentView(index: 0, hSize: .half, vSize: .full)
left.layer.cornerRadius = 5
left.layer.cornerCurve = .continuous
left.layer.maskedCorners = [.layerMinXMinYCorner, .layerMinXMaxYCorner]
left.layer.masksToBounds = true
let topRight = createAttachmentView(index: 1, hSize: .half, vSize: .half)
topRight.layer.cornerRadius = 5
topRight.layer.cornerCurve = .continuous
topRight.layer.maskedCorners = .layerMaxXMinYCorner
topRight.layer.masksToBounds = true
let bottomRight = createAttachmentView(index: 2, hSize: .half, vSize: .half)
bottomRight.layer.cornerRadius = 5
bottomRight.layer.cornerCurve = .continuous
bottomRight.layer.maskedCorners = .layerMaxXMaxYCorner
bottomRight.layer.masksToBounds = true
let innerStack = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@ -148,10 +154,12 @@ class AttachmentsContainerView: UIView {
case 4:
let topLeft = createAttachmentView(index: 0, hSize: .half, vSize: .half)
topLeft.layer.cornerRadius = 5
topLeft.layer.cornerCurve = .continuous
topLeft.layer.maskedCorners = .layerMinXMinYCorner
topLeft.layer.masksToBounds = true
let bottomLeft = createAttachmentView(index: 2, hSize: .half, vSize: .half)
bottomLeft.layer.cornerRadius = 5
bottomLeft.layer.cornerCurve = .continuous
bottomLeft.layer.maskedCorners = .layerMinXMaxYCorner
bottomLeft.layer.masksToBounds = true
let left = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@ -161,10 +169,12 @@ class AttachmentsContainerView: UIView {
attachmentStacks.add(left)
let topRight = createAttachmentView(index: 1, hSize: .half, vSize: .half)
topRight.layer.cornerRadius = 5
topRight.layer.cornerCurve = .continuous
topRight.layer.maskedCorners = .layerMaxXMinYCorner
topRight.layer.masksToBounds = true
let bottomRight = createAttachmentView(index: 3, hSize: .half, vSize: .half)
bottomRight.layer.cornerRadius = 5
bottomRight.layer.cornerCurve = .continuous
bottomRight.layer.maskedCorners = .layerMaxXMaxYCorner
bottomRight.layer.masksToBounds = true
let right = createAttachmentsStack(axis: .vertical, arrangedSubviews: [
@ -196,6 +206,7 @@ class AttachmentsContainerView: UIView {
moreView.isUserInteractionEnabled = true
moreView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(moreViewTapped)))
moreView.layer.cornerRadius = 5
moreView.layer.cornerCurve = .continuous
moreView.layer.maskedCorners = .layerMaxXMaxYCorner
moreView.layer.masksToBounds = true
let moreLabel = UILabel()
@ -208,6 +219,7 @@ class AttachmentsContainerView: UIView {
let topLeft = createAttachmentView(index: 0, hSize: .half, vSize: .half)
topLeft.layer.cornerRadius = 5
topLeft.layer.cornerCurve = .continuous
topLeft.layer.maskedCorners = .layerMinXMinYCorner
topLeft.layer.masksToBounds = true
let bottomLeft = createAttachmentView(index: 2, hSize: .half, vSize: .half)
@ -221,6 +233,7 @@ class AttachmentsContainerView: UIView {
attachmentStacks.add(left)
let topRight = createAttachmentView(index: 1, hSize: .half, vSize: .half)
topRight.layer.cornerRadius = 5
topRight.layer.cornerCurve = .continuous
topRight.layer.maskedCorners = .layerMaxXMinYCorner
topRight.layer.masksToBounds = true
let right = createAttachmentsStack(axis: .vertical, arrangedSubviews: [

1
Tusker/Views/Poll/PollOptionCheckboxView.swift
View File

@ -35,6 +35,7 @@ class PollOptionCheckboxView: UIView {
let size: CGFloat = 20
layer.cornerRadius = (multiple ? 0.1 : 0.5) * size
layer.cornerCurve = .continuous
layer.borderWidth = 2
imageView.translatesAutoresizingMaskIntoConstraints = false

2
Tusker/Views/Poll/PollOptionView.swift
View File

@ -22,6 +22,7 @@ class PollOptionView: UIView {
let minHeight: CGFloat = 35
layer.cornerRadius = 0.1 * minHeight
layer.cornerCurve = .continuous
backgroundColor = unselectedBackgroundColor
checkbox.translatesAutoresizingMaskIntoConstraints = false
@ -66,6 +67,7 @@ class PollOptionView: UIView {
fillView.backgroundColor = .tintColor.withAlphaComponent(0.6)
fillView.layer.zPosition = -1
fillView.layer.cornerRadius = layer.cornerRadius
fillView.layer.cornerCurve = .continuous
addSubview(fillView)
NSLayoutConstraint.activate([

1
Tusker/Views/Profile Header/ProfileHeaderMovedOverlayView.swift
View File

@ -42,6 +42,7 @@ class ProfileHeaderMovedOverlayView: UIView {
avatarImageView = CachedImageView(cache: .avatars)
avatarImageView.layer.masksToBounds = true
avatarImageView.layer.cornerRadius = Preferences.shared.avatarStyle.cornerRadiusFraction * 50
avatarImageView.layer.cornerCurve = .continuous
avatarImageView.addInteraction(UIPointerInteraction(delegate: self))
avatarImageView.isUserInteractionEnabled = true

2
Tusker/Views/Profile Header/ProfileHeaderView.swift
View File

@ -66,7 +66,9 @@ class ProfileHeaderView: UIView {
avatarContainerView.backgroundColor = .appBackground
avatarContainerView.layer.masksToBounds = true
avatarContainerView.layer.cornerCurve = .continuous
avatarImageView.layer.masksToBounds = true
avatarImageView.layer.cornerCurve = .continuous
avatarImageView.addGestureRecognizer(UITapGestureRecognizer(target: self, action: #selector(avatarPressed)))
avatarImageView.isUserInteractionEnabled = true

1
Tusker/Views/Status/ConversationMainStatusCollectionViewCell.swift
View File

@ -29,6 +29,7 @@ class ConversationMainStatusCollectionViewCell: UICollectionViewListCell, Status
private static let avatarImageViewSize: CGFloat = 50
private(set) lazy var avatarImageView = CachedImageView(cache: .avatars).configure {
$0.layer.masksToBounds = true
$0.layer.cornerCurve = .continuous
NSLayoutConstraint.activate([
$0.heightAnchor.constraint(equalToConstant: ConversationMainStatusCollectionViewCell.avatarImageViewSize),
$0.widthAnchor.constraint(equalToConstant: ConversationMainStatusCollectionViewCell.avatarImageViewSize),

1
Tusker/Views/Status/StatusCardView.swift
View File

@ -102,6 +102,7 @@ class StatusCardView: UIView {
hStack.spacing = 4
hStack.clipsToBounds = true
hStack.layer.borderWidth = 0.5
hStack.layer.cornerCurve = .continuous
hStack.backgroundColor = inactiveBackgroundColor
updateBorderColor()

2
Tusker/Views/Status/TimelineStatusCollectionViewCell.swift
View File

@ -33,6 +33,7 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
$0.image = reblogIcon
$0.contentMode = .scaleAspectFit
$0.layer.masksToBounds = true
$0.layer.cornerCurve = .continuous
$0.tintColor = .secondaryLabel
NSLayoutConstraint.activate([
// this needs to be lessThanOrEqualTo not just equalTo b/c otherwise intermediate layouts are broken
@ -75,6 +76,7 @@ class TimelineStatusCollectionViewCell: UICollectionViewListCell, StatusCollecti
private static let avatarImageViewSize: CGFloat = 50
private(set) lazy var avatarImageView = CachedImageView(cache: .avatars).configure {
$0.layer.masksToBounds = true
$0.layer.cornerCurve = .continuous
NSLayoutConstraint.activate([
$0.heightAnchor.constraint(equalToConstant: TimelineStatusCollectionViewCell.avatarImageViewSize),
$0.widthAnchor.constraint(equalToConstant: TimelineStatusCollectionViewCell.avatarImageViewSize),