diff options
| author | Romain Hunault <romain.hunault@e.email> | 2021-05-27 16:29:58 +0000 |
|---|---|---|
| committer | Romain Hunault <romain.hunault@e.email> | 2021-05-27 16:29:58 +0000 |
| commit | 97b51f18dcc2f87a9cdd7f482033e30a6282d853 (patch) | |
| tree | d951b14909c2dc4aab9908edea9da2122550c59d /app/src/main/res/layout/fragment_dashboard.xml | |
| parent | 7c02e9a048319c10d7396e7ec094c368f27273fd (diff) | |
| parent | fafd978342abb8332fcf3ed45cdc3b7d437576ba (diff) | |
Merge branch 'improvement/ui' into 'master'
Fix title and add back navigation support
See merge request e/privacy-central/privacycentralapp!5
Diffstat (limited to 'app/src/main/res/layout/fragment_dashboard.xml')
| -rw-r--r-- | app/src/main/res/layout/fragment_dashboard.xml | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 663c270..dc79878 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -1,19 +1,12 @@ <?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" android:layout_height="match_parent" > - <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"/> <ProgressBar android:id="@+id/loadingSpinner" @@ -27,8 +20,8 @@ android:id="@+id/scrollContainer" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="?android:attr/actionBarSize" android:visibility="gone" + app:layout_behavior="@string/appbar_scrolling_view_behavior" > <LinearLayout @@ -347,4 +340,4 @@ </LinearLayout> </androidx.core.widget.NestedScrollView> -</FrameLayout>
\ No newline at end of file +</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file |