Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-28 20:55:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 965038 - Styling for links. r=nalexander

Browse Source
This commit is contained in:
Richard Newman 2014-01-28 15:49:39 -08:00
parent 9a11e79fd2
commit 6adb819a5a
5 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/base/fxa/activities/FxAccountAbstractActivity.java
View File

@ -118,7 +118,7 @@ public abstract class FxAccountAbstractActivity extends Activity {
continue;
}
ActivityUtils.linkifyTextView(textView);
ActivityUtils.linkifyTextView(textView, false);
}
}

3
mobile/android/base/fxa/activities/FxAccountCreateAccountActivity.java
View File

@ -61,7 +61,8 @@ public class FxAccountCreateAccountActivity extends FxAccountAbstractSetupActivi
final String linkedTOS = "<a href=\"" + linkTerms + "\">" + getString(R.string.fxaccount_policy_linktos) + "</a>";
final String linkedPN = "<a href=\"" + linkPrivacy + "\">" + getString(R.string.fxaccount_policy_linkprivacy) + "</a>";
policyView.setText(getString(R.string.fxaccount_policy_text, linkedTOS, linkedPN));
ActivityUtils.linkifyTextView(policyView);
final boolean underlineLinks = true;
ActivityUtils.linkifyTextView(policyView, underlineLinks);
emailEdit = (EditText) ensureFindViewById(null, R.id.email, "email edit");
passwordEdit = (EditText) ensureFindViewById(null, R.id.password, "password edit");

1
mobile/android/base/resources/layout/fxaccount_create_account.xml
View File

@ -74,6 +74,7 @@
<TextView
android:id="@+id/policy"
style="@style/FxAccountLinkifiedItem"
android:textColorLink="@color/fxaccount_linkified_textColorLinkSubdued"
android:text="@string/fxaccount_policy_text" />
<LinearLayout style="@style/FxAccountSpacer" />

1
mobile/android/base/resources/values/fxaccount_colors.xml
View File

@ -11,6 +11,7 @@
<color name="fxaccount_linkified_textColor">#c0c9d0</color>
<color name="fxaccount_linkified_textColorLink">#0096dd</color>
<color name="fxaccount_linkified_textColorLinkSubdued">#c0c9d0</color>
<color name="fxaccount_error">#d63920</color>
<color name="fxaccount_button_textColor">#ffffff</color>

19
mobile/android/base/sync/setup/activities/ActivityUtils.java
View File

@ -17,6 +17,7 @@ import android.net.Uri;
import android.text.Html;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.TextPaint;
import android.text.method.LinkMovementMethod;
import android.text.style.ClickableSpan;
import android.text.style.URLSpan;
@ -60,9 +61,19 @@ public class ActivityUtils {
*/
public static class FennecClickableSpan extends ClickableSpan {
private final String url;
private final boolean underlining;
public FennecClickableSpan(final String url) {
public FennecClickableSpan(final String url, boolean underlining) {
this.url = url;
this.underlining = underlining;
}
@Override
public void updateDrawState(TextPaint ds) {
super.updateDrawState(ds);
if (!this.underlining) {
ds.setUnderlineText(false);
}
}
@Override
@ -79,10 +90,10 @@ public class ActivityUtils {
final Context context = view.getContext();
final String url = context.getString(link);
view.setText("<a href=\"" + url + "\">" + context.getString(text) + "</a>");
ActivityUtils.linkifyTextView(view);
linkifyTextView(view, false);
}
public static void linkifyTextView(TextView textView) {
public static void linkifyTextView(TextView textView, boolean underlining) {
if (textView == null) {
Logger.warn(LOG_TAG, "Could not process links for view.");
return;
@ -102,7 +113,7 @@ public class ActivityUtils {
final int flags = replaced.getSpanFlags(span);
replaced.removeSpan(span);
replaced.setSpan(new FennecClickableSpan(span.getURL()), start, end, flags);
replaced.setSpan(new FennecClickableSpan(span.getURL(), underlining), start, end, flags);
}
textView.setText(replaced);