diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt index eeed43b49..c55a727f3 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/NestedDatabaseSettingsFragment.kt @@ -654,8 +654,9 @@ class NestedDatabaseSettingsFragment : NestedSettingsFragment(), DatabaseRetriev inflater.inflate(R.menu.database, menu) if (mDatabaseReadOnly) { menu.findItem(R.id.menu_save_database)?.isVisible = false + menu.findItem(R.id.menu_merge_database)?.isVisible = false } - if (!mMergeDataAllowed || mDatabaseReadOnly) { + if (!mMergeDataAllowed) { menu.findItem(R.id.menu_merge_database)?.isVisible = false } } diff --git a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt index a9197d910..04f19014c 100644 --- a/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/settings/SettingsActivity.kt @@ -30,6 +30,7 @@ import android.widget.Toast import androidx.appcompat.widget.Toolbar import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.fragment.app.Fragment +import com.google.android.material.floatingactionbutton.FloatingActionButton import com.kunzisoft.keepass.R import com.kunzisoft.keepass.activities.dialogs.AssignMasterKeyDialogFragment import com.kunzisoft.keepass.activities.helpers.ExternalFileHelper @@ -52,7 +53,7 @@ open class SettingsActivity private var coordinatorLayout: CoordinatorLayout? = null private var toolbar: Toolbar? = null - private var lockView: View? = null + private var lockView: FloatingActionButton? = null override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -112,11 +113,12 @@ open class SettingsActivity } if (savedInstanceState == null) { + lockView?.visibility = View.GONE supportFragmentManager.beginTransaction() .add(R.id.fragment_container, retrieveMainFragment()) .commit() } else { - lockView?.visibility = if (savedInstanceState.getBoolean(SHOW_LOCK)) View.VISIBLE else View.GONE + if (savedInstanceState.getBoolean(SHOW_LOCK)) lockView?.show() else lockView?.hide() } backupManager = BackupManager(this) @@ -187,14 +189,14 @@ open class SettingsActivity NestedSettingsFragment.Screen.DATABASE, NestedSettingsFragment.Screen.DATABASE_MASTER_KEY, NestedSettingsFragment.Screen.DATABASE_SECURITY -> { - lockView?.visibility = View.VISIBLE + lockView?.show() } else -> { - lockView?.visibility = View.GONE + lockView?.hide() } } } else { - lockView?.visibility = View.GONE + lockView?.hide() } } diff --git a/app/src/main/res/layout/activity_toolbar.xml b/app/src/main/res/layout/activity_toolbar.xml index 6a8fa665f..be4dd28bd 100644 --- a/app/src/main/res/layout/activity_toolbar.xml +++ b/app/src/main/res/layout/activity_toolbar.xml @@ -44,7 +44,6 @@ layout="@layout/view_button_lock" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:visibility="gone" android:layout_gravity="start|bottom" /> \ No newline at end of file