Merge pull request #36 from kevinhinterlong/fixScrollingToAnchor

Minor fix for scrolling to links

app/src/main/java/com/jtmcn/archwiki/viewer/WikiClient.java

@@ -46,7 +46,7 @@ public void addHistory(WikiPage wikiPage) {
 	 */
 	public void loadWikiHtml(WikiPage wikiPage) {
 		webView.loadDataWithBaseURL(
-				ARCHWIKI_BASE,
+				wikiPage.getPageUrl(),
 				wikiPage.getHtmlString(),
 				TEXT_HTML_MIME,
 				UTF_8,

app/src/main/java/com/jtmcn/archwiki/viewer/WikiView.java

@@ -17,8 +17,8 @@
 
 public class WikiView extends WebView {
 	public static final String TAG = WikiView.class.getSimpleName();
-	private Context context;
 	WikiClient wikiClient;
+	private Context context;
 
 	public WikiView(Context context, AttributeSet attrs) {
 		super(context, attrs);

app/src/main/java/com/jtmcn/archwiki/viewer/data/WikiPageBuilder.java

@@ -55,7 +55,7 @@ public static String getPageTitle(StringBuilder htmlString) {
 	 * Removes the contents within the head block of the html
 	 * and replaces it with the a reference to a local css file.
 	 *
-	 * @param htmlString The html of the page as a string.
+	 * @param htmlString       The html of the page as a string.
 	 * @param localCSSFilePath The path of the css file to inject.
 	 * @return true if the block was successfully replaced.
 	 */

app/src/main/java/com/jtmcn/archwiki/viewer/tasks/FetchUrl.java

@@ -13,28 +13,9 @@
  * @param <Result> The type which the fetched url's text will be mapped to.
  */
 public class FetchUrl<Result> extends AsyncTask<String, Void, Result> {
-	/**
-	 * A listener which is called when {@link Result} is ready.
-	 *
-	 * @param <Result> the type of object which has been created.
-	 */
-	public interface OnFinish<Result> {
-		void onFinish(Result result);
-	}
-
-	/**
-	 * Maps the url and fetched text to {@link R}
-	 *
-	 * @param <R> The type which the text will be mapped to.
-	 */
-	public interface FetchUrlMapper<R> {
-		R mapTo(String url, StringBuilder sb);
-	}
-
 	private static final String TAG = FetchUrl.class.getSimpleName();
 	private final OnFinish<Result> onFinish;
 	private final FetchUrlMapper<Result> mapper;
-
 	/**
 	 * Fetches the first url and notifies the {@link OnFinish} listener.
 	 *
@@ -80,4 +61,22 @@ private StringBuilder getItem(String url) {
 
 		return toReturn;
 	}
+
+	/**
+	 * A listener which is called when {@link Result} is ready.
+	 *
+	 * @param <Result> the type of object which has been created.
+	 */
+	public interface OnFinish<Result> {
+		void onFinish(Result result);
+	}
+
+	/**
+	 * Maps the url and fetched text to {@link R}
+	 *
+	 * @param <R> The type which the text will be mapped to.
+	 */
+	public interface FetchUrlMapper<R> {
+		R mapTo(String url, StringBuilder sb);
+	}
 }

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.2'
+        classpath 'com.android.tools.build:gradle:2.3.3'
     }
 }