Moved css to readable file instead of variable

This commit is contained in:
ByteHamster 2020-02-03 23:17:04 +01:00
parent c524d20cc9
commit 6a0542ca1f
2 changed files with 60 additions and 74 deletions

View File

@ -0,0 +1,37 @@
@font-face {
font-family: 'Roboto-Light';
src: url('file:///android_asset/Roboto-Light.ttf');
}
* {
color: %s;
font-family: roboto-Light;
font-size: 13pt;
overflow-wrap: break-word;
}
a {
font-style: normal;
text-decoration: none;
font-weight: normal;
color: #00A8DF;
}
a.timecode {
color: #669900;
}
img, iframe {
display: block;
margin: 10 auto;
max-width: 100%%;
height: auto;
}
body {
margin: %dpx %dpx %dpx %dpx;
}
p#apNoShownotes {
position: fixed;
top: 50%%;
left: 50%%;
transform: translate(-50%%, -50%%);
text-align: center;
-webkit-text-size-adjust: none;
font-size: 80%%;
}

View File

@ -10,11 +10,14 @@ import android.util.Log;
import android.util.TypedValue;
import de.danoeh.antennapod.core.feed.FeedItem;
import org.apache.commons.io.IOUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import java.io.IOException;
import java.io.InputStream;
import java.util.Locale;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@ -34,43 +37,14 @@ import de.danoeh.antennapod.core.util.ShownotesProvider;
public class Timeline {
private static final String TAG = "Timeline";
private static final String WEBVIEW_STYLE =
"@font-face {"
+ "font-family: 'Roboto-Light';"
+ "src: url('file:///android_asset/Roboto-Light.ttf');"
+ "}"
+ "* {"
+ "color: %s;"
+ "font-family: roboto-Light;"
+ "font-size: 13pt;"
+ "overflow-wrap: break-word;"
+ "}"
+ "a {"
+ "font-style: normal;"
+ "text-decoration: none;"
+ "font-weight: normal;"
+ "color: #00A8DF;"
+ "}"
+ "a.timecode {"
+ "color: #669900;"
+ "}"
+ "img, iframe {"
+ "display: block;"
+ "margin: 10 auto;"
+ "max-width: %s;"
+ "height: auto;"
+ "}"
+ "body {"
+ "margin: %dpx %dpx %dpx %dpx;"
+ "}";
private ShownotesProvider shownotesProvider;
private static final Pattern TIMECODE_LINK_REGEX = Pattern.compile("antennapod://timecode/((\\d+))");
private static final String TIMECODE_LINK = "<a class=\"timecode\" href=\"antennapod://timecode/%d\">%s</a>";
private static final Pattern TIMECODE_REGEX = Pattern.compile("\\b((\\d+):)?(\\d+):(\\d{2})\\b");
private static final Pattern LINE_BREAK_REGEX = Pattern.compile("<br */?>");
private final ShownotesProvider shownotesProvider;
private final String noShownotesLabel;
private final String colorPrimaryString;
private final String colorSecondaryString;
private final int pageMargin;
private final String webviewStyle;
public Timeline(Context context, ShownotesProvider shownotesProvider) {
if (shownotesProvider == null) {
@ -82,25 +56,20 @@ public class Timeline {
TypedArray res = context.getTheme().obtainStyledAttributes(new int[]{android.R.attr.textColorPrimary});
@ColorInt int col = res.getColor(0, 0);
colorPrimaryString = "rgba(" + Color.red(col) + "," + Color.green(col) + "," +
Color.blue(col) + "," + (Color.alpha(col) / 255.0) + ")";
final String colorPrimary = "rgba(" + Color.red(col) + "," + Color.green(col) + ","
+ Color.blue(col) + "," + (Color.alpha(col) / 255.0) + ")";
res.recycle();
res = context.getTheme().obtainStyledAttributes(new int[]{android.R.attr.textColorSecondary});
col = res.getColor(0, 0);
colorSecondaryString = "rgba(" + Color.red(col) + "," + Color.green(col) + "," +
Color.blue(col) + "," + (Color.alpha(col) / 255.0) + ")";
res.recycle();
pageMargin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8,
context.getResources().getDisplayMetrics()
);
final int margin = (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, 8,
context.getResources().getDisplayMetrics());
String styleString = "";
try {
InputStream templateStream = context.getAssets().open("shownotes-style.css");
styleString = IOUtils.toString(templateStream, "UTF-8");
} catch (IOException e) {
e.printStackTrace();
}
webviewStyle = String.format(Locale.getDefault(), styleString, colorPrimary, margin, margin, margin, margin);
}
private static final Pattern TIMECODE_LINK_REGEX = Pattern.compile("antennapod://timecode/((\\d+))");
private static final String TIMECODE_LINK = "<a class=\"timecode\" href=\"antennapod://timecode/%d\">%s</a>";
private static final Pattern TIMECODE_REGEX = Pattern.compile("\\b((\\d+):)?(\\d+):(\\d{2})\\b");
private static final Pattern LINE_BREAK_REGEX = Pattern.compile("<br */?>");
/**
* Applies an app-specific CSS stylesheet and adds timecode links (optional).
@ -112,8 +81,6 @@ public class Timeline {
*/
@NonNull
public String processShownotes() {
// load shownotes
String shownotes;
try {
shownotes = shownotesProvider.loadShownotes().call();
@ -124,21 +91,7 @@ public class Timeline {
if (TextUtils.isEmpty(shownotes)) {
Log.d(TAG, "shownotesProvider contained no shownotes. Returning 'no shownotes' message");
shownotes = "<html>" +
"<head>" +
"<style type='text/css'>" +
"html, body { margin: 0; padding: 0; width: 100%; height: 100%; } " +
"html { display: table; }" +
"body { display: table-cell; vertical-align: middle; text-align:center;" +
"-webkit-text-size-adjust: none; font-size: 87%; color: " + colorSecondaryString + ";} " +
"</style>" +
"</head>" +
"<body>" +
"<p>" + noShownotesLabel + "</p>" +
"</body>" +
"</html>";
Log.d(TAG, "shownotes: " + shownotes);
return shownotes;
shownotes = "<html><head></head><body><p id='apNoShownotes'>" + noShownotesLabel + "</p></body></html>";
}
// replace ASCII line breaks with HTML ones if shownotes don't contain HTML line breaks already
@ -147,11 +100,7 @@ public class Timeline {
}
Document document = Jsoup.parse(shownotes);
// apply style
String styleStr = String.format(Locale.getDefault(), WEBVIEW_STYLE, colorPrimaryString, "100%",
pageMargin, pageMargin, pageMargin, pageMargin);
document.head().appendElement("style").attr("type", "text/css").text(styleStr);
document.head().appendElement("style").attr("type", "text/css").text(webviewStyle);
// apply timecode links
addTimecodes(document);