Bug 229528 - Fix content offset at about screen

wikimedia · Aug 30, 2019 · 883e82c · 883e82c
1 parent 6e10dc1
commit 883e82c
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/Wikipedia/Code/AboutViewController.m b/Wikipedia/Code/AboutViewController.m
@@ -96,6 +96,12 @@ - (void)wmf_preventTextFromExpandingOnRotation {
     [self evaluateJavaScript:@"document.body.style['-webkit-text-size-adjust'] = 'none';" completionHandler:nil];
 }
 
+- (void)wmf_setDocumentScrollTopWith:(CGFloat)offset {
+    CGFloat yScrollTop = self.iOS12yOffsetHack + offset;
+    NSString *format = @"document.body.scrollTop = %f;";
+    [self evaluateJavaScript:[NSString stringWithFormat:format, yScrollTop] completionHandler:nil];
+}
+
 @end
 
 @interface AboutViewController ()
@@ -175,6 +181,15 @@ - (NSString *)title {
     return WMFLocalizedStringWithDefaultValue(@"about-title", nil, nil, @"About", @"Title for credits page\n{{Identical|About}}");
 }
 
+#pragma mark - Web View Configuration
+
+- (void)updateWebViewContentOffset {
+    dispatch_after(dispatch_time(DISPATCH_TIME_NOW, (int64_t)(0.1 * NSEC_PER_SEC)), dispatch_get_main_queue(), ^{
+        CGFloat barHeight = self.navigationController.navigationBar.frame.size.height;
+        [self.webView wmf_setDocumentScrollTopWith:barHeight];
+    });
+}
+
 #pragma mark - Accessors
 
 - (NSDictionary *)data {
@@ -298,6 +313,7 @@ - (void)webView:(WKWebView *)webView decidePolicyForNavigationAction:(WKNavigati
 - (void)webView:(WKWebView *)webView didFinishNavigation:(null_unspecified WKNavigation *)navigation {
     if (!([[self class] isLicenseURL:[webView URL]] || [[self class] isLicenseRedirectURL:[webView URL]])) {
         [self injectAboutPageContentIntoWebView:webView];
+        [self updateWebViewContentOffset];
     } else {
         [webView wmf_preventTextFromExpandingOnRotation];
     }

diff --git a/Wikipedia/Code/AboutViewController.plist b/Wikipedia/Code/AboutViewController.plist
@@ -138,6 +138,7 @@ THE SOFTWARE.</string>
 		<string>André Costa</string>
 		<string>Anthony Borba</string>
 		<string>Antoine Musso</string>
+		<string>Alexey Karataev</string>
 		<string>Barbara Martina Rodeker</string>
 		<string>bart-kneepkens</string>
 		<string>Bernd Sitzmann</string>
@@ -154,7 +155,7 @@ THE SOFTWARE.</string>
 		<string>David Xia</string>
 		<string>Dmitry Brant</string>
 		<string>Elena Tonkovidova</string>
-        <string>Ethan Holshouser</string>
+		<string>Ethan Holshouser</string>
 		<string>Gabicoware</string>
 		<string>Gianmarco Salerno</string>
 		<string>Hua Zhenyu</string>