Custom iconography added for other areas of the app.

Changelog-Added: Custom iconography added for other areas of the app.
This commit is contained in:
Ben Weeks
2023-05-27 04:32:06 +01:00
committed by William Casarin
parent d12281fcc5
commit 973e9fe714
49 changed files with 167 additions and 565 deletions

View File

@@ -39,7 +39,7 @@ struct EditProfilePictureControl: View {
if viewModel.isLoading {
ProgressView()
} else {
Image(systemName: "camera")
Image("camera")
.resizable()
.scaledToFit()
.frame(width: 25, height: 25)

View File

@@ -23,7 +23,8 @@ struct MaybeAnonPfpView: View {
var body: some View {
Group {
if is_anon {
Image(systemName: "person.fill.questionmark")
Image("question")
.resizable()
.font(.largeTitle)
.frame(width: size, height: size)
} else {

View File

@@ -168,8 +168,8 @@ struct ProfileView: View {
}
@ViewBuilder
func navImage(systemImage: String) -> some View {
Image(systemName: systemImage)
func navImage(img: String) -> some View {
Image(img)
.frame(width: 33, height: 33)
.background(Color.black.opacity(0.6))
.clipShape(Circle())
@@ -179,7 +179,7 @@ struct ProfileView: View {
Button {
presentationMode.wrappedValue.dismiss()
} label: {
navImage(systemImage: "chevron.left")
navImage(img: "chevron-left")
}
}
@@ -187,7 +187,7 @@ struct ProfileView: View {
Button(action: {
action_sheet_presented = true
}) {
navImage(systemImage: "ellipsis")
navImage(img: "share3")
}
.confirmationDialog(NSLocalizedString("Actions", comment: "Title for confirmation dialog to either share, report, or mute a profile."), isPresented: $action_sheet_presented) {
Button(NSLocalizedString("Share", comment: "Button to share the link to a profile.")) {
@@ -242,7 +242,7 @@ struct ProfileView: View {
}
func lnButton(lnurl: String, profile: Profile) -> some View {
let button_img = profile.reactions == false ? "bolt.brakesignal" : "bolt.circle"
let button_img = profile.reactions == false ? "zap.fill" : "zap"
return Button(action: {
if damus_state.settings.show_wallet_selector {
showing_select_wallet = true
@@ -250,7 +250,8 @@ struct ProfileView: View {
open_with_wallet(wallet: damus_state.settings.default_wallet.model, invoice: lnurl)
}
}) {
Image(systemName: button_img)
Image(button_img)
.foregroundColor(button_img == "zap.fill" ? .orange : Color.primary)
.profile_button_style(scheme: colorScheme)
.contextMenu {
if profile.reactions == false {
@@ -261,13 +262,13 @@ struct ProfileView: View {
Button {
UIPasteboard.general.string = addr
} label: {
Label(addr, systemImage: "doc.on.doc")
Label(addr, image: "copy2")
}
} else if let lnurl = profile.lnurl {
Button {
UIPasteboard.general.string = lnurl
} label: {
Label(NSLocalizedString("Copy LNURL", comment: "Context menu option for copying a user's Lightning URL."), systemImage: "doc.on.doc")
Label(NSLocalizedString("Copy LNURL", comment: "Context menu option for copying a user's Lightning URL."), image: "copy")
}
}
}
@@ -283,7 +284,7 @@ struct ProfileView: View {
let dm_model = damus_state.dms.lookup_or_create(profile.pubkey)
let dmview = DMChatView(damus_state: damus_state, dms: dm_model)
return NavigationLink(destination: dmview) {
Image(systemName: "bubble.left.circle")
Image("messages")
.profile_button_style(scheme: colorScheme)
}
}
@@ -353,7 +354,9 @@ struct ProfileView: View {
var followersCount: some View {
HStack {
if followers.count == nil {
Image(systemName: "square.and.arrow.down")
Image("download")
.resizable()
.frame(width: 20, height: 20)
Text("Followers", comment: "Label describing followers of a user.")
.font(.subheadline)
.foregroundColor(.gray)
@@ -554,7 +557,8 @@ struct KeyView: View {
Label {
Text("Public key", comment: "Label indicating that the text is a user's public account key.")
} icon: {
Image(systemName: "square.on.square.dashed")
Image("copy2")
.resizable()
.contentShape(Rectangle())
.foregroundColor(.accentColor)
.frame(width: 20, height: 20)
@@ -564,7 +568,8 @@ struct KeyView: View {
}
} else {
HStack {
Image(systemName: "checkmark.circle")
Image("check-circle")
.resizable()
.frame(width: 20, height: 20)
Text(NSLocalizedString("Copied", comment: "Label indicating that a user's key was copied."))
.font(.footnote)