Merge branch 'improvement/ui' into 'master'

Fix title and add back navigation support

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

1 files changed, 3 insertions, 11 deletions

diff --git a/app/src/main/res/layout/fragment_permission_apps.xml b/app/src/main/res/layout/fragment_permission_apps.xml
index 2888af0..65f4169 100644
--- a/app/src/main/res/layout/fragment_permission_apps.xml
+++ b/app/src/main/res/layout/fragment_permission_apps.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -7,20 +7,12 @@
     android:background="@color/white"
     >
 
-    <Toolbar
-        android:id="@+id/toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_gravity="top|center"
-        android:background="@color/white"
-        tools:layout_height="56dp"
-        />
+    <include layout="@layout/topbar"/>
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:layout_marginTop="?android:attr/actionBarSize"
         tools:context=".main.MainActivity"
         >
 
@@ -43,4 +35,4 @@
             tools:listitem="@layout/item_permission_apps"
             android:id="@+id/recylcer_view_permission_apps"/>
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file