Merge branch '5217_blocked_trackers' into 'main'

5217 - Display blocked trackers, 5216 : add leaks in tooltips

See merge request e/privacy-central/privacycentralapp!39

1 files changed, 418 insertions, 104 deletions

diff --git a/app/src/main/res/layout/widget.xml b/app/src/main/res/layout/widget.xml
index dc3ac16..ae5bfe7 100644
--- a/app/src/main/res/layout/widget.xml
+++ b/app/src/main/res/layout/widget.xml
@@ -178,205 +178,471 @@
         android:layout_marginHorizontal="24dp"
         android:layout_height="26dp"
         >
-        <ImageView
-            android:id="@+id/widget_graph_bar_0"
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_1"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_0"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_0"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_2"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_1"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_3"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_2"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_4"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_3"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_3"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_5"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_4"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_4"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_6"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_5"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_5"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_7"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_6"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_6"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_8"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_7"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_7"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_9"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_8"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_8"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_10"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_9"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_9"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_11"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_10"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_10"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_12"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_11"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_11"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_13"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_12"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_12"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_14"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_13"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_13"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_15"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_14"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_14"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_16"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_15"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_15"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_17"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_16"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_16"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_18"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_17"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_17"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_19"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_18"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_18"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_20"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_19"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_19"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_21"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_20"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_20"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_22"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_21"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_21"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
             android:layout_marginRight="1.5dp"
-            />
-        <ImageView
-            android:id="@+id/widget_graph_bar_23"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_22"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_22"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
+        <FrameLayout
             android:layout_width="0dp"
             android:layout_weight="1"
             android:layout_height="match_parent"
-            android:src="@color/accent"
-            />
-    </LinearLayout>
+            android:layout_marginRight="1.5dp"
+            >
+            <ImageView
+                android:id="@+id/widget_leaked_graph_bar_23"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/red_off"
+                />
+            <ImageView
+                android:id="@+id/widget_graph_bar_23"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:src="@color/accent"
+                />
+        </FrameLayout>
 
-<!--    <com.github.mikephil.charting.charts.BarChart-->
-<!--        android:id="@+id/graph"-->
-<!--        android:layout_height="144dp"-->
-<!--        android:layout_width="match_parent"-->
-<!--        android:layout_marginHorizontal="24dp"-->
-<!--        />-->
+    </LinearLayout>
 
     <TextView
         android:id="@+id/graph_legend"
@@ -387,9 +653,57 @@
         android:textColor="@color/on_primary_high_emphasis"
         android:layout_marginTop="16dp"
         android:layout_marginHorizontal="24dp"
-        android:layout_marginBottom="24dp"
         />
 
+    <LinearLayout
+        android:id="@+id/graph_legend_values"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:layout_marginTop="16dp"
+        android:layout_marginHorizontal="24dp"
+        android:layout_marginBottom="24dp"
+        >
+
+        <ImageView
+            android:id="@+id/graph_legend_blocked_icon"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:padding="1dp"
+            android:src="@drawable/ic_legend_blocked"
+            />
+        <TextView
+            android:id="@+id/graph_legend_blocked"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="0 Trackers"
+            android:textColor="@color/on_primary_medium_emphasis"
+            android:layout_marginStart="8dp"
+            android:textSize="12sp"
+            android:text="@string/graph_legend_blocked"
+            />
+
+        <ImageView
+            android:id="@+id/graph_legend_allowed_icon"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:padding="1dp"
+            android:layout_marginStart="32dp"
+            android:src="@drawable/ic_legend_leaked"
+            />
+
+        <TextView
+            android:id="@+id/graph_legend_allowed"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            tools:text="0 Trackers"
+            android:textColor="@color/on_primary_medium_emphasis"
+            android:layout_marginStart="8dp"
+            android:textSize="12sp"
+            android:text="@string/graph_legend_allowed"
+            />
+    </LinearLayout>
+
     <TextView
         android:id="@+id/graph_empty"
         android:layout_width="match_parent"