From a6700065178590014ea63d2f5bbd4dab02b85b0d Mon Sep 17 00:00:00 2001 From: J-Jamet Date: Sun, 9 Aug 2020 14:25:22 +0200 Subject: [PATCH] Bottom app bar with center FAB --- .../keepass/activities/EntryEditActivity.kt | 5 ++--- app/src/main/res/layout/activity_entry_edit.xml | 13 ++++--------- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt index b2a89b39f..73bb6fd6e 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/EntryEditActivity.kt @@ -31,7 +31,6 @@ import android.view.View import android.widget.DatePicker import android.widget.TimePicker import androidx.appcompat.app.AlertDialog -import androidx.appcompat.widget.ActionMenuView import androidx.appcompat.widget.Toolbar import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.widget.NestedScrollView @@ -83,7 +82,7 @@ class EntryEditActivity : LockingActivity(), private var coordinatorLayout: CoordinatorLayout? = null private var scrollView: NestedScrollView? = null private var entryEditContentsView: EntryEditContentsView? = null - private var entryEditAddToolBar: ActionMenuView? = null + private var entryEditAddToolBar: Toolbar? = null private var validateButton: View? = null private var lockView: View? = null @@ -207,7 +206,7 @@ class EntryEditActivity : LockingActivity(), entryEditContentsView?.setOnIconViewClickListener { IconPickerDialogFragment.launch(this@EntryEditActivity) } // Bottom Bar - entryEditAddToolBar = findViewById(R.id.entry_edit_bottom_menu_bar) + entryEditAddToolBar = findViewById(R.id.entry_edit_bottom_bar) entryEditAddToolBar?.apply { menuInflater.inflate(R.menu.entry_edit, menu) diff --git a/app/src/main/res/layout/activity_entry_edit.xml b/app/src/main/res/layout/activity_entry_edit.xml index 58a91cf6f..d1aae5883 100644 --- a/app/src/main/res/layout/activity_entry_edit.xml +++ b/app/src/main/res/layout/activity_entry_edit.xml @@ -40,7 +40,6 @@ android:background="?attr/colorPrimary" android:theme="?attr/toolbarAppearance" android:popupTheme="?attr/toolbarPopupAppearance" - app:layout_scrollFlags="enterAlways|scroll|snap" tools:targetApi="lollipop" /> @@ -65,18 +64,14 @@ - - + android:layout_gravity="bottom" />