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

set fontsize and token on localstorage for apple web embed

Browse Source
This commit is contained in:
Satindar Dhillon
2022-03-21 09:48:34 -07:00
parent 4d6c54da12
commit 2ddbeceeb1
4 changed files with 31 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReader.swift
View File

@ -275,8 +275,7 @@ struct WebReader: UIViewRepresentable {
item: item,
authToken: authToken,
isDark: UITraitCollection.current.userInterfaceStyle == .dark,
fontSize: "\(fontSize())px",
margin: "0"
fontSize: fontSize()
)
.styledContent,
baseURL: ViewsPackage.bundleURL

29
apple/OmnivoreKit/Sources/App/Views/WebReader/WebReaderContent.swift
View File

@ -3,12 +3,7 @@ import Models
import Utils
struct WebReaderContent {
let textFontSize: String
let fontColor: String
let fontColorTransparent: String
let tableHeaderColor: String
let headerColor: String
let margin: String
let textFontSize: Int
let content: String
let item: FeedItem
let themeKey: String
@ -18,29 +13,17 @@ struct WebReaderContent {
htmlContent: String,
item: FeedItem,
authToken: String,
isDark: Bool = false,
fontSize: String = "16px",
margin: String = "24px"
isDark: Bool,
fontSize: Int
) {
self.textFontSize = fontSize
self.fontColor = isDark ? "#B9B9B9" : "#3D3D3D"
self.fontColorTransparent = isDark ? "rgba(185,185,185,0.65)" : "rgba(185,185,185,0.65)"
self.tableHeaderColor = "#FFFFFF"
self.headerColor = isDark ? "#B9B9B9" : "#3D3D3D"
self.margin = margin
self.content = htmlContent
self.item = item
self.themeKey = isDark ? "Gray" : "LightGray"
self.authToken = authToken
}
var styleString: String {
// swiftlint:disable line_length
"--text-font-size:\(textFontSize);--font-color:\(fontColor);--font-color-transparent\(fontColorTransparent);--table-header-color:\(tableHeaderColor);--headers-color:\(headerColor);--app-margin:\(margin);"
}
// TODO: pass in fontSize and theme
// swiftlint:disable line_length
var styledContent: String {
"""
<!DOCTYPE html>
@ -53,7 +36,7 @@ struct WebReaderContent {
</style>
</head>
<body>
<div id="root" style="\(styleString)">
<div id="root">
<script type="text/javascript">
function loadArticle() {
window.omnivoreArticle = {
@ -74,7 +57,9 @@ struct WebReaderContent {
}
loadArticle()
window.fontSize = \(textFontSize)
window.localStorage.setItem("authToken", "\(authToken)")
window.localStorage.setItem("theme", "\(themeKey)")
</script>
</div>
<script src="bundle.js"></script>

2
apple/OmnivoreKit/Sources/Utils/FeatureFlags.swift
View File

@ -15,5 +15,5 @@ public enum FeatureFlag {
public static let enableShareButton = false
public static let enableSnooze = false
public static let showFeedItemTags = false
public static let useLocalWebView = true
public static let useLocalWebView = false
}

22
apple/OmnivoreKit/Sources/Views/Resources/fonts.css
View File

@ -1,3 +1,25 @@
html,
body {
padding: 0;
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, Segoe UI, Roboto, Oxygen,
Ubuntu, Cantarell, Fira Sans, Droid Sans, Helvetica Neue, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
line-height: 1.6;
font-size: 18px;
}
.disable-webkit-callout {
-webkit-touch-callout: none;
}
*,
*::before,
*::after {
box-sizing: border-box;
}
@font-face {
font-family: 'Inter';
font-weight: 200;