Merge branch '256-app_list_tooltip' into 'main'

256 : Add tooltip info about apps lists.

See merge request e/os/advanced-privacy!91

3 files changed, 78 insertions, 1 deletions

diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt b/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt
new file mode 100644
index 0000000..25a3633
--- /dev/null
+++ b/app/src/main/java/foundation/e/privacycentralapp/common/TextViewHelpers.kt
@@ -0,0 +1,63 @@
+/*
+ * Copyright (C) 2022 E FOUNDATION
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package foundation.e.privacycentralapp.common
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.text.Spannable
+import android.text.SpannableString
+import android.text.style.DynamicDrawableSpan
+import android.text.style.ImageSpan
+import android.widget.TextView
+import androidx.annotation.StringRes
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.appcompat.widget.TooltipCompat
+import foundation.e.privacycentralapp.R
+
+fun setToolTipForAsterisk(
+    textView: TextView,
+    @StringRes textId: Int,
+    @StringRes tooltipTextId: Int
+) {
+    textView.text = asteriskAsInfoIconSpannable(textView.context, textId, textView.textColors)
+    TooltipCompat.setTooltipText(textView, textView.context.getString(tooltipTextId))
+
+    textView.setOnClickListener { it.performLongClick() }
+}
+
+private fun asteriskAsInfoIconSpannable(
+    context: Context,
+    @StringRes textId: Int,
+    tint: ColorStateList
+): Spannable {
+    val spannable = SpannableString(context.getString(textId))
+    val index = spannable.lastIndexOf("*")
+    if (index != -1) {
+        AppCompatResources.getDrawable(context, R.drawable.ic_info_16dp)?.let {
+            it.setTintList(tint)
+            it.setBounds(0, 0, it.intrinsicWidth, it.intrinsicHeight)
+            spannable.setSpan(
+                ImageSpan(it, DynamicDrawableSpan.ALIGN_CENTER),
+                index,
+                index + 1,
+                Spannable.SPAN_INCLUSIVE_INCLUSIVE
+            )
+        }
+    }
+    return spannable
+}
\ No newline at end of file
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt
index ff8e78f..749fae4 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt
@@ -33,10 +33,11 @@ import foundation.e.privacycentralapp.PrivacyCentralApplication
 import foundation.e.privacycentralapp.R
 import foundation.e.privacycentralapp.common.NavToolbarFragment
 import foundation.e.privacycentralapp.common.ToggleAppsAdapter
+import foundation.e.privacycentralapp.common.extensions.toText
 import foundation.e.privacycentralapp.common.initQuickPrivacySnackbar
+import foundation.e.privacycentralapp.common.setToolTipForAsterisk
 import foundation.e.privacycentralapp.databinding.FragmentInternetActivityPolicyBinding
 import foundation.e.privacycentralapp.domain.entities.InternetPrivacyMode
-import foundation.e.privacycentralapp.common.extensions.toText
 import kotlinx.coroutines.launch
 import java.util.Locale
 
@@ -82,6 +83,12 @@ class InternetPrivacyFragment : NavToolbarFragment(R.layout.fragment_internet_ac
             viewModel.submitAction(InternetPrivacyViewModel.Action.UseHiddenIPAction)
         }
 
+        setToolTipForAsterisk(
+            textView = binding.ipscramblingSelectApps,
+            textId = R.string.ipscrambling_select_app,
+            tooltipTextId = R.string.ipscrambling_app_list_infos
+        )
+
         binding.ipscramblingSelectLocation.apply {
             adapter = ArrayAdapter(
                 requireContext(), android.R.layout.simple_spinner_item,
diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
index 4992230..491f625 100644
--- a/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
+++ b/app/src/main/java/foundation/e/privacycentralapp/features/trackers/TrackersFragment.kt
@@ -36,6 +36,7 @@ import foundation.e.privacycentralapp.common.AppsAdapter
 import foundation.e.privacycentralapp.common.GraphHolder
 import foundation.e.privacycentralapp.common.NavToolbarFragment
 import foundation.e.privacycentralapp.common.initQuickPrivacySnackbar
+import foundation.e.privacycentralapp.common.setToolTipForAsterisk
 import foundation.e.privacycentralapp.databinding.FragmentTrackersBinding
 import foundation.e.privacycentralapp.databinding.TrackersItemGraphBinding
 import foundation.e.privacycentralapp.domain.entities.TrackersPeriodicStatistics
@@ -82,6 +83,12 @@ class TrackersFragment :
             viewModel.submitAction(TrackersViewModel.Action.CloseQuickPrivacyDisabledMessage)
         }
 
+        setToolTipForAsterisk(
+            textView = binding.trackersAppsListTitle,
+            textId = R.string.trackers_applist_title,
+            tooltipTextId = R.string.trackers_applist_infos
+        )
+
         viewLifecycleOwner.lifecycleScope.launch {
             viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
                 render(viewModel.state.value)