From 0bf4a0ea2cd0dedf281910dcf695541be41edabd Mon Sep 17 00:00:00 2001 From: Tommy DI LUNA Date: Mon, 27 May 2024 15:07:41 +0200 Subject: [PATCH 1/3] Fix tab inserting the toString of objects instead of autocompletion when sharing folder --- .../fileShare/AvailableShareableItemsAdapter.kt | 3 +++ .../java/com/infomaniak/drive/utils/Extensions.kt | 11 ++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt index 1e19dfe242..89a925387b 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt @@ -46,6 +46,7 @@ class AvailableShareableItemsAdapter( private var itemList: ArrayList, var notShareableIds: ArrayList = arrayListOf(), var notShareableEmails: ArrayList = arrayListOf(), + private val getCurrentText: () -> CharSequence, private val onItemClick: (item: Shareable) -> Unit, ) : ArrayAdapter(context, R.layout.item_user, itemList), Filterable { @@ -154,6 +155,8 @@ class AvailableShareableItemsAdapter( values = finalUserList count = finalUserList.size } + + override fun convertResultToString(resultValue: Any?): CharSequence = getCurrentText() } override fun publishResults(constraint: CharSequence?, results: FilterResults) { diff --git a/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt b/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt index 4a61a7ce57..c981526252 100644 --- a/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt +++ b/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt @@ -217,17 +217,18 @@ fun MaterialAutoCompleteTextView.setupAvailableShareableItems( itemList: List, notShareableIds: ArrayList = arrayListOf(), notShareableEmails: ArrayList = arrayListOf(), - onDataPassed: (item: Shareable) -> Unit + onDataPassed: (item: Shareable) -> Unit, ): AvailableShareableItemsAdapter { setDropDownBackgroundResource(R.drawable.background_popup) val availableUsersAdapter = AvailableShareableItemsAdapter( context = context, itemList = ArrayList(itemList), notShareableIds = notShareableIds, - notShareableEmails = notShareableEmails - ) { item -> - onDataPassed(item) - } + getCurrentText = { text }, + notShareableEmails = notShareableEmails, + onItemClick = onDataPassed, + ) + setAdapter(availableUsersAdapter) handleActionDone { if (text.isNotBlank()) !availableUsersAdapter.addFirstAvailableItem() } From 5d099b7aadade952f1b26bcfd5012dc10a569db4 Mon Sep 17 00:00:00 2001 From: Tommy DI LUNA Date: Tue, 28 May 2024 14:22:10 +0200 Subject: [PATCH 2/3] Apply suggestion --- app/src/main/java/com/infomaniak/drive/utils/Extensions.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt b/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt index c981526252..0218f00271 100644 --- a/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt +++ b/app/src/main/java/com/infomaniak/drive/utils/Extensions.kt @@ -224,8 +224,8 @@ fun MaterialAutoCompleteTextView.setupAvailableShareableItems( context = context, itemList = ArrayList(itemList), notShareableIds = notShareableIds, - getCurrentText = { text }, notShareableEmails = notShareableEmails, + getCurrentText = { text }, onItemClick = onDataPassed, ) From 83d396177395cc0e7542111604a366d686743df5 Mon Sep 17 00:00:00 2001 From: Tommy DI LUNA Date: Wed, 29 May 2024 11:15:56 +0200 Subject: [PATCH 3/3] Fix rebase error --- .../ui/fileList/fileShare/AvailableShareableItemsAdapter.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt index 89a925387b..ade80b30f3 100644 --- a/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt +++ b/app/src/main/java/com/infomaniak/drive/ui/fileList/fileShare/AvailableShareableItemsAdapter.kt @@ -155,8 +155,6 @@ class AvailableShareableItemsAdapter( values = finalUserList count = finalUserList.size } - - override fun convertResultToString(resultValue: Any?): CharSequence = getCurrentText() } override fun publishResults(constraint: CharSequence?, results: FilterResults) { @@ -174,6 +172,8 @@ class AvailableShareableItemsAdapter( notifyDataSetChanged() } + + override fun convertResultToString(resultValue: Any?): CharSequence = getCurrentText() } private fun CharSequence.standardize(): String = this.toString().trim().lowercase()