diff --git a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt index 0fe96a46f..b7e8f6735 100644 --- a/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt +++ b/app/src/main/java/com/kunzisoft/keepass/activities/GroupActivity.kt @@ -580,6 +580,7 @@ class GroupActivity : DatabaseLockActivity(), val databaseName = it.name.ifEmpty { getString(R.string.database) } databaseNavView?.setDatabaseName(databaseName) databaseNameView?.text = databaseName + databaseNavView?.setDatabasePath(it.fileUri?.toString()) databaseNavView?.setDatabaseVersion(it.version) val customColor = it.customColor databaseNavView?.setDatabaseColor(customColor) diff --git a/app/src/main/java/com/kunzisoft/keepass/view/NavigationDatabaseView.kt b/app/src/main/java/com/kunzisoft/keepass/view/NavigationDatabaseView.kt index b0ab2277f..2335c2767 100644 --- a/app/src/main/java/com/kunzisoft/keepass/view/NavigationDatabaseView.kt +++ b/app/src/main/java/com/kunzisoft/keepass/view/NavigationDatabaseView.kt @@ -19,6 +19,7 @@ class NavigationDatabaseView @JvmOverloads constructor(context: Context, private var databaseNavIconView: ImageView? = null private var databaseNavColorView: ImageView? = null private var databaseNavNameView: TextView? = null + private var databaseNavPathView: TextView? = null private var databaseNavVersionView: TextView? = null init { @@ -26,6 +27,7 @@ class NavigationDatabaseView @JvmOverloads constructor(context: Context, databaseNavIconView = databaseNavContainerView?.findViewById(R.id.nav_database_icon) databaseNavColorView = databaseNavContainerView?.findViewById(R.id.nav_database_color) databaseNavNameView = databaseNavContainerView?.findViewById(R.id.nav_database_name) + databaseNavPathView = databaseNavContainerView?.findViewById(R.id.nav_database_path) databaseNavVersionView = databaseNavContainerView?.findViewById(R.id.nav_database_version) } @@ -39,6 +41,15 @@ class NavigationDatabaseView @JvmOverloads constructor(context: Context, databaseNavNameView?.text = name } + fun setDatabasePath(path: String?) { + if (path != null) { + databaseNavPathView?.text = path + databaseNavPathView?.visibility = View.VISIBLE + } else { + databaseNavPathView?.visibility = View.GONE + } + } + fun setDatabaseVersion(version: String) { databaseNavVersionView?.text = version } diff --git a/app/src/main/res/layout/nav_header_database.xml b/app/src/main/res/layout/nav_header_database.xml index f8afe14c1..9ba09d40c 100644 --- a/app/src/main/res/layout/nav_header_database.xml +++ b/app/src/main/res/layout/nav_header_database.xml @@ -57,8 +57,21 @@ + + + app:layout_constraintBottom_toBottomOf="parent" + android:textSize="11sp" + android:text="@string/path"/> \ No newline at end of file