From 84a2b24554079dac6e69b1a8d3fe6ed6fc23358f Mon Sep 17 00:00:00 2001 From: Sawyer Blatz Date: Thu, 28 Feb 2019 08:36:45 -0800 Subject: [PATCH] Closes #510: Adds private browsing myths SUMO link --- app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt | 7 ++++++- .../main/java/org/mozilla/fenix/settings/SupportUtils.kt | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt index b08d34f3b..de975feca 100644 --- a/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt +++ b/app/src/main/java/org/mozilla/fenix/home/HomeFragment.kt @@ -8,6 +8,7 @@ import android.content.res.Resources import android.graphics.drawable.BitmapDrawable import android.os.Bundle import android.text.SpannableString +import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan import android.text.style.ForegroundColorSpan import android.view.LayoutInflater @@ -41,6 +42,7 @@ import org.mozilla.fenix.home.tabs.toSessionViewState import org.mozilla.fenix.mvi.ActionBusFactory import org.mozilla.fenix.mvi.getAutoDisposeObservable import org.mozilla.fenix.mvi.getManagedEmitter +import org.mozilla.fenix.settings.SupportUtils import kotlin.math.roundToInt fun SessionBundleStorage.archive(sessionManager: SessionManager) { @@ -233,7 +235,9 @@ class HomeFragment : Fragment() { val linkStartIndex = descriptionText.indexOf("\n\n") + 2 val linkAction = object : ClickableSpan() { override fun onClick(widget: View?) { - // TODO Go to SUMO page + requireComponents.useCases.tabsUseCases.addPrivateTab + .invoke(SupportUtils.getSumoURLForTopic(context!!, SupportUtils.SumoTopic.PRIVATE_BROWSING_MYTHS)) + (activity as HomeActivity).openToBrowser(requireComponents.core.sessionManager.selectedSession?.id) } } val textWithLink = SpannableString(descriptionText).apply { @@ -242,6 +246,7 @@ class HomeFragment : Fragment() { val colorSpan = ForegroundColorSpan(private_session_description.currentTextColor) setSpan(colorSpan, linkStartIndex, descriptionText.length, 0) } + private_session_description.movementMethod = LinkMovementMethod.getInstance() private_session_description.text = textWithLink } diff --git a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt index f1632d9e5..e0d628d39 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt @@ -19,7 +19,8 @@ object SupportUtils { enum class SumoTopic( internal val topicStr: String ) { - HELP("firefox-android-help") + HELP("firefox-android-help"), + PRIVATE_BROWSING_MYTHS("private-browsing-myths") } fun getSumoURLForTopic(context: Context, topic: SumoTopic): String {