Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display Wikis as HTML in a WebView #2815

Merged
merged 2 commits into from Jul 13, 2018
Merged

Display Wikis as HTML in a WebView #2815

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a11653b
Removed native Wiki implementation
CometDog Jul 8, 2018
1b3f595
Replaced usages of *.lang3.StringEscapeUtils with *.text.StringEscape…
CometDog Jul 13, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions app/build.gradle
View file
Open in desktop
Expand Up @@ -125,6 +125,7 @@ dependencies {
implementation 'me.everything:overscroll-decor-android:1.0.4'
implementation 'com.mikepenz:aboutlibraries:5.8.1'
implementation 'com.googlecode.mp4parser:isoparser:1.1.21'
implementation 'org.apache.commons:commons-text:1.4'

testImplementation 'junit:junit:4.12'
testImplementation 'org.hamcrest:hamcrest-all:1.3'
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/ccrama/redditslide/Activities/MediaView.java
View file
Open in desktop
Expand Up @@ -44,7 +44,7 @@
import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
import com.nostra13.universalimageloader.core.listener.ImageLoadingProgressListener;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

import java.io.BufferedInputStream;
import java.io.File;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/ccrama/redditslide/Activities/ReaderMode.java
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@
import com.afollestad.materialdialogs.AlertDialogWrapper;
import com.wuman.jreadability.Readability;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/ccrama/redditslide/Activities/Search.java
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
import net.dean.jraw.paginators.SubmissionSearchPaginator;
import net.dean.jraw.paginators.TimePeriod;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;

import java.util.Locale;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/ccrama/redditslide/Activities/Shadowbox.java
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@

import net.dean.jraw.models.Submission;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

import java.util.List;

Expand Down
68 changes: 59 additions & 9 deletions app/src/main/java/me/ccrama/redditslide/Activities/Wiki.java
View file
Open in desktop
@@ -1,32 +1,32 @@
package me.ccrama.redditslide.Activities;

import android.content.DialogInterface;
import android.content.res.TypedArray;
import android.graphics.Color;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.annotation.ColorInt;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager;

import com.afollestad.materialdialogs.AlertDialogWrapper;

import net.dean.jraw.managers.WikiManager;

import java.util.ArrayList;
import java.util.List;

import me.ccrama.redditslide.Authentication;
import me.ccrama.redditslide.ColorPreferences;
import me.ccrama.redditslide.Fragments.WikiPage;
import me.ccrama.redditslide.R;
import me.ccrama.redditslide.Visuals.Palette;
import me.ccrama.redditslide.util.LogUtil;
import net.dean.jraw.managers.WikiManager;

import java.util.ArrayList;
import java.util.List;

/**
* Created by ccrama on 9/17/2015.
*/
public class Wiki extends BaseActivityAnim {
public class Wiki extends BaseActivityAnim implements WikiPage.WikiPageListener {

public static final String EXTRA_SUBREDDIT = "subreddit";
public static final String EXTRA_PAGE = "page";
Expand All @@ -37,6 +37,7 @@ public class Wiki extends BaseActivityAnim {
private Wiki.OverviewPagerAdapter adapter;
private List<String> pages;
private String page;
private static String globalCustomCss;

@Override
public void onCreate(Bundle savedInstance) {
Expand All @@ -49,6 +50,7 @@ public void onCreate(Bundle savedInstance) {
setShareUrl("https://reddit.com/r/" + subreddit + "/wiki/");

applyColorTheme(subreddit);
createCustomCss();
setContentView(R.layout.activity_slidetabs);
setupSubredditAppBar(R.id.toolbar, "/r/" + subreddit + " wiki", true, subreddit);

Expand All @@ -67,7 +69,55 @@ public void onCreate(Bundle savedInstance) {

new AsyncGetWiki().executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
}

private void createCustomCss() {
StringBuilder customCssBuilder = new StringBuilder();
customCssBuilder.append("<style>");
TypedArray ta = obtainStyledAttributes(
new int[]{R.attr.activity_background, R.attr.fontColor, R.attr.colorAccent});
customCssBuilder.append("html { ")
.append("background: ".concat(getHexFromColorInt(ta.getColor(0, Color.WHITE))).concat(";"))
.append("color: ".concat(getHexFromColorInt(ta.getColor(1, Color.BLACK))).concat(";"))
.append("; }");
customCssBuilder.append("a { ")
.append("color: ".concat(getHexFromColorInt(ta.getColor(2, Color.BLUE))).concat(";"))
.append("; }");
ta.recycle();
// TODO: Implement horizontal scrolling to Wiki table views
//customCssBuilder.append("table { display: block; overflow-x: auto; white-space: nowrap; }");
customCssBuilder.append("</style>");
globalCustomCss = customCssBuilder.toString();
}

private static String getHexFromColorInt(@ColorInt int colorInt) {
return String.format("#%06X", (0xFFFFFF & colorInt));
}

public static String getGlobalCustomCss() {
return globalCustomCss;
}

public WikiManager wiki;

@Override
public void embeddedWikiLinkClicked(String wikiPageTitle) {
if (pages.contains(wikiPageTitle)) {
pager.setCurrentItem(pages.indexOf(wikiPageTitle));
} else {
new AlertDialogWrapper.Builder(this)
.setTitle(R.string.page_not_found)
.setMessage(R.string.page_does_not_exist)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
dialog.dismiss();
}
})
.create()
.show();
}
}

private class AsyncGetWiki extends AsyncTask<Void, Void, Void> {

@Override
Expand Down Expand Up @@ -160,6 +210,7 @@ public OverviewPagerAdapter(FragmentManager fm) {
@Override
public Fragment getItem(int i) {
Fragment f = new WikiPage();
((WikiPage) f).setListener(Wiki.this);
Bundle args = new Bundle();

args.putString("title", pages.get(i));
Expand All @@ -180,7 +231,6 @@ public int getCount() {
}
}


@Override
public CharSequence getPageTitle(int position) {
return pages.get(position);
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterHelper.java
View file
Open in desktop
Expand Up @@ -55,7 +55,7 @@
import net.dean.jraw.models.Submission;
import net.dean.jraw.models.VoteDirection;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

import java.util.ArrayList;
import java.util.List;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/ccrama/redditslide/Adapters/CommentAdapterSearch.java
View file
Open in desktop
Expand Up @@ -37,7 +37,7 @@
import net.dean.jraw.models.CommentNode;
import net.dean.jraw.models.DistinguishedStatus;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;

import java.util.ArrayList;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/ccrama/redditslide/ColorPreferences.java
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
import android.support.v4.content.ContextCompat;
import android.util.Pair;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

import java.util.ArrayList;
import java.util.Arrays;
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/me/ccrama/redditslide/Fragments/MediaFragment.java
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@

import net.dean.jraw.models.Submission;

import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.text.StringEscapeUtils;

import java.io.File;
import java.io.IOException;
Expand Down