diff --git a/ios/WonderousWidget/Colors.swift b/ios/WonderousWidget/Colors.swift index e64aac14..c362b248 100644 --- a/ios/WonderousWidget/Colors.swift +++ b/ios/WonderousWidget/Colors.swift @@ -1,9 +1,10 @@ import Foundation import SwiftUI -struct Colors { - static let accent:Color = Color(red: 0.89, green: 0.58, blue: 0.36) - static let offWhite:Color = Color(red: 0.97, green: 0.92, blue: 0.9) - static let mediumGrey:Color = Color(red: 0.62, green: 0.6, blue: 0.58) - static let darkGrey:Color = Color(red: 0.32, green: 0.31, blue: 0.3); +extension Color { + public static let accent = Color(red: 0.89, green: 0.58, blue: 0.36) + public static let offWhite = Color(red: 0.97, green: 0.92, blue: 0.9) + public static let mediumGrey = Color(red: 0.62, green: 0.6, blue: 0.58) + public static let darkGrey = Color(red: 0.15, green: 0.15, blue: 0.15) + public static let body = Color(red: 0.32, green: 0.31, blue: 0.3); } diff --git a/ios/WonderousWidget/WonderWidgetViewComponents.swift b/ios/WonderousWidget/WonderWidgetViewComponents.swift index 4ce3f066..d9fc8529 100644 --- a/ios/WonderousWidget/WonderWidgetViewComponents.swift +++ b/ios/WonderousWidget/WonderWidgetViewComponents.swift @@ -37,10 +37,10 @@ struct GaugeProgressStyle: ProgressViewStyle { return ZStack { Circle() - .stroke(Colors.darkGrey, style: StrokeStyle(lineWidth: 2)) + .stroke(Color.body, style: StrokeStyle(lineWidth: 2)) Circle() .trim(from: 0, to: fractionCompleted) - .stroke(Colors.accent, style: StrokeStyle(lineWidth: 4, lineCap: .round)) + .stroke(Color.accent, style: StrokeStyle(lineWidth: 4, lineCap: .round)) .rotationEffect(.degrees(90)) } } diff --git a/ios/WonderousWidget/WonderousWidgetView.swift b/ios/WonderousWidget/WonderousWidgetView.swift index baa58166..9b5fd7b4 100644 --- a/ios/WonderousWidget/WonderousWidgetView.swift +++ b/ios/WonderousWidget/WonderousWidgetView.swift @@ -20,7 +20,7 @@ struct WonderousWidgetView : View { if(showTitle) { Text("Collection") .font(.system(size: 15)) - .foregroundColor(Colors.offWhite) + .foregroundColor(.offWhite) } Spacer(); if(showIcon) { @@ -39,7 +39,7 @@ struct WonderousWidgetView : View { .foregroundColor(.white); Text(subTitle) .font(.system(size: 15)) - .foregroundColor(Colors.mediumGrey); + .foregroundColor(.mediumGrey); } } Spacer(); @@ -52,8 +52,9 @@ struct WonderousWidgetView : View { } } - ZStack{ - BgImage(entry: entry) + return ZStack{ + Color.darkGrey + BgImage(entry: entry).opacity(0.8) LinearGradient( gradient: Gradient(colors: [.black.opacity(0), .black]), startPoint: .center,