From bdf9198bb069f2ab9619cb4d3a85f5c2cbf9f0cd Mon Sep 17 00:00:00 2001
From: jacquarg <guillaume.jacquart@hoodbrains.com>
Date: Tue, 5 Apr 2022 18:53:40 +0200
Subject: 5217 - Display blocked trackers, 5216 : add leaks in tooltips

---
 app/src/main/res/drawable/ic_legend_blocked.xml |  21 +
 app/src/main/res/drawable/ic_legend_leaked.xml  |  21 +
 app/src/main/res/layout/fragment_dashboard.xml  |  49 +++
 app/src/main/res/layout/trackers_item_graph.xml |  49 +++
 app/src/main/res/layout/widget.xml              | 522 +++++++++++++++++++-----
 app/src/main/res/values/strings.xml             |   2 +
 6 files changed, 560 insertions(+), 104 deletions(-)
 create mode 100644 app/src/main/res/drawable/ic_legend_blocked.xml
 create mode 100644 app/src/main/res/drawable/ic_legend_leaked.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable/ic_legend_blocked.xml b/app/src/main/res/drawable/ic_legend_blocked.xml
new file mode 100644
index 0000000..15f8c56
--- /dev/null
+++ b/app/src/main/res/drawable/ic_legend_blocked.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ 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/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/accent"/>
+    <size android:width="12dp" android:height="12dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_legend_leaked.xml b/app/src/main/res/drawable/ic_legend_leaked.xml
new file mode 100644
index 0000000..a96501f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_legend_leaked.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ 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/>.
+  -->
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="oval">
+    <solid android:color="@color/red_off"/>
+    <size android:width="12dp" android:height="12dp" />
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 53ec617..ff64733 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -188,6 +188,55 @@ android:text="@string/dashboard_state_ipaddress_off"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toBottomOf="@+id/graph"
                     />
+
+                <View
+                    android:id="@+id/graph_legend_blocked_icon"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:padding="1dp"
+                    app:layout_constraintLeft_toLeftOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/graph_legend"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="16dp"
+                    android:background="@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:layout_marginStart="8dp"
+                    android:textSize="12sp"
+                    app:layout_constraintLeft_toRightOf="@+id/graph_legend_blocked_icon"
+                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/graph_legend_blocked"
+                    />
+
+                <View
+                    android:id="@+id/graph_legend_allowed_icon"
+                    android:layout_width="16dp"
+                    android:layout_height="16dp"
+                    android:padding="1dp"
+                    app:layout_constraintLeft_toRightOf="@+id/graph_legend_blocked"
+                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"
+                    android:layout_marginTop="8dp"
+                    android:layout_marginStart="32dp"
+                    android:background="@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:layout_marginStart="8dp"
+                    android:textSize="12sp"
+                    app:layout_constraintLeft_toRightOf="@+id/graph_legend_allowed_icon"
+                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"
+                    android:layout_marginTop="8dp"
+                    android:text="@string/graph_legend_allowed"
+                    />
+
                 <TextView
                     android:id="@+id/graph_empty"
                     android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/trackers_item_graph.xml b/app/src/main/res/layout/trackers_item_graph.xml
index 5cc2d98..933b96c 100644
--- a/app/src/main/res/layout/trackers_item_graph.xml
+++ b/app/src/main/res/layout/trackers_item_graph.xml
@@ -55,6 +55,55 @@
             android:layout_width="match_parent"
             app:layout_constraintTop_toBottomOf="@+id/graph_period_label"
             />
+
+        <View
+            android:id="@+id/graph_legend_blocked_icon"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:padding="1dp"
+            app:layout_constraintLeft_toLeftOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/graph"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="16dp"
+            android:background="@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:layout_marginStart="8dp"
+            android:textSize="12sp"
+            app:layout_constraintLeft_toRightOf="@+id/graph_legend_blocked_icon"
+            app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"
+            android:layout_marginTop="8dp"
+            android:text="@string/graph_legend_blocked"
+            />
+
+        <View
+            android:id="@+id/graph_legend_allowed_icon"
+            android:layout_width="16dp"
+            android:layout_height="16dp"
+            android:padding="1dp"
+            app:layout_constraintLeft_toRightOf="@+id/graph_legend_blocked"
+            app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"
+            android:layout_marginTop="8dp"
+            android:layout_marginStart="32dp"
+            android:background="@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:layout_marginStart="8dp"
+            android:textSize="12sp"
+            app:layout_constraintLeft_toRightOf="@+id/graph_legend_allowed_icon"
+            app:layout_constraintBottom_toBottomOf="@+id/graph_legend_blocked_icon"
+            android:layout_marginTop="8dp"
+            android:text="@string/graph_legend_allowed"
+            />
+
         <TextView
             android:id="@+id/graph_empty"
             android:layout_width="match_parent"
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"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ce7709c..88bd473 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -4,6 +4,8 @@
     <!-- Commons -->
     <string name="dummy_system_app_label">System</string>
     <string name="graph_empty_message">Congratulations! No trackers are profiling you.</string>
+    <string name="graph_legend_blocked">Blocked leaks</string>
+    <string name="graph_legend_allowed">Allowed leaks</string>
 
     <!-- Dashboard -->
     <string name="dashboard_title">@string/app_name</string>
-- 
cgit v1.2.1