Skip to content

Commit

Permalink
Merge pull request #848 from planetary-social/move-colors-to-assets
Browse files Browse the repository at this point in the history
#582: Move colors from SetUpUNSBanner to Assets
  • Loading branch information
joshuatbrown authored Jan 24, 2024
2 parents 252de8d + 2ef216a commit fc303b9
Show file tree
Hide file tree
Showing 9 changed files with 166 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x2C",
"green" : "0x3C",
"red" : "0x92"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xB6",
"green" : "0xD4",
"red" : "0xF8"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF7",
"green" : "0xF8",
"red" : "0xFF"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0xF5",
"green" : "0xF6",
"red" : "0xFD"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x41",
"green" : "0x61",
"red" : "0xF2"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x95",
"green" : "0x57",
"red" : "0xF9"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x08",
"green" : "0x85",
"red" : "0xF0"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x75",
"green" : "0x3F",
"red" : "0xF4"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
12 changes: 6 additions & 6 deletions Nos/Views/UNS/SetUpUNSBanner.swift
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ struct SetUpUNSBanner: View {

private var backgroundGradient: LinearGradient {
LinearGradient(
colors: [Color(hex: "#F08508"), Color(hex: "#F43F75")],
colors: [.unsGradientLeading, .unsGradientTrailing],
startPoint: .leading,
endPoint: .trailing
)
}

var body: some View {
ZStack {
Color(hex: "#923c2c")
Color.unsBackground
.cornerRadius(21)
.offset(y: 2)
VStack {
Expand All @@ -39,10 +39,10 @@ struct SetUpUNSBanner: View {
HStack {
ActionButton(
title: .localizable.manageUniversalName,
textColor: Color(hex: "#f26141"),
depthEffectColor: Color(hex: "#f8d4b6"),
textColor: .unsButtonText,
depthEffectColor: .unsButtonEffect,
backgroundGradient: LinearGradient(
colors: [Color(hex: "#FFF8F7"), Color(hex: "#FDF6F5")],
colors: [.unsButtonGradientLeading, .unsButtonGradientTrailing],
startPoint: .leading,
endPoint: .trailing
),
Expand All @@ -62,7 +62,7 @@ struct SetUpUNSBanner: View {
Image(systemName: "checkmark.seal.fill")
.resizable()
.aspectRatio(1, contentMode: .fit)
.foregroundColor(Color(hex: "#F95795"))
.foregroundColor(.unsCheckmark)
}
.offset(x: 28)
)
Expand Down

0 comments on commit fc303b9

Please sign in to comment.