From 52e7da0b2169b4b44c9c8050186bb20db0063a85 Mon Sep 17 00:00:00 2001
From: Jean-BaptisteC <jeanbaptiste.charron@outlook.fr>
Date: Wed, 10 Jan 2024 18:01:35 +0100
Subject: [PATCH] Remove duplicate link on tracker screen

---
 .../trackerdetail/TrackerDetailFragment.kt    | 26 ++++++++---------
 .../res/layout/fragment_tracker_detail.xml    | 28 ++++++++-----------
 app/src/main/res/menu/tracker_detail_menu.xml | 11 --------
 3 files changed, 25 insertions(+), 40 deletions(-)
 delete mode 100644 app/src/main/res/menu/tracker_detail_menu.xml

diff --git a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/trackerdetail/TrackerDetailFragment.kt b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/trackerdetail/TrackerDetailFragment.kt
index b4b56f4c..cfe776dc 100644
--- a/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/trackerdetail/TrackerDetailFragment.kt
+++ b/app/src/main/java/org/eu/exodus_privacy/exodusprivacy/fragments/trackerdetail/TrackerDetailFragment.kt
@@ -58,18 +58,19 @@ class TrackerDetailFragment : Fragment(R.layout.fragment_tracker_detail) {
             }
 
             binding.apply {
-                toolbarTD.apply {
-                    menu.clear()
-                    inflateMenu(R.menu.tracker_detail_menu)
-                    setOnMenuItemClickListener {
-                        if (it.itemId == R.id.openTrackerPage) {
-                            openURL(
-                                customTabsIntent,
-                                view.context,
-                                tracker.website,
-                            )
-                        }
-                        true
+                openTrackerPage.apply {
+                    setOnClickListener {
+                        openURL(
+                            customTabsIntent,
+                            view.context,
+                            tracker.website,
+                        )
+                    }
+                    setOnLongClickListener {
+                        copyToClipboard(
+                            requireContext(),
+                            tracker.website,
+                        )
                     }
                 }
                 trackerTitleTV.text = tracker.name
@@ -111,7 +112,6 @@ class TrackerDetailFragment : Fragment(R.layout.fragment_tracker_detail) {
                 } else {
                     trackerDescTV.visibility = View.GONE
                 }
-                trackerWebURLTV.text = tracker.website
 
                 // Tracker code and network signatures
                 codeSignTV.text = tracker.code_signature
diff --git a/app/src/main/res/layout/fragment_tracker_detail.xml b/app/src/main/res/layout/fragment_tracker_detail.xml
index 70f9c914..3670dedd 100644
--- a/app/src/main/res/layout/fragment_tracker_detail.xml
+++ b/app/src/main/res/layout/fragment_tracker_detail.xml
@@ -23,6 +23,17 @@
             app:layout_constraintTop_toTopOf="parent"
             app:navigationIcon="@drawable/ic_back" />
 
+        <ImageButton
+            android:id="@+id/openTrackerPage"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:backgroundTint="@android:color/transparent"
+            android:contentDescription="@string/open_tracker_page"
+            android:src="@drawable/ic_website"
+            app:layout_constraintBottom_toBottomOf="@+id/toolbarTD"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/toolbarTD" />
+
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/trackerTitleTV"
             android:layout_width="match_parent"
@@ -78,21 +89,6 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/trackerPresenceTV" />
 
-        <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/trackerWebURLTV"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="10dp"
-            android:ellipsize="end"
-            android:maxLines="2"
-            android:paddingHorizontal="40dp"
-            android:textColor="?android:textColorPrimary"
-            android:textSize="15sp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/trackerDescTV"
-            tools:text="https://www.huaweicentral.com/hms-core/" />
-
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/trackerDetectTV"
             android:layout_width="match_parent"
@@ -106,7 +102,7 @@
             android:textSize="20sp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/trackerWebURLTV" />
+            app:layout_constraintTop_toBottomOf="@+id/trackerDescTV" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/codeDetectTV"
diff --git a/app/src/main/res/menu/tracker_detail_menu.xml b/app/src/main/res/menu/tracker_detail_menu.xml
deleted file mode 100644
index 65443f83..00000000
--- a/app/src/main/res/menu/tracker_detail_menu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/openTrackerPage"
-        android:icon="@drawable/ic_website"
-        android:title="@string/open_tracker_page"
-        app:showAsAction="ifRoom" />
-
-</menu>