map-per/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[ios] Fix font color not updating with theme change on Wiki page

Browse source 
Signed-off-by: narwalayush4 <narwalayush4@gmail.com>
This commit is contained in:
Ayush Narwal 2025-01-24 20:09:45 +05:30 • committed by Kiryl Kaveryn
parent 1516ea742c
commit fb5f8fb902
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
iphone/Maps/Common/WebViewController.m
View file

@ -27,7 +27,7 @@
- (id)initWithHtml:(NSString *)htmlText baseUrl:(NSURL *)url title:(NSString *)title {
self = [super initWithNibName:nil bundle:nil];
if (self) {
_m_htmlText = [self configuredHtmlWithText:htmlText];
_m_htmlText = htmlText;
_m_url = url;
if (title)
self.navigationItem.title = title;
@ -91,7 +91,7 @@
__typeof(self) self = ws;
if (load) {
if (self.m_htmlText) {
[self.webView loadHTMLString:self.m_htmlText baseURL:self.m_url];
[self.webView loadHTMLString:[self configuredHtmlWithText:self.m_htmlText] baseURL:self.m_url];
} else {
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:self.m_url];
for (NSString *header in headers.allKeys) {

12
iphone/Maps/UI/PlacePage/Components/PlacePageDescriptionViewController.swift
View file

@ -4,7 +4,7 @@ final class PlacePageDescriptionViewController: WebViewController {
let styleTags = """
<head>
<style type=\"text/css\">
body{font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji"; font-size:\(14 * scale); line-height:1.5em; color: \(UIColor.isNightMode() ? UIColor.whitePrimaryText().hexString : UIColor.blackPrimaryText().hexString); padding: 24px 16px;}
body{font-family: -apple-system, BlinkMacSystemFont, "Helvetica Neue", Helvetica, Arial, sans-serif, "Apple Color Emoji"; font-size:\(14 * scale); line-height:1.5em; color: \(UIColor.blackPrimaryText().hexString); padding: 24px 16px;}
</style>
</head>
<body>
@ -13,7 +13,15 @@ final class PlacePageDescriptionViewController: WebViewController {
html = html.replacingOccurrences(of: "</body>", with: "<p><b>wikipedia.org</b></p></body>")
return html
}
override func traitCollectionDidChange(_ previousTraitCollection: UITraitCollection?) {
super.traitCollectionDidChange(previousTraitCollection)
if previousTraitCollection?.userInterfaceStyle != traitCollection.userInterfaceStyle {
guard let m_htmlText else { return }
webView.loadHTMLString(configuredHtml(withText: m_htmlText), baseURL: nil)
}
}
private func isOnBottom(_ scrollView: UIScrollView) -> Bool {
let bottom = scrollView.contentSize.height + scrollView.contentInset.bottom - scrollView.bounds.height
return scrollView.contentOffset.y >= bottom