diff --git a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift index 425d64458..6fb4a8864 100644 --- a/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift +++ b/apple/OmnivoreKit/Sources/App/Views/Home/HomeFeedViewIOS.swift @@ -482,7 +482,7 @@ struct AnimatingCellHeight: AnimatableModifier { } } } - .background(Color.isDarkMode ? Color(hex: "#1C1C1C") : Color.systemBackground) + .background(Color.themeFeatureBackground) .frame(height: 190) if !Color.isDarkMode { @@ -567,7 +567,7 @@ struct AnimatingCellHeight: AnimatableModifier { featureCard .listRowInsets(.init(top: 0, leading: 0, bottom: 0, trailing: 0)) .listRowSeparator(.hidden, edges: .all) - .modifier(AnimatingCellHeight(height: 190 + (Color.isDarkMode ? 13 : 13))) + .modifier(AnimatingCellHeight(height: 190 + 13)) .onDisappear { withAnimation { isListScrolled = true diff --git a/apple/OmnivoreKit/Sources/Views/Colors/Colors.swift b/apple/OmnivoreKit/Sources/Views/Colors/Colors.swift index 941dce537..643b1d3cd 100644 --- a/apple/OmnivoreKit/Sources/Views/Colors/Colors.swift +++ b/apple/OmnivoreKit/Sources/Views/Colors/Colors.swift @@ -29,6 +29,8 @@ public extension Color { static var themeLightestGray: Color { Color("_lightestGray", bundle: .module) } static var themeDarkWhiteGray: Color { Color("_darkWhiteGray", bundle: .module) } static var themeDarkGray: Color { Color("_darkGray", bundle: .module) } + static var themeLibraryItemSubtle: Color { Color("_themeLibraryItemSubtle", bundle: .module) } + static var themeFeatureBackground: Color { Color("_themeFeatureBackground", bundle: .module) } static var themeLabelOutline: Color { Color("_labelOutline", bundle: .module) } static var themeLabelForeground: Color { Color("_labelForeground", bundle: .module) } diff --git a/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_darkWhiteGray.colorset/Contents.json b/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_darkWhiteGray.colorset/Contents.json index ea75ab602..d4c06f8d5 100644 --- a/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_darkWhiteGray.colorset/Contents.json +++ b/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_darkWhiteGray.colorset/Contents.json @@ -2,7 +2,7 @@ "colors" : [ { "color" : { - "color-space" : "srgb", + "color-space" : "display-p3", "components" : { "alpha" : "1.000", "blue" : "0xD9", diff --git a/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_themeFeatureBackground.colorset/Contents.json b/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_themeFeatureBackground.colorset/Contents.json new file mode 100644 index 000000000..721019f21 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_themeFeatureBackground.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xFF", + "green" : "0xFF", + "red" : "0xFE" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x1C", + "green" : "0x1C", + "red" : "0x1C" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_themeLibraryItemSubtle.colorset/Contents.json b/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_themeLibraryItemSubtle.colorset/Contents.json new file mode 100644 index 000000000..6b73004e9 --- /dev/null +++ b/apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_themeLibraryItemSubtle.colorset/Contents.json @@ -0,0 +1,38 @@ +{ + "colors" : [ + { + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0x3C", + "green" : "0x3C", + "red" : "0x3C" + } + }, + "idiom" : "universal" + }, + { + "appearances" : [ + { + "appearance" : "luminosity", + "value" : "dark" + } + ], + "color" : { + "color-space" : "srgb", + "components" : { + "alpha" : "1.000", + "blue" : "0xD9", + "green" : "0xD9", + "red" : "0xD9" + } + }, + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/apple/OmnivoreKit/Sources/Views/FeedItem/LibraryItemCard.swift b/apple/OmnivoreKit/Sources/Views/FeedItem/LibraryItemCard.swift index ae6feb607..0b1e837cb 100644 --- a/apple/OmnivoreKit/Sources/Views/FeedItem/LibraryItemCard.swift +++ b/apple/OmnivoreKit/Sources/Views/FeedItem/LibraryItemCard.swift @@ -215,25 +215,24 @@ public struct LibraryItemCard: View { $0.icon } - let fgcolor = Color.isDarkMode ? Color.themeDarkWhiteGray : Color.themeMiddleGray Text("\(estimatedReadingTime)") .font(.caption2).fontWeight(.medium) - .foregroundColor(fgcolor) + .foregroundColor(Color.themeLibraryItemSubtle) + Text("\(readingProgress)") .font(.caption2).fontWeight(.medium) - .foregroundColor(isPartiallyRead ? Color.appGreenSuccess : fgcolor) + .foregroundColor(isPartiallyRead ? Color.appGreenSuccess : Color.themeLibraryItemSubtle) + Text("\(highlightsText)") .font(.caption2).fontWeight(.medium) - .foregroundColor(fgcolor) + .foregroundColor(Color.themeLibraryItemSubtle) + Text("\(notesText)") .font(.caption2).fontWeight(.medium) - .foregroundColor(fgcolor) + .foregroundColor(Color.themeLibraryItemSubtle) } .frame(maxWidth: .infinity, alignment: .leading) } @@ -293,7 +292,7 @@ public struct LibraryItemCard: View { var byLine: some View { Text(bylineStr) .font(.caption2) - .foregroundColor(Color.isDarkMode ? Color.themeDarkWhiteGray : Color.themeMiddleGray) + .foregroundColor(Color.themeLibraryItemSubtle) .frame(maxWidth: .infinity, alignment: .leading) .lineLimit(1) }