Benature/omnivore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Library colour and font size tweaks

Browse Source
This commit is contained in:
Jackson Harper
2023-06-01 13:46:30 +08:00
parent e978b3e492
commit b68fdfffae
4 changed files with 89 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apple/OmnivoreKit/Sources/Views/Colors/Colors.swift
View File

@ -25,6 +25,8 @@ public extension Color {
// New theme colors
static var themeLightGray: Color { Color("_lightGray", bundle: .module) }
static var themeMediumGray: Color { Color("_mediumGray", bundle: .module) }
static var themeMiddleGray: Color { Color("_middleGray", bundle: .module) }
static var themeLightestGray: Color { Color("_lightestGray", bundle: .module) }
static var themeDarkGray: Color { Color("_darkGray", bundle: .module) }
static var themeGrayBg01: Color { Color("_themeGrayBg01", bundle: .module) }
static var themeHighlightColor: Color { Color("_highlightColor", bundle: .module) }

38
apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_lightestGray.colorset/Contents.json Normal file
View File

@ -0,0 +1,38 @@
{
"colors" : [
{
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x89",
"green" : "0x89",
"red" : "0x89"
}
},
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"color" : {
"color-space" : "srgb",
"components" : {
"alpha" : "1.000",
"blue" : "0x89",
"green" : "0x89",
"red" : "0x89"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

38
apple/OmnivoreKit/Sources/Views/Colors/ThemeColors.xcassets/_middleGray.colorset/Contents.json Normal file
View File

@ -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" : "0x3C",
"green" : "0x3C",
"red" : "0x3C"
}
},
"idiom" : "universal"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

37
apple/OmnivoreKit/Sources/Views/FeedItem/LibraryItemCard.swift
View File

@ -121,21 +121,21 @@ public struct LibraryItemCard: View {
AnyView(HStack {
Text("\(estimatedReadingTime)")
.font(Font.system(size: 11, weight: .medium))
.foregroundColor(Color.themeMediumGray)
.foregroundColor(Color.themeMiddleGray)
+
Text("\(readingProgress)")
.font(Font.system(size: 11, weight: .medium))
.foregroundColor(isPartiallyRead ? Color.appGreenSuccess : Color.themeMediumGray)
.foregroundColor(isPartiallyRead ? Color.appGreenSuccess : Color.themeMiddleGray)
+
Text("\(highlightsText)")
.font(Font.system(size: 11, weight: .medium))
.foregroundColor(Color.themeMediumGray)
.foregroundColor(Color.themeMiddleGray)
+
Text("\(notesText)")
.font(Font.system(size: 11, weight: .medium))
.foregroundColor(Color.themeMediumGray)
.foregroundColor(Color.themeMiddleGray)
}
.frame(maxWidth: .infinity, alignment: .leading))
}
@ -148,13 +148,13 @@ public struct LibraryItemCard: View {
image
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 55, height: 73)
.cornerRadius(4)
.frame(width: 40, height: 40)
.cornerRadius(5)
.padding(.top, 2)
} else {
Color.systemBackground
.frame(width: 55, height: 73)
.cornerRadius(4)
.frame(width: 40, height: 40)
.cornerRadius(5)
.padding(.top, 2)
}
}
@ -172,27 +172,12 @@ public struct LibraryItemCard: View {
}
return ""
// var str = ""
// if let author = item.author {
// str += author
// }
//
// if item.author != nil, item.publisherDisplayName != nil {
// str += ", "
// }
//
// if let publisherDisplayName = item.publisherDisplayName {
// str += publisherDisplayName
// }
//
// return str
}
var byLine: some View {
Text(bylineStr)
.font(Font.system(size: 15, weight: .regular))
.foregroundColor(Color.themeMediumGray)
.font(Font.system(size: 11, weight: .regular))
.foregroundColor(Color.themeLightestGray)
.frame(maxWidth: .infinity, alignment: .leading)
.lineLimit(1)
}
@ -202,7 +187,7 @@ public struct LibraryItemCard: View {
readInfo
Text(item.unwrappedTitle)
.font(Font.system(size: 18, weight: .semibold))
.font(Font.system(size: 14, weight: .semibold))
.lineSpacing(1.25)
.foregroundColor(.appGrayTextContrast)
.fixedSize(horizontal: false, vertical: true)