Add graph view on home dashboard.

2 files changed, 38 insertions, 17 deletions

diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index c97d1a5..6976948 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -142,11 +142,14 @@ android:text="@string/dashboard_state_ipaddress_off"
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:padding="16dp">
+                android:paddingTop="16dp"
+                android:paddingBottom="16dp"
+                >
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/dashboard_graph_label"
+                    android:layout_marginLeft="16dp"
                     app:layout_constraintLeft_toLeftOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     />
@@ -160,6 +163,7 @@ android:text="@string/dashboard_state_ipaddress_off"
                     android:textColor="@color/grey_text_2"
                     app:layout_constraintRight_toRightOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
+                    android:layout_marginRight="16dp"
                     />
 
 <!--                <TextView-->
@@ -170,12 +174,35 @@ android:text="@string/dashboard_state_ipaddress_off"
 <!--                    app:layout_constraintRight_toRightOf="parent"-->
 <!--                    app:layout_constraintTop_toBottomOf="@+id/graph_period"-->
 <!--                    />-->
-                <ImageView
+
+                <com.github.mikephil.charting.charts.BarChart
                     android:id="@+id/graph"
-                    android:layout_height="160dp"
+                    android:layout_height="100dp"
                     android:layout_width="match_parent"
-                    android:src="@drawable/dummy_leakage_analytics"
                     app:layout_constraintTop_toBottomOf="@+id/graph_period"
+                    android:layout_marginTop="16dp"
+                    />
+
+                <View
+                    android:id="@+id/graph_legend_form"
+                    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_disk"
+                    />
+                <TextView
+                    android:id="@+id/graph_legend"
+                    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_form"
+                    app:layout_constraintBottom_toBottomOf="@+id/graph_legend_form"
                     />
             </androidx.constraintlayout.widget.ConstraintLayout>
 
@@ -183,7 +210,7 @@ android:text="@string/dashboard_state_ipaddress_off"
                 layout="@layout/dashboard_item_submenu_button"
                 android:id="@+id/am_i_tracked"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="88dp"
                 app:icon="@{@drawable/ic_tracked}"
                 app:title="@{@string/dashboard_am_i_tracked_title}"
                 app:subTitle='@{""}'
@@ -199,7 +226,7 @@ android:text="@string/dashboard_state_ipaddress_off"
                 layout="@layout/dashboard_item_submenu_button"
                 android:id="@+id/apps_permissions"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="88dp"
                 app:icon="@{@drawable/ic_apps_permissions}"
                 app:title="@{@string/dashboard_apps_permissions_title}"
                 app:subTitle='@{@string/dashboard_apps_permissions_subtitle}'
@@ -207,7 +234,7 @@ android:text="@string/dashboard_state_ipaddress_off"
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginStart="72dp"
+                android:layout_marginStart="48dp"
                 android:background="@color/grey_divider"
                 />
 
@@ -215,7 +242,7 @@ android:text="@string/dashboard_state_ipaddress_off"
                 layout="@layout/dashboard_item_submenu_button"
                 android:id="@+id/my_location"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="88dp"
                 app:icon="@{@drawable/ic_my_location}"
                 app:title="@{@string/dashboard_location_title}"
                 app:subTitle='@{@string/dashboard_location_subtitle_off}'
@@ -223,7 +250,7 @@ android:text="@string/dashboard_state_ipaddress_off"
             <View
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginStart="72dp"
+                android:layout_marginStart="48dp"
                 android:background="@color/grey_divider"
                 />
 
@@ -231,17 +258,11 @@ android:text="@string/dashboard_state_ipaddress_off"
                 layout="@layout/dashboard_item_submenu_button"
                 android:id="@+id/internet_activity_privacy"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="88dp"
                 app:icon="@{@drawable/ic_internet_activity}"
                 app:title="@{@string/dashboard_internet_activity_privacy_title}"
                 app:subTitle='@{@string/dashboard_internet_activity_privacy_subtitle_off}'
                 />
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="1dp"
-                android:layout_marginStart="72dp"
-                android:background="@color/grey_divider"
-                />
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_internet_activity_policy.xml b/app/src/main/res/layout/fragment_internet_activity_policy.xml
index 4f29776..a59d807 100644
--- a/app/src/main/res/layout/fragment_internet_activity_policy.xml
+++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml
@@ -91,7 +91,7 @@
                 android:id="@+id/select_location_container"
                 android:layout_width="match_parent"
                 android:layout_height="54dp"
-                android:background="@drawable/outlined_background"
+                android:background="@drawable/bg_outlined"
                 android:layout_marginTop="16dp"
                 android:padding="1dp"
                 >