<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appbar"
android:layout_width="match_parent"
- android:layout_height="@dimen/app_bar_height"
+ android:layout_height="wrap_content"
android:fitsSystemWindows="true"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
+ android:theme="@style/AppTheme.AppBarOverlay"
>
- <com.google.android.material.appbar.CollapsingToolbarLayout
- android:id="@+id/toolbar_layout"
+ <androidx.appcompat.widget.Toolbar
+ android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- app:contentScrim="?attr/colorPrimary"
- app:layout_scrollFlags="scroll|exitUntilCollapsed"
- app:toolbarId="@+id/toolbar"
- >
-
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/toolbar"
- android:layout_width="match_parent"
- android:layout_height="?attr/actionBarSize"
- app:layout_collapseMode="pin"
- app:popupTheme="@style/ThemeOverlay.AppCompat.DayNight"
- />
- </com.google.android.material.appbar.CollapsingToolbarLayout>
+ android:background="?attr/colorPrimary"
+ app:layout_collapseMode="pin"
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ />
</com.google.android.material.appbar.AppBarLayout>
<androidx.core.widget.NestedScrollView
</androidx.core.widget.NestedScrollView>
<com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/fabAdd"
+ android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
- app:srcCompat="@drawable/ic_add_white_24dp"
android:contentDescription="@string/add_button_description"
- app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
- />
-
- <com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/fabSave"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="bottom|end"
- android:layout_margin="@dimen/fab_margin"
- app:srcCompat="@drawable/ic_save_white_24dp"
- android:contentDescription="@string/save_button_description"
- app:layout_behavior="@string/hide_bottom_view_on_scroll_behavior"
+ app:srcCompat="@drawable/ic_add_white_24dp"
/>
</androidx.coordinatorlayout.widget.CoordinatorLayout>