Merge branch 'improvement/ui' into 'master'

Fix title and add back navigation support

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

1 files changed, 5 insertions, 26 deletions

diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml
index 7d32bfa..40324a1 100644
--- a/app/src/main/res/layout/fragment_fake_location.xml
+++ b/app/src/main/res/layout/fragment_fake_location.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:mapbox="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
@@ -8,26 +8,19 @@
     android:layout_width="match_parent"
     >
 
-    <Toolbar
-        android:background="@color/white"
-        android:id="@+id/toolbar"
-        android:layout_gravity="top|center"
-        android:layout_height="?android:attr/actionBarSize"
-        android:layout_width="match_parent"
-        tools:layout_height="56dp"
-        />
+    <include layout="@layout/topbar"/>
 
     <androidx.core.widget.NestedScrollView
         android:layout_height="match_parent"
-        android:layout_marginBottom="32dp"
-        android:layout_marginTop="?android:attr/actionBarSize"
         android:layout_width="match_parent"
+        app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
 
         <LinearLayout
             android:layout_height="match_parent"
             android:layout_width="match_parent"
             android:orientation="vertical"
+            android:layout_marginBottom="32dp"
             tools:context=".main.MainActivity"
             >
 
@@ -57,20 +50,6 @@
                 android:textSize="14sp"
                 />
 
-            <TextView
-                android:fontFamily="sans-serif-medium"
-                android:id="@+id/my_location_header"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:paddingBottom="8dp"
-                android:paddingTop="16dp"
-                android:paddingLeft="32dp"
-                android:paddingRight="32dp"
-                android:text="@string/my_location_title"
-                android:textColor="@color/black"
-                android:textSize="14sp"
-                />
-
             <RadioGroup
                 android:id="@+id/location_choices"
                 android:layout_height="wrap_content"
@@ -152,4 +131,4 @@
 
         </LinearLayout>
     </androidx.core.widget.NestedScrollView>
-</FrameLayout>
\ No newline at end of file
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file