diff --git a/Passepartout-iOS/Global/Theme.swift b/Passepartout-iOS/Global/Theme.swift index b43f64dd..772be4a6 100644 --- a/Passepartout-iOS/Global/Theme.swift +++ b/Passepartout-iOS/Global/Theme.swift @@ -34,11 +34,21 @@ struct Theme { var accent1 = UIColor(rgb: 0xd69c68, alpha: 1.0) - var primaryText: UIColor = .darkText + var primaryText: UIColor = { + guard #available(iOS 13, *) else { + return .darkText + } + return .label + }() var primaryLightText: UIColor = .white - var secondaryText: UIColor = .gray + var secondaryText: UIColor = { + guard #available(iOS 13, *) else { + return .gray + } + return .secondaryLabel + }() var on: UIColor { return accent1 diff --git a/Passepartout-iOS/Providers.xcassets/nordvpn.imageset/Contents.json b/Passepartout-iOS/Providers.xcassets/nordvpn.imageset/Contents.json index 324b2d27..2352db60 100644 --- a/Passepartout-iOS/Providers.xcassets/nordvpn.imageset/Contents.json +++ b/Passepartout-iOS/Providers.xcassets/nordvpn.imageset/Contents.json @@ -4,11 +4,32 @@ "idiom" : "universal", "scale" : "1x" }, + { + "idiom" : "universal", + "scale" : "1x", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ] + }, { "idiom" : "universal", "filename" : "nordvpn@2x.png", "scale" : "2x" }, + { + "idiom" : "universal", + "filename" : "nordvpn-dark@2x.png", + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "scale" : "2x" + }, { "idiom" : "universal", "filename" : "nordvpn@3x.png", diff --git a/Passepartout-iOS/Providers.xcassets/nordvpn.imageset/nordvpn-dark@2x.png b/Passepartout-iOS/Providers.xcassets/nordvpn.imageset/nordvpn-dark@2x.png new file mode 100644 index 00000000..2703a4dd Binary files /dev/null and b/Passepartout-iOS/Providers.xcassets/nordvpn.imageset/nordvpn-dark@2x.png differ diff --git a/Passepartout-iOS/Providers.xcassets/protonvpn.imageset/protonvpn@2x.png b/Passepartout-iOS/Providers.xcassets/protonvpn.imageset/protonvpn@2x.png index 9078f7bc..f5b03522 100644 Binary files a/Passepartout-iOS/Providers.xcassets/protonvpn.imageset/protonvpn@2x.png and b/Passepartout-iOS/Providers.xcassets/protonvpn.imageset/protonvpn@2x.png differ diff --git a/Passepartout-iOS/Providers.xcassets/protonvpn.imageset/protonvpn@3x.png b/Passepartout-iOS/Providers.xcassets/protonvpn.imageset/protonvpn@3x.png index 4e0e52a5..c25f8ded 100644 Binary files a/Passepartout-iOS/Providers.xcassets/protonvpn.imageset/protonvpn@3x.png and b/Passepartout-iOS/Providers.xcassets/protonvpn.imageset/protonvpn@3x.png differ