Skip to content

add right-to-left (rtl) rendering support #147

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

Open
fadishei wants to merge 1 commit into
base: master
Choose a base branch
from
Open

add right-to-left (rtl) rendering support #147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions app/src/main/java/me/writeily/model/Constants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,10 @@ public class Constants {

// ----- HTML PREFIX AND SUFFIXES -----
public static final String UNSTYLED_HTML_PREFIX = "<html><body>";
public static final String MD_HTML_PREFIX = "<html><head><style type=\"text/css\">html,body{padding:4px 8px 4px 8px;font-family:'sans-serif-light';color:#303030;}h1,h2,h3,h4,h5,h6{font-family:'sans-serif-condensed';}a{color:#388E3C;text-decoration:underline;}img{height:auto;width:325px;margin:auto;}</style></head><body>";
public static final String DARK_MD_HTML_PREFIX = "<html><head><style type=\"text/css\">html,body{padding:4px 8px 4px 8px;font-family:'sans-serif-light';color:#ffffff;background-color:#303030;}h1,h2,h3,h4,h5,h6{font-family:'sans-serif-condensed';}a{color:#388E3C;text-decoration:underline;}a:visited{color:#dddddd;}img{height:auto;width:325px;margin:auto;}</style></head><body>";
public static final String MD_HTML_PREFIX = "<html><head><style type=\"text/css\">html,body{padding:4px 8px 4px 8px;font-family:'sans-serif-light';color:#303030;}h1,h2,h3,h4,h5,h6{font-family:'sans-serif-condensed';}a{color:#388E3C;text-decoration:underline;}img{height:auto;width:325px;margin:auto;}</style>";
public static final String DARK_MD_HTML_PREFIX = "<html><head><style type=\"text/css\">html,body{padding:4px 8px 4px 8px;font-family:'sans-serif-light';color:#ffffff;background-color:#303030;}h1,h2,h3,h4,h5,h6{font-family:'sans-serif-condensed';}a{color:#388E3C;text-decoration:underline;}a:visited{color:#dddddd;}img{height:auto;width:325px;margin:auto;}</style>";
public static final String MD_HTML_PREFIX_END = "</head><body>";
public static final String MD_HTML_RTL_CSS = "<style>body{text-align:right; direction:rtl;}</style>";
public static final String MD_HTML_SUFFIX = "</body></html>";
public static final String TARGET_DIR = "note_source_dir";

Expand Down
10 changes: 7 additions & 3 deletions app/src/main/java/me/writeily/renderer/MarkDownRenderer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,18 @@ public String renderMarkdown(String markdownRaw, Context context) {

private String themeStringFromContext(Context context) {
String theme = getThemeFromPrefs(context);
String s = "";
if (!theme.equals("")) {
if (theme.equals(context.getString(R.string.theme_dark))) {
return Constants.DARK_MD_HTML_PREFIX;
s += Constants.DARK_MD_HTML_PREFIX;
} else {
return Constants.MD_HTML_PREFIX;
s += Constants.MD_HTML_PREFIX;
}
if (PreferenceManager.getDefaultSharedPreferences(context).getBoolean(context.getString(R.string.pref_render_rtl_key), false))
s += Constants.MD_HTML_RTL_CSS;
s += Constants.MD_HTML_PREFIX_END;
}
return "";
return s;
}

private String getThemeFromPrefs(Context context) {
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/donottranslate.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<string name="pref_email_key">pref_email_key</string>
<string name="pref_about_key">pref_about</string>
<string name="pref_smart_shortcuts_key">pref_smart_shortcuts_key</string>
<string name="pref_render_rtl_key">pref_render_rtl_key</string>

<string name="twitter_url">https://twitter.com/writeily</string>
<string name="writeily_url">https://play.google.com/store/apps/details?id=me.writeily</string>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
<string name="pref_highlighting_delay_summary">Higher values are easier on the battery</string>
<string name="pref_smart_shortcuts">Smart brackets shortcuts</string>
<string name="pref_smart_shortcuts_summary">If text is selected, {}, [] and () will surround the selection</string>
<string name="pref_render_rtl">Render for right-to-left languages</string>
<string name="pin_title">Enter your pin</string>
<string name="passphrase_title">Enter your passphrase</string>
<string name="pin_go">Go</string>
Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/xml/preferences.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,11 @@
android:title="@string/pref_smart_shortcuts"
android:summary="@string/pref_smart_shortcuts_summary" />

<CheckBoxPreference
android:defaultValue="false"
android:key="@string/pref_render_rtl_key"
android:title="@string/pref_render_rtl" />

</PreferenceCategory>

<PreferenceCategory android:title="@string/social">
Expand Down