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

Reorganize code

Browse Source
This commit is contained in:
J-Jamet
2022-02-02 18:36:07 +01:00
parent d4f7258ed1
commit 9f41da7868
3 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/com/kunzisoft/keepass/database/search/SearchParameters.kt
View File

@@ -43,8 +43,8 @@ class SearchParameters() : Parcelable{
var searchInUUIDs = false
var searchInTags = false
var searchInTemplates = false
var searchInRecycleBin = false
var searchInTemplates = false
constructor(parcel: Parcel) : this() {
searchQuery = parcel.readString() ?: searchQuery
@@ -60,8 +60,8 @@ class SearchParameters() : Parcelable{
searchInOther = parcel.readByte() != 0.toByte()
searchInUUIDs = parcel.readByte() != 0.toByte()
searchInTags = parcel.readByte() != 0.toByte()
searchInTemplates = parcel.readByte() != 0.toByte()
searchInRecycleBin = parcel.readByte() != 0.toByte()
searchInTemplates = parcel.readByte() != 0.toByte()
}
override fun writeToParcel(parcel: Parcel, flags: Int) {
@@ -78,8 +78,8 @@ class SearchParameters() : Parcelable{
parcel.writeByte(if (searchInOther) 1 else 0)
parcel.writeByte(if (searchInUUIDs) 1 else 0)
parcel.writeByte(if (searchInTags) 1 else 0)
parcel.writeByte(if (searchInTemplates) 1 else 0)
parcel.writeByte(if (searchInRecycleBin) 1 else 0)
parcel.writeByte(if (searchInTemplates) 1 else 0)
}
override fun describeContents(): Int {

16
app/src/main/java/com/kunzisoft/keepass/view/SearchFiltersView.kt
View File

@@ -32,8 +32,8 @@ class SearchFiltersView @JvmOverloads constructor(context: Context,
private var searchOther: CompoundButton
private var searchUUID: CompoundButton
private var searchTag: CompoundButton
private var searchTemplate: CompoundButton
private var searchRecycleBin: CompoundButton
private var searchTemplate: CompoundButton
var searchParameters = SearchParameters()
get() {
@@ -49,8 +49,8 @@ class SearchFiltersView @JvmOverloads constructor(context: Context,
this.searchInOther = searchOther.isChecked
this.searchInUUIDs = searchUUID.isChecked
this.searchInTags = searchTag.isChecked
this.searchInTemplates = searchTemplate.isChecked
this.searchInRecycleBin = searchRecycleBin.isChecked
this.searchInTemplates = searchTemplate.isChecked
}
}
set(value) {
@@ -68,8 +68,8 @@ class SearchFiltersView @JvmOverloads constructor(context: Context,
searchOther.isChecked = value.searchInOther
searchUUID.isChecked = value.searchInUUIDs
searchTag.isChecked = value.searchInTags
searchTemplate.isChecked = value.searchInTemplates
searchRecycleBin.isChecked = value.searchInRecycleBin
searchTemplate.isChecked = value.searchInTemplates
onParametersChangeListener = tempListener
}
@@ -94,8 +94,8 @@ class SearchFiltersView @JvmOverloads constructor(context: Context,
searchUUID = findViewById(R.id.search_chip_uuid)
searchOther = findViewById(R.id.search_chip_other)
searchTag = findViewById(R.id.search_chip_tag)
searchTemplate = findViewById(R.id.search_chip_template)
searchRecycleBin = findViewById(R.id.search_chip_recycle_bin)
searchTemplate = findViewById(R.id.search_chip_template)
// Expand menu with button
searchExpandButton.setOnClickListener {
@@ -153,14 +153,14 @@ class SearchFiltersView @JvmOverloads constructor(context: Context,
searchParameters.searchInTags = isChecked
onParametersChangeListener?.invoke(searchParameters)
}
searchTemplate.setOnCheckedChangeListener { _, isChecked ->
searchParameters.searchInTemplates = isChecked
onParametersChangeListener?.invoke(searchParameters)
}
searchRecycleBin.setOnCheckedChangeListener { _, isChecked ->
searchParameters.searchInRecycleBin = isChecked
onParametersChangeListener?.invoke(searchParameters)
}
searchTemplate.setOnCheckedChangeListener { _, isChecked ->
searchParameters.searchInTemplates = isChecked
onParametersChangeListener?.invoke(searchParameters)
}
}
fun setNumbers(stringNumbers: String) {

14
app/src/main/res/layout/view_search_filters.xml
View File

@@ -42,18 +42,20 @@
app:singleLine="true">
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_current_group"
style="@style/KeepassDXStyle.Chip.Filter.Icon"
app:closeIcon="@drawable/ic_current_folder_white_24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/current_group" />
android:checked="true"
style="@style/KeepassDXStyle.Chip.Filter.Icon"
android:text="@string/current_group"
app:closeIcon="@drawable/ic_current_folder_white_24dp" />
<com.google.android.material.chip.Chip
android:id="@+id/search_chip_case_sensitive"
style="@style/KeepassDXStyle.Chip.Filter.Icon"
app:closeIcon="@drawable/ic_case_sensitive_white_24dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/case_sensitive" />
android:checked="false"
style="@style/KeepassDXStyle.Chip.Filter.Icon"
android:text="@string/case_sensitive"
app:closeIcon="@drawable/ic_case_sensitive_white_24dp" />
</com.google.android.material.chip.ChipGroup>
</HorizontalScrollView>
<ImageButton