Skip to content

Commit

Permalink
chore: cleanup styling in places
Browse files Browse the repository at this point in the history
  • Loading branch information
Zomatree committed May 31, 2024
1 parent 0000a6e commit f377a89
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
3 changes: 1 addition & 2 deletions Revolt/Pages/ChannelInfo.swift
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ struct UserDisplay: View {

VStack(alignment: .leading) {
Text(verbatim: member?.nickname ?? user.display_name ?? user.username)
.fontWeight(.heavy)
.fontWeight(.bold)
.foregroundStyle(member?.displayColour(theme: viewState.theme, server: server!) ?? AnyShapeStyle(viewState.theme.foreground.color))

if let statusText = user.status?.text {
Expand Down Expand Up @@ -72,7 +72,6 @@ struct UserDisplay: View {
Text("Offline")
.font(.caption)
.foregroundStyle(viewState.theme.foreground2.color)

}
}
}
Expand Down
16 changes: 9 additions & 7 deletions Revolt/Pages/FriendsList.swift
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,16 @@ struct FriendsList: View {
Section {
ForEach(users) { user in
Button {
viewState.openUserSheet(withId: user.id, server: nil)
viewState.openUserSheet(user: user)
} label: {
HStack(spacing: 12) {
Avatar(user: user)
.frame(width: 16, height: 16)
.frame(width: 24, height: 24)

Text(user.display_name ?? user.username)
HStack {
HStack(spacing: 12) {
Avatar(user: user, withPresence: true)
.frame(width: 16, height: 16)
.frame(width: 24, height: 24)

Text(user.display_name ?? user.username)
}

Spacer()

Expand Down

0 comments on commit f377a89

Please sign in to comment.