rixxc/KeePassDX
1
0
Fork 0
mirror of https://github.com/Kunzisoft/KeePassDX.git synced 2025-12-04 15:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

Unable default username and custom color to Database V2

Browse Source
This commit is contained in:
J-Jamet
2019-10-05 09:22:41 +02:00
parent d72c8184c9
commit e13d53eae4
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/kunzisoft/keepass/database/element/Database.kt
View File

@@ -92,7 +92,8 @@ class Database {
}
val allowDefaultUsername: Boolean
get() = pwDatabaseV3 != null || pwDatabaseV4 != null
get() = pwDatabaseV4 != null
// TODO get() = pwDatabaseV3 != null || pwDatabaseV4 != null
var defaultUsername: String
get() {
@@ -104,7 +105,8 @@ class Database {
}
val allowCustomColor: Boolean
get() = pwDatabaseV3 != null || pwDatabaseV4 != null
get() = pwDatabaseV4 != null
// TODO get() = pwDatabaseV3 != null || pwDatabaseV4 != null
// with format "#000000"
var customColor: String

8
app/src/main/java/com/kunzisoft/keepass/settings/NestedSettingsFragment.kt
View File

@@ -368,10 +368,9 @@ class NestedSettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferen
val dbDefaultUsername: InputTextPreference? = findPreference(getString(R.string.database_default_username_key))
if (mDatabase.allowDefaultUsername) {
dbDefaultUsername?.summary = mDatabase.defaultUsername
// TODO Default Username
dbDefaultUsername?.isEnabled = false
} else {
dbGeneralPrefCategory?.removePreference(dbDefaultUsername)
dbDefaultUsername?.isEnabled = false
// TODO dbGeneralPrefCategory?.removePreference(dbDefaultUsername)
}
// Database custom color
@@ -387,7 +386,8 @@ class NestedSettingsFragment : PreferenceFragmentCompat(), Preference.OnPreferen
}
}
} else {
dbGeneralPrefCategory?.removePreference(dbCustomColorPref)
dbCustomColorPref?.isEnabled = false
// TODO dbGeneralPrefCategory?.removePreference(dbCustomColorPref)
}
// Version

1
app/src/main/res/xml/preferences_database.xml
View File

@@ -46,7 +46,6 @@
xmlns:chroma="http://schemas.android.com/apk/res-auto"
android:key="@string/database_custom_color_key"
android:persistent="false"
android:enabled="false"
android:title="@string/database_custom_color_title"
android:summary="[color]"
chroma:chromaShapePreview="ROUNDED_SQUARE"