forked from upstream-mirrors/OpenTracks
When displaying a html anchor link in a TextView, make sure there is
a space before and after the anchor link.
This commit is contained in:
@@ -17,6 +17,7 @@
|
|||||||
package com.google.android.apps.mytracks;
|
package com.google.android.apps.mytracks;
|
||||||
|
|
||||||
import com.google.android.apps.mytracks.fragments.AboutDialogFragment;
|
import com.google.android.apps.mytracks.fragments.AboutDialogFragment;
|
||||||
|
import com.google.android.apps.mytracks.util.StringUtils;
|
||||||
import com.google.android.maps.mytracks.R;
|
import com.google.android.maps.mytracks.R;
|
||||||
|
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
@@ -37,14 +38,13 @@ public class HelpActivity extends AbstractMyTracksActivity {
|
|||||||
setContentView(R.layout.help);
|
setContentView(R.layout.help);
|
||||||
|
|
||||||
TextView mapsPublicUnlisted = (TextView) findViewById(R.id.help_maps_public_unlisted_answer);
|
TextView mapsPublicUnlisted = (TextView) findViewById(R.id.help_maps_public_unlisted_answer);
|
||||||
mapsPublicUnlisted.setText(getString(
|
mapsPublicUnlisted.setText(StringUtils.getHtml(
|
||||||
R.string.help_maps_public_unlisted_answer, getString(R.string.maps_public_unlisted_url)));
|
this, R.string.help_maps_public_unlisted_answer, R.string.maps_public_unlisted_url));
|
||||||
|
|
||||||
TextView sendTrack = (TextView) findViewById(R.id.help_send_track_answer);
|
TextView sendTrack = (TextView) findViewById(R.id.help_send_track_answer);
|
||||||
sendTrack.setText(getString(R.string.help_send_track_answer,
|
sendTrack.setText(StringUtils.getHtml(
|
||||||
getString(R.string.send_google_maps_url),
|
this, R.string.help_send_track_answer, R.string.send_google_maps_url,
|
||||||
getString(R.string.send_google_fusion_tables_url),
|
R.string.send_google_fusion_tables_url, R.string.send_google_docs_url));
|
||||||
getString(R.string.send_google_docs_url)));
|
|
||||||
|
|
||||||
findViewById(R.id.help_ok).setOnClickListener(new OnClickListener() {
|
findViewById(R.id.help_ok).setOnClickListener(new OnClickListener() {
|
||||||
public void onClick(View v) {
|
public void onClick(View v) {
|
||||||
|
|||||||
+4
-3
@@ -19,6 +19,7 @@ package com.google.android.apps.mytracks.io.sendtogoogle;
|
|||||||
import com.google.android.apps.mytracks.util.DialogUtils;
|
import com.google.android.apps.mytracks.util.DialogUtils;
|
||||||
import com.google.android.apps.mytracks.util.IntentUtils;
|
import com.google.android.apps.mytracks.util.IntentUtils;
|
||||||
import com.google.android.apps.mytracks.util.PreferencesUtils;
|
import com.google.android.apps.mytracks.util.PreferencesUtils;
|
||||||
|
import com.google.android.apps.mytracks.util.StringUtils;
|
||||||
import com.google.android.maps.mytracks.R;
|
import com.google.android.maps.mytracks.R;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
@@ -62,9 +63,9 @@ public class ConfirmSharingActivity extends Activity {
|
|||||||
View view = getLayoutInflater().inflate(R.layout.confirm_sharing, null);
|
View view = getLayoutInflater().inflate(R.layout.confirm_sharing, null);
|
||||||
|
|
||||||
TextView textView = (TextView) view.findViewById(R.id.confirm_sharing_text_view);
|
TextView textView = (TextView) view.findViewById(R.id.confirm_sharing_text_view);
|
||||||
textView.setText(getString(
|
textView.setText(StringUtils.getHtml(
|
||||||
R.string.share_track_confirm_message, getString(R.string.maps_public_unlisted_url)));
|
this, R.string.share_track_confirm_message, R.string.maps_public_unlisted_url));
|
||||||
|
|
||||||
checkBox = (CheckBox) view.findViewById(R.id.confirm_sharing_check_box);
|
checkBox = (CheckBox) view.findViewById(R.id.confirm_sharing_check_box);
|
||||||
DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
|
DialogInterface.OnClickListener okListener = new DialogInterface.OnClickListener() {
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -18,6 +18,8 @@ package com.google.android.apps.mytracks.util;
|
|||||||
import com.google.android.maps.mytracks.R;
|
import com.google.android.maps.mytracks.R;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
|
import android.text.Html;
|
||||||
|
import android.text.Spanned;
|
||||||
import android.text.TextUtils;
|
import android.text.TextUtils;
|
||||||
import android.text.format.DateUtils;
|
import android.text.format.DateUtils;
|
||||||
|
|
||||||
@@ -265,4 +267,20 @@ public class StringUtils {
|
|||||||
parts[2] = minutes / 60;
|
parts[2] = minutes / 60;
|
||||||
return parts;
|
return parts;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Gets the html.
|
||||||
|
*
|
||||||
|
* @param context the context
|
||||||
|
* @param resId the string resource id
|
||||||
|
* @param formatArgs the string resource ids of the format arguments
|
||||||
|
*/
|
||||||
|
public static Spanned getHtml(Context context, int resId, Object... formatArgs) {
|
||||||
|
Object[] args = new Object[formatArgs.length];
|
||||||
|
for (int i = 0; i < formatArgs.length; i++) {
|
||||||
|
String url = context.getString((Integer) formatArgs[i]);
|
||||||
|
args[i] = " <a href='" + url + "'>" + url + "</a> ";
|
||||||
|
}
|
||||||
|
return Html.fromHtml(context.getString(resId, args));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user