committed by
William Casarin
parent
7674f42596
commit
e11147b217
@@ -0,0 +1,38 @@
|
|||||||
|
{
|
||||||
|
"colors" : [
|
||||||
|
{
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0xF4",
|
||||||
|
"green" : "0xEE",
|
||||||
|
"red" : "0xEE"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"appearances" : [
|
||||||
|
{
|
||||||
|
"appearance" : "luminosity",
|
||||||
|
"value" : "dark"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"color" : {
|
||||||
|
"color-space" : "srgb",
|
||||||
|
"components" : {
|
||||||
|
"alpha" : "1.000",
|
||||||
|
"blue" : "0x1E",
|
||||||
|
"green" : "0x1C",
|
||||||
|
"red" : "0x1C"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"idiom" : "universal"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"info" : {
|
||||||
|
"author" : "xcode",
|
||||||
|
"version" : 1
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -14,7 +14,6 @@ struct MutedEventView: View {
|
|||||||
|
|
||||||
let selected: Bool
|
let selected: Bool
|
||||||
@State var shown: Bool
|
@State var shown: Bool
|
||||||
@Environment(\.colorScheme) var colorScheme
|
|
||||||
|
|
||||||
init(damus_state: DamusState, event: NostrEvent, scroller: ScrollViewProxy?, selected: Bool) {
|
init(damus_state: DamusState, event: NostrEvent, scroller: ScrollViewProxy?, selected: Bool) {
|
||||||
self.damus_state = damus_state
|
self.damus_state = damus_state
|
||||||
@@ -28,14 +27,10 @@ struct MutedEventView: View {
|
|||||||
return !should_show_event(contacts: damus_state.contacts, ev: event)
|
return !should_show_event(contacts: damus_state.contacts, ev: event)
|
||||||
}
|
}
|
||||||
|
|
||||||
var FillColor: Color {
|
|
||||||
colorScheme == .light ? Color("DamusLightGrey") : Color("DamusDarkGrey")
|
|
||||||
}
|
|
||||||
|
|
||||||
var MutedBox: some View {
|
var MutedBox: some View {
|
||||||
ZStack {
|
ZStack {
|
||||||
RoundedRectangle(cornerRadius: 20)
|
RoundedRectangle(cornerRadius: 20)
|
||||||
.foregroundColor(FillColor)
|
.foregroundColor(Color("DamusAdaptableGrey"))
|
||||||
|
|
||||||
HStack {
|
HStack {
|
||||||
Text("Post from a user you've blocked", comment: "Text to indicate that what is being shown is a post from a user who has been blocked.")
|
Text("Post from a user you've blocked", comment: "Text to indicate that what is being shown is a post from a user who has been blocked.")
|
||||||
|
|||||||
@@ -8,11 +8,6 @@
|
|||||||
import SwiftUI
|
import SwiftUI
|
||||||
|
|
||||||
struct FollowsYou: View {
|
struct FollowsYou: View {
|
||||||
@Environment(\.colorScheme) var colorScheme
|
|
||||||
|
|
||||||
var fill_color: Color {
|
|
||||||
colorScheme == .light ? Color("DamusLightGrey") : Color("DamusDarkGrey")
|
|
||||||
}
|
|
||||||
|
|
||||||
var body: some View {
|
var body: some View {
|
||||||
Text("Follows you", comment: "Text to indicate that a user is following your profile.")
|
Text("Follows you", comment: "Text to indicate that a user is following your profile.")
|
||||||
@@ -21,7 +16,7 @@ struct FollowsYou: View {
|
|||||||
.foregroundColor(.gray)
|
.foregroundColor(.gray)
|
||||||
.background {
|
.background {
|
||||||
RoundedRectangle(cornerRadius: 5.0)
|
RoundedRectangle(cornerRadius: 5.0)
|
||||||
.foregroundColor(fill_color)
|
.foregroundColor(Color("DamusAdaptableGrey"))
|
||||||
}
|
}
|
||||||
.font(.footnote)
|
.font(.footnote)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -143,10 +143,6 @@ struct ProfileView: View {
|
|||||||
@Environment(\.openURL) var openURL
|
@Environment(\.openURL) var openURL
|
||||||
@Environment(\.presentationMode) var presentationMode
|
@Environment(\.presentationMode) var presentationMode
|
||||||
|
|
||||||
func fillColor() -> Color {
|
|
||||||
colorScheme == .light ? Color("DamusLightGrey") : Color("DamusDarkGrey")
|
|
||||||
}
|
|
||||||
|
|
||||||
func imageBorderColor() -> Color {
|
func imageBorderColor() -> Color {
|
||||||
colorScheme == .light ? Color("DamusWhite") : Color("DamusBlack")
|
colorScheme == .light ? Color("DamusWhite") : Color("DamusBlack")
|
||||||
}
|
}
|
||||||
@@ -496,10 +492,6 @@ struct KeyView: View {
|
|||||||
|
|
||||||
@State private var isCopied = false
|
@State private var isCopied = false
|
||||||
|
|
||||||
func fillColor() -> Color {
|
|
||||||
colorScheme == .light ? Color("DamusLightGrey") : Color("DamusDarkGrey")
|
|
||||||
}
|
|
||||||
|
|
||||||
func keyColor() -> Color {
|
func keyColor() -> Color {
|
||||||
colorScheme == .light ? Color("DamusBlack") : Color("DamusWhite")
|
colorScheme == .light ? Color("DamusBlack") : Color("DamusWhite")
|
||||||
}
|
}
|
||||||
@@ -538,7 +530,7 @@ struct KeyView: View {
|
|||||||
}
|
}
|
||||||
.padding(2)
|
.padding(2)
|
||||||
.padding([.leading, .trailing], 3)
|
.padding([.leading, .trailing], 3)
|
||||||
.background(RoundedRectangle(cornerRadius: 11).foregroundColor(fillColor()))
|
.background(RoundedRectangle(cornerRadius: 11).foregroundColor(Color("DamusAdaptableGrey")))
|
||||||
|
|
||||||
if isCopied != true {
|
if isCopied != true {
|
||||||
Button {
|
Button {
|
||||||
|
|||||||
Reference in New Issue
Block a user