Skip to content
This repository has been archived by the owner on Jan 15, 2024. It is now read-only.

Commit

Permalink
Revert "Closes #8: Handle markdown in descriptions (#129)"
Browse files Browse the repository at this point in the history 
This reverts commit 431e490.
  • Loading branch information
@bobheadxi
bobheadxi committed Sep 6, 2017
1 parent b10c9f9 commit d274636
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 184 deletions.
8 changes: 0 additions & 8 deletions app/src/main/java/subreddit/android/appstore/backend/reddit/wiki/parser/BaseParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,4 @@ public BaseParser(EncodingFixer encodingFixer) {
String fixEncoding(String input) {
return encodingFixer.fixHtmlEscapes(input);
}

String fixMarkdown(String input) {
return encodingFixer.convertMarkdownToHtml(input);
}

String convertSubredditsToLinks(String input) {
return encodingFixer.convertSubredditsToLinks(input);
}
}
9 changes: 3 additions & 6 deletions ...n/java/subreddit/android/appstore/backend/reddit/wiki/parser/DescriptionColumnParser.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,8 @@ public DescriptionColumnParser(EncodingFixer encodingFixer) {
@Override
public void parse(AppInfo appInfo, Map<Column, String> rawColumns) {
final String rawDescriptionString = rawColumns.get(Column.DESCRIPTION);

String fixedDescription = fixEncoding(rawDescriptionString);
fixedDescription = fixMarkdown(fixedDescription);
fixedDescription = convertSubredditsToLinks(fixedDescription);

appInfo.setDescription(fixedDescription);
// TODO we need to deal with markdown in the descriptions
//noinspection deprecation
appInfo.setDescription(fixEncoding(rawDescriptionString));
}
}
54 changes: 0 additions & 54 deletions app/src/main/java/subreddit/android/appstore/backend/reddit/wiki/parser/EncodingFixer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,65 +2,11 @@

import android.text.Html;

import java.util.regex.Matcher;
import java.util.regex.Pattern;

public class EncodingFixer {
private static final Pattern URL_MARKDOWN_PATTERN = Pattern.compile("(\\[(.*?)\\]\\s{0,1}\\((http.*?)\\))");
private static final Pattern BOLD_MARKDOWN_PATTERN = Pattern.compile("(\\*\\*(.*?)\\*\\*)");
private static final Pattern SUBREDDIT_PATTERN = Pattern.compile("(\\/r\\/.*?(?!\\S))");

public String fixHtmlEscapes(String input) {
//noinspection deprecation
return Html.fromHtml(input).toString();
}

public String convertMarkdownToHtml(String input) {
input = urlMarkdownToHtml(input);
input = boldMarkdownToHtml(input);

return input;
}

public String convertSubredditsToLinks(String input) {
// Converts subreddit mentions to links in HTML
Matcher subredditMatcher = SUBREDDIT_PATTERN.matcher(input);
while (subredditMatcher.find()) {
String matchedSubreddit = subredditMatcher.group(1);

String fixedString = "<a href=\"https://www.reddit.com" + matchedSubreddit +
"\">" + matchedSubreddit + "</a>";

input = input.replaceAll(matchedSubreddit + "(?!\\S)", fixedString);
}
return input;
}

// Converts string with link markdown to HTML
private String urlMarkdownToHtml(String string) {
Matcher urlMarkdownMatcher = URL_MARKDOWN_PATTERN.matcher(string);
while (urlMarkdownMatcher.find()) {
String matchedString = urlMarkdownMatcher.group(2);
String matchedUrl = urlMarkdownMatcher.group(3);

String fixedString = "<a href=\"" + matchedUrl + "\">" + matchedString + "</a>";

string = string.replace(urlMarkdownMatcher.group(1), fixedString);
}
return string;
}

// Converts string with bold markdown to HTML
private String boldMarkdownToHtml(String string) {
Matcher boldMarkdownMatcher = BOLD_MARKDOWN_PATTERN.matcher(string);
while (boldMarkdownMatcher.find()) {
String matchedString = boldMarkdownMatcher.group(2);

String fixedString = "<b>" + matchedString + "</b>";

string = string.replace(boldMarkdownMatcher.group(1), fixedString);
}
return string;
}

}
12 changes: 1 addition & 11 deletions app/src/main/java/subreddit/android/appstore/screens/details/AppDetailsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import android.content.DialogInterface;
import android.content.Intent;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
Expand All @@ -14,8 +13,6 @@
import android.support.v4.view.ViewPager;
import android.support.v7.app.AlertDialog;
import android.support.v7.widget.Toolbar;
import android.text.Html;
import android.text.method.LinkMovementMethod;
import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
Expand Down Expand Up @@ -227,14 +224,7 @@ public void displayDetails(@Nullable AppInfo appInfo) {
secondaryTitle.setText(appInfo.getSecondaryCategory());
downloads = new ArrayList<>(appInfo.getDownloads());
contacts = new ArrayList<>(appInfo.getContacts());

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
description.setText(Html.fromHtml(appInfo.getDescription(), Html.FROM_HTML_MODE_COMPACT));
} else {
description.setText(Html.fromHtml(appInfo.getDescription()));
}
description.setMovementMethod(LinkMovementMethod.getInstance());

description.setText(appInfo.getDescription());
tagContainer.removeAllViews();
for (AppTags appTags : appInfo.getTags()) {
TextView tv = (TextView) LayoutInflater.from(getContext()).inflate(R.layout.view_tagtemplate, tagContainer, false);
Expand Down
10 changes: 1 addition & 9 deletions app/src/main/java/subreddit/android/appstore/screens/list/AppListAdapter.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
package subreddit.android.appstore.screens.list;

import android.os.Build;
import android.preference.PreferenceManager;
import android.support.annotation.Nullable;
import android.text.Html;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
Expand Down Expand Up @@ -93,13 +91,7 @@ public ViewHolder(View itemView) {

public void bind(AppInfo item) {
appName.setText(item.getAppName());

if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
description.setText(Html.fromHtml(item.getDescription(), Html.FROM_HTML_MODE_COMPACT));
} else {
description.setText(Html.fromHtml(item.getDescription()));
}

description.setText(item.getDescription());
if (PreferenceManager.getDefaultSharedPreferences(getContext()).getBoolean(SettingsActivity.PREF_KEY_LOAD_MEDIA, true)) {
iconFrame.setVisibility(View.VISIBLE);
GlideApp.with(getContext())
Expand Down
27 changes: 0 additions & 27 deletions app/src/mock/java/subreddit/android/appstore/backend/reddit/wiki/FakeWikiRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
import io.reactivex.subjects.ReplaySubject;
import subreddit.android.appstore.backend.data.AppInfo;
import subreddit.android.appstore.backend.data.AppTags;
import subreddit.android.appstore.backend.reddit.wiki.parser.EncodingFixer;


public class FakeWikiRepository implements WikiRepository {
Expand All @@ -29,7 +28,6 @@ public Observable<Collection<AppInfo>> getAppList() {
}

private Observable<Collection<AppInfo>> loadData() {
EncodingFixer encodingFixer = new EncodingFixer();
return Observable.defer(() -> {
Collection<AppInfo> testValues = new ArrayList<>();
AppInfo app1 = new AppInfo();
Expand All @@ -48,31 +46,6 @@ private Observable<Collection<AppInfo>> loadData() {
app2.addTag(AppTags.PAID);
app2.addTag(AppTags.NEW);
testValues.add(app2);

// Test app with bold and link markdown in description
AppInfo app3 = new AppInfo();
app3.setAppName("Markdown Test");
app3.setDescription(
encodingFixer.convertMarkdownToHtml("Tutorial **screencast** for [Propellerheads Reason](https://www.propellerheads.se/products/reason/)")
);
app3.setCategories(new ArrayList<String>(Arrays.asList("Testing", "Examples", "Descriptions")));
app3.addTag(AppTags.WEAR);
app3.addTag(AppTags.PAID);
app3.addTag(AppTags.NEW);
testValues.add(app3);

// Test app with Subreddit link conversion
AppInfo app4 = new AppInfo();
app4.setAppName("Subreddit Link Conversion Test");
app4.setDescription(
encodingFixer.convertSubredditsToLinks("Wow! /r/Android is the bestest ever.")
);
app4.setCategories(new ArrayList<String>(Arrays.asList("Testing", "Examples", "Descriptions")));
app4.addTag(AppTags.WEAR);
app4.addTag(AppTags.PAID);
app4.addTag(AppTags.NEW);
testValues.add(app4);

for (int i = 0; i < 1000; i++) {
AppInfo randomApp = new AppInfo();
randomApp.setAppName(UUID.randomUUID().toString() + " app");
Expand Down
22 changes: 11 additions & 11 deletions ...va/subreddit/android/appstore/backend/reddit/wiki/parser/DescriptionColumnParserTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,19 +31,8 @@ public String answer(InvocationOnMock invocation) throws Throwable {
return invocation.getArgument(0);
}
});
when(encodingFixer.convertMarkdownToHtml(anyString())).then(new Answer<String>() {
public String answer(InvocationOnMock invocation) throws Throwable {
return invocation.getArgument(0);
}
});
when(encodingFixer.convertSubredditsToLinks(anyString())).then(new Answer<String>() {
public String answer(InvocationOnMock invocation) throws Throwable {
return invocation.getArgument(0);
}
});
parser = new DescriptionColumnParser(encodingFixer);
}

@Test
public void testParse() throws IOException {
String rawDescriptionData = "This is a description";
Expand All @@ -55,4 +44,15 @@ public void testParse() throws IOException {
assertFalse(appInfo.getDescription().isEmpty());
assertEquals("This is a description", appInfo.getDescription());
}

@Test
public void testParse_withMarkdown() throws IOException {
String rawDescriptionData = "";
Map<AppParser.Column, String> rawColumnMap = new HashMap<>();
rawColumnMap.put(AppParser.Column.DESCRIPTION, rawDescriptionData);
AppInfo appInfo = new AppInfo();
parser.parse(appInfo, rawColumnMap);

//TODO: Implement markdown parsing in DescriptionColumnParser as well
}
}
58 changes: 0 additions & 58 deletions ...rc/test/java/subreddit/android/appstore/backend/reddit/wiki/parser/EncodingFixerTest.java
View file

This file was deleted.

0 comments on commit d274636

Please sign in to comment.