vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-15 08:41:10 +01:00
Code Issues Releases Wiki Activity

Remove markdown from translateable list

Browse source
This commit is contained in:
Gregor Santner 2016-08-07 23:37:02 +02:00
parent c6e3a60411
commit ac81091cce
8 changed files with 30 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -1049,26 +1049,23 @@ public class MainActivity extends AppCompatActivity
break;
case R.id.nav_license_help: {
final CharSequence[] options = {getString(R.string.help_license), getString(R.string.help_help)};
final CharSequence[] options = {getString(R.string.help_license__name), getString(R.string.help_markdown__name)};
new AlertDialog.Builder(MainActivity.this)
.setItems(options, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int item) {
if (options[item].equals(getString(R.string.help_license))) {
final SpannableString s = new SpannableString(Html.fromHtml(getString(R.string.license_text)));
if (options[item].equals(getString(R.string.help_license__name))) {
final SpannableString s = new SpannableString(Html.fromHtml(getString(R.string.help_license__content)));
Linkify.addLinks(s, Linkify.WEB_URLS);
final AlertDialog d = new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.license_title)
.setTitle(R.string.help_license__years)
.setMessage(s)
.setPositiveButton(android.R.string.yes, null).show();
d.show();
((TextView) d.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
}
if (options[item].equals(getString(R.string.help_help))) {
new AlertDialog.Builder(MainActivity.this)
.setTitle(R.string.help_help)
.setMessage(Html.fromHtml(getString(R.string.markdown_text)))
.setPositiveButton(android.R.string.yes, null).show();
if (options[item].equals(getString(R.string.help_markdown__name))) {
Helpers.loadUrlInExternalBrowser(MainActivity.this, getString(R.string.help_markdown__weblink));
}
}
}).show();

10
app/src/main/java/com/github/dfa/diaspora_android/util/Helpers.java
View file

@ -19,7 +19,9 @@
package com.github.dfa.diaspora_android.util;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import com.github.dfa.diaspora_android.R;
@ -34,4 +36,12 @@ public class Helpers {
from.finish();
}
}
public static void loadUrlInExternalBrowser(Context context, String url) {
try {
Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
context.startActivity(browserIntent);
} catch (Exception ignored) {
}
}
}