gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 03:29:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4278 from nextcloud/set_empty_status_message

Browse Source 
Set empty status message
This commit is contained in:
Sowjanya Kota 2024-09-27 12:40:20 +02:00 committed by GitHub
commit f44885bd78
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt
View File

@ -22,7 +22,6 @@ import android.widget.AdapterView.OnItemSelectedListener
import android.widget.ArrayAdapter
import android.widget.ImageView
import android.widget.TextView
import androidx.core.widget.doAfterTextChanged
import androidx.fragment.app.DialogFragment
import androidx.recyclerview.widget.LinearLayoutManager
import autodagger.AutoInjector
@ -177,6 +176,10 @@ class SetStatusDialogFragment :
setupGeneralStatusOptions()
if (currentStatus?.icon == null) {
binding.emoji.setText(getString(R.string.default_emoji))
}
binding.clearStatus.setOnClickListener { clearStatus() }
binding.setStatus.setOnClickListener { setStatusMessage() }
binding.emoji.setOnClickListener { openEmojiPopup() }
@ -214,10 +217,6 @@ class SetStatusDialogFragment :
viewThemeUtils.material.colorMaterialButtonPrimaryTonal(binding.setStatus)
viewThemeUtils.material.colorTextInputLayout(binding.customStatusInputContainer)
binding.customStatusInput.doAfterTextChanged { text ->
binding.setStatus.isEnabled = !text.isNullOrEmpty()
}
}
private fun setupCurrentStatus() {
@ -225,7 +224,6 @@ class SetStatusDialogFragment :
binding.emoji.setText(it.icon)
binding.customStatusInput.text?.clear()
binding.customStatusInput.setText(it.message?.trim())
binding.setStatus.isEnabled = it.message?.isEmpty() == false
visualizeStatus(it.status)
if (it.clearAt > 0) {

5
app/src/test/java/com/nextcloud/talk/json/ConversationConversionTest.kt
View File

@ -61,10 +61,7 @@ class ConversationConversionTest(
checkConversationEntity(conversationEntityConvertedBack, apiVersion)
}
private fun checkConversationEntity(
conversationEntity: ConversationEntity,
apiVersion: Int
) {
private fun checkConversationEntity(conversationEntity: ConversationEntity, apiVersion: Int) {
assertEquals("1@juwd77g6", conversationEntity.internalId)
assertEquals(1, conversationEntity.accountId)