From a2a4524e510dcbd2ca91557c95fe62b98cc38de8 Mon Sep 17 00:00:00 2001
From: Jeff Boek <jeff@jeffboek.com>
Date: Mon, 20 May 2019 15:05:10 -0700
Subject: [PATCH] For #982 - Opens privacy policy in a custom tab

---
 .../OnboardingPrivacyNoticeViewHolder.kt        | 17 ++++++++++++++++-
 .../org/mozilla/fenix/settings/SupportUtils.kt  | 13 +++++++++++++
 .../res/layout/onboarding_privacy_notice.xml    |  2 +-
 app/src/main/res/values/dimens.xml              |  2 ++
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt
index b041d51ab..b5c4b8c75 100644
--- a/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt
+++ b/app/src/main/java/org/mozilla/fenix/home/sessioncontrol/viewholders/onboarding/OnboardingPrivacyNoticeViewHolder.kt
@@ -6,14 +6,29 @@ package org.mozilla.fenix.home.sessioncontrol.viewholders.onboarding
 
 import android.view.View
 import androidx.recyclerview.widget.RecyclerView
-import kotlinx.android.synthetic.main.onboarding_theme_picker.view.*
+import kotlinx.android.synthetic.main.onboarding_privacy_notice.view.*
+import kotlinx.android.synthetic.main.onboarding_privacy_notice.view.description_text
+import kotlinx.android.synthetic.main.onboarding_privacy_notice.view.header_text
+import org.jetbrains.anko.dimen
 import org.mozilla.fenix.R
+import org.mozilla.fenix.settings.SupportUtils
 
 class OnboardingPrivacyNoticeViewHolder(view: View) : RecyclerView.ViewHolder(view) {
 
     init {
+        val icon = view.context.getDrawable(R.drawable.ic_onboarding_privacy_notice)
+        val size = view.context.dimen(R.dimen.onboarding_privacy_notice_icon_height_width)
+        icon?.setBounds(0, 0, size, size)
+
+        view.header_text.setCompoundDrawables(icon, null, null, null)
+
         val appName = view.context.getString(R.string.app_name)
         view.description_text.text = view.context.getString(R.string.onboarding_privacy_notice_description, appName)
+
+        view.read_button.setOnClickListener {
+            val intent = SupportUtils.createCustomTabIntent(view.context, SupportUtils.PRIVACY_NOTICE_URL)
+            view.context.startActivity(intent)
+        }
     }
 
     companion object {
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 7036badfa..d48023d57 100644
--- a/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
+++ b/app/src/main/java/org/mozilla/fenix/settings/SupportUtils.kt
@@ -5,8 +5,11 @@
 package org.mozilla.fenix.settings
 
 import android.content.Context
+import android.content.Intent
 import android.content.pm.PackageManager
+import android.net.Uri
 import org.mozilla.fenix.BuildConfig
+import org.mozilla.fenix.IntentReceiverActivity
 import java.io.UnsupportedEncodingException
 import java.net.URLEncoder
 import java.util.Locale
@@ -15,6 +18,8 @@ object SupportUtils {
     const val FEEDBACK_URL = "https://input.mozilla.org"
     const val RATE_APP_URL = "market://details?id=" + BuildConfig.APPLICATION_ID
     const val MOZILLA_MANIFESTO_URL = "https://www.mozilla.org/en-GB/about/manifesto/"
+    val PRIVACY_NOTICE_URL: String
+        get() = "https://www.mozilla.org/${getLanguageTag(Locale.getDefault())}/privacy/firefox/"
 
     enum class SumoTopic(
         internal val topicStr: String
@@ -38,6 +43,14 @@ object SupportUtils {
         return "https://support.mozilla.org/$langTag/kb/$escapedTopic"
     }
 
+    fun createCustomTabIntent(context: Context, url: String) = Intent(Intent.ACTION_VIEW).apply {
+        putExtra("android.support.customtabs.extra.SESSION", true)
+        setClassName(context.applicationContext, IntentReceiverActivity::class.java.name)
+        data = Uri.parse(url)
+        setPackage(context.packageName)
+    }
+
+
     private fun getEncodedTopicUTF8(topic: String): String {
         try {
             return URLEncoder.encode(topic, "UTF-8")
diff --git a/app/src/main/res/layout/onboarding_privacy_notice.xml b/app/src/main/res/layout/onboarding_privacy_notice.xml
index 31de08319..28bb7e893 100644
--- a/app/src/main/res/layout/onboarding_privacy_notice.xml
+++ b/app/src/main/res/layout/onboarding_privacy_notice.xml
@@ -30,7 +30,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="16dp"
         android:background="@drawable/button_background"
-        android:backgroundTint="?shadow"
+        android:backgroundTint="?neutralFaded"
         android:clickable="true"
         android:focusable="true"
         android:foreground="?android:attr/selectableItemBackground"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 801bbeb2c..ace7e1e69 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -33,4 +33,6 @@
     <!--Quick Settings-->
     <dimen name="quicksettings_item_height">46dp</dimen>
 
+    <dimen name="onboarding_privacy_notice_icon_height_width">32dp</dimen>
+
 </resources>
\ No newline at end of file