Skip to content

[PBIOS-701]Updates to PBAvatar #530

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

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

[PBIOS-701]Updates to PBAvatar #530

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f730fbc
Updates to PBAvatar
RachelRadford21 Apr 3, 2025
b46302c
Merge branch 'main' into PBIOS701UpdatePBAvatar
RachelRadford21 Apr 3, 2025
521883a
remove optional status size
RachelRadford21 Apr 14, 2025
32342cc
Merge remote-tracking branch 'refs/remotes/origin/PBIOS701UpdatePBAva…
RachelRadford21 Apr 14, 2025
02f5038
removed commented code
RachelRadford21 Apr 16, 2025
6fc2e1f
changed inactive greyscale avatar status to offline
RachelRadford21 Apr 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions PlaybookShowcase/PlaybookShowcase/Components/Avatar/AvatarCatalog.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,15 +58,15 @@ extension AvatarCatalog {
var statusSize: some View {
VStack(alignment: .leading, spacing: Spacing.small) {
VStack(spacing: Spacing.xxSmall) {
PBAvatar(image: Image("andrew"), size: .small, status: .online, statusSize: .medium)
PBAvatar(image: Image("andrew"), size: .small, status: .online)
Text("Small").pbFont(.caption)
}
VStack(spacing: Spacing.xxSmall) {
PBAvatar(image: Image("andrew"), size: .medium, status: .away, statusSize: .medium)
PBAvatar(image: Image("andrew"), size: .medium, status: .away)
Text("Medium").pbFont(.caption)
}
VStack(spacing: Spacing.xxSmall) {
PBAvatar(image: Image("andrew"), size: .large, status: .offline, statusSize: .medium)
PBAvatar(image: Image("andrew"), size: .large, status: .offline)
Text("Large").pbFont(.caption)
}
}
Expand All @@ -75,27 +75,27 @@ extension AvatarCatalog {
var statusColor: some View {
VStack(alignment: .leading, spacing: Spacing.small) {
VStack(spacing: Spacing.xxSmall) {
PBAvatar(image: Image("andrew"), size: .medium, status: .online, statusSize: .medium)
PBAvatar(image: Image("andrew"), size: .medium, status: .online)
Text("Online").pbFont(.caption)
}
VStack(spacing: Spacing.xxSmall) {
PBAvatar(image: Image("andrew"), size: .medium, status: .away, statusSize: .medium)
PBAvatar(image: Image("andrew"), size: .medium, status: .away)
Text("Away").pbFont(.caption)
}
VStack(spacing: Spacing.xxSmall) {
PBAvatar(image: Image("andrew"), size: .medium, status: .offline, statusSize: .medium)
PBAvatar(image: Image("andrew"), size: .medium, status: .offline)
Text("Offline").pbFont(.caption)
}
}
}

var greyScale: some View {
VStack(alignment: .leading, spacing: Spacing.small) {
PBAvatar(image: Image("andrew"), size: .xxSmall, status: .online, isActive: false)
PBAvatar(image: Image("andrew"), size: .xSmall, status: .away, isActive: false)
PBAvatar(image: Image("andrew"), size: .small, status: .online, isActive: false)
PBAvatar(image: Image("andrew"), size: .medium, status: .away, isActive: false)
PBAvatar(image: Image("andrew"), size: .large, status: .online, isActive: false)
PBAvatar(image: Image("andrew"), size: .xxSmall, status: .offline, isActive: false)
PBAvatar(image: Image("andrew"), size: .xSmall, status: .offline, isActive: false)
PBAvatar(image: Image("andrew"), size: .small, status: .offline, isActive: false)
PBAvatar(image: Image("andrew"), size: .medium, status: .offline, isActive: false)
PBAvatar(image: Image("andrew"), size: .large, status: .offline, isActive: false)
PBAvatar(image: Image("andrew"), size: .xLarge, status: .offline, isActive: false)
}
}
Expand Down
16 changes: 11 additions & 5 deletions Sources/Playbook/Components/Avatar/PBAvatar.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ public struct PBAvatar: View {
var name: String?
var size: Size
var status: PBOnlineStatus.Status?
var statusSize: PBOnlineStatus.Size
var wrapped: Bool
var isActive: Bool
@Environment(\.colorScheme) var colorScheme
Expand All @@ -24,15 +23,13 @@ public struct PBAvatar: View {
name: String? = nil,
size: Size = .medium,
status: PBOnlineStatus.Status? = nil,
statusSize: PBOnlineStatus.Size = .small,
wrapped: Bool = false,
isActive: Bool = true
) {
self.image = image
self.name = name
self.size = size
self.status = status
self.statusSize = statusSize
self.wrapped = wrapped
self.isActive = isActive
}
Expand Down Expand Up @@ -63,7 +60,7 @@ public struct PBAvatar: View {


if let status = self.status {
PBOnlineStatus(status: status, size: statusSize, variant: .border)
PBOnlineStatus(status: status, size: avatarStatusSize, variant: .border)
.grayscale(isActive ? 0 : 1)
.offset(
x: (size.diameter/2 - size.diameter/9) * size.statusXModifier,
Expand Down Expand Up @@ -151,7 +148,16 @@ public extension PBAvatar {
[.xLarge, .large, .medium, .small, .xSmall, .xxSmall]
}
}


var avatarStatusSize: PBOnlineStatus.Size {
switch size {
case .xxSmall, .xSmall, .smallStacked, .smallStackedIndicator, .defaultStacked, .defaultStackedIndicator: return .small
case .small, .medium: return .medium
case .large, .xLarge: return .large
case .custom: return .medium
}
}

var avatarBorderColor: Color {
switch colorScheme {
case .light: return Color.BorderColor.borderColor(.light)
Expand Down