tyiu/damus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert to old style ln/dm buttons

Browse Source 
Until we have high-res icons

Changelog-Changed: Revert to old style ln/dm buttons
This commit is contained in:
William Casarin
2023-01-03 23:24:47 -08:00
parent 2ccc7e9a30
commit fb1bcdd31f
1 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
damus/Views/ProfileView.swift
View File

@@ -118,8 +118,6 @@ struct ProfileView: View {
@Environment(\.dismiss) var dismiss @Environment(\.dismiss) var dismiss
@Environment(\.colorScheme) var colorScheme @Environment(\.colorScheme) var colorScheme
//@EnvironmentObject var profile: ProfileModel
// We just want to have a white "< Home" text here, however, // We just want to have a white "< Home" text here, however,
// setting the initialiser is causing issues, and it's late. // setting the initialiser is causing issues, and it's late.
// Ref: https://blog.techchee.com/navigation-bar-title-style-color-and-custom-back-button-in-swiftui/ // Ref: https://blog.techchee.com/navigation-bar-title-style-color-and-custom-back-button-in-swiftui/
@@ -146,10 +144,10 @@ struct ProfileView: View {
open_with_wallet(wallet: user_settings.default_wallet.model, invoice: lnurl) open_with_wallet(wallet: user_settings.default_wallet.model, invoice: lnurl)
} }
}) { }) {
Image("ic-lightning") Image(systemName: "bolt.circle")
.frame(width:44,height:30)
.symbolRenderingMode(.palette) .symbolRenderingMode(.palette)
.font(.system(size: 34).weight(.thin)) .foregroundStyle(colorScheme == .dark ? .white : .black, .black)
.font(.system(size: 32).weight(.thin))
.contextMenu { .contextMenu {
Button { Button {
UIPasteboard.general.string = profile.lnurl ?? "" UIPasteboard.general.string = profile.lnurl ?? ""
@@ -159,7 +157,6 @@ struct ProfileView: View {
} }
} }
.background(fillColor())
.cornerRadius(24) .cornerRadius(24)
.sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) { .sheet(isPresented: $showing_select_wallet, onDismiss: {showing_select_wallet = false}) {
SelectWalletView(showingSelectWallet: $showing_select_wallet, invoice: lnurl) SelectWalletView(showingSelectWallet: $showing_select_wallet, invoice: lnurl)
@@ -174,18 +171,10 @@ struct ProfileView: View {
let dmview = DMChatView(damus_state: damus_state, pubkey: profile.pubkey) let dmview = DMChatView(damus_state: damus_state, pubkey: profile.pubkey)
.environmentObject(dm_model) .environmentObject(dm_model)
return NavigationLink(destination: dmview) { return NavigationLink(destination: dmview) {
RoundedRectangle(cornerRadius: 24) Image(systemName: "bubble.left.circle")
.fill(fillColor()) .symbolRenderingMode(.palette)
.frame(width:44,height:30) .font(.system(size: 32).weight(.thin))
.overlay{ .foregroundStyle(colorScheme == .dark ? .white : .black, .black)
Image("ic-message")
//.background(Color("DamusBlack"))
//.foregroundStyle(Color("DamusBlack"))
.cornerRadius(24)
.frame(width:44,height:30)
.symbolRenderingMode(.palette)
.font(.system(size: 34).weight(.thin))
}
} }
} }
@@ -220,10 +209,8 @@ struct ProfileView: View {
Spacer() Spacer()
if let profile = data { if let profile = data {
if let lnurl = profile.lnurl { if let lnurl = profile.lnurl, lnurl != "" {
if lnurl != "" { LNButton(lnurl: lnurl, profile: profile)
LNButton(lnurl: lnurl, profile: profile)
}
} }
} }