diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 5a5eda9ce9..1d59ba86c2 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -1428,7 +1428,6 @@ class ChatActivity : val smileyButton = binding.messageInputView.findViewById(R.id.smileyButton) smileyButton?.setOnClickListener { - if (!isEmojiPickerVisible) { binding.messageInputView.findViewById(R.id.emoji_picker).visibility = View.VISIBLE isEmojiPickerVisible = true diff --git a/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt index 1aefdd9f17..6bdde2b969 100644 --- a/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/conversation/CreateConversationDialogFragment.kt @@ -271,7 +271,8 @@ class CreateConversationDialogFragment : DialogFragment() { override fun onResume() { super.onResume() dialog?.window?.setLayout( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT ) } diff --git a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt index f18e0f5e25..7cdfcad535 100644 --- a/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt @@ -61,8 +61,6 @@ class RenameConversationDialogFragment : DialogFragment() { private lateinit var binding: DialogRenameConversationBinding private lateinit var viewModel: RenameConversationViewModel private var isEmojiPickerVisible = false - - private var roomToken = "" private var initialName = "" @@ -98,10 +96,8 @@ class RenameConversationDialogFragment : DialogFragment() { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - setupListeners() setupStateObserver() - } override fun onStart() { @@ -200,12 +196,15 @@ class RenameConversationDialogFragment : DialogFragment() { Log.e(TAG, "Failed to rename conversation") Snackbar.make(binding.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show() } + override fun onResume() { super.onResume() dialog?.window?.setLayout( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT ) } + /** * Fragment creator */ diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt index 734306f822..1900a49252 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt @@ -137,7 +137,8 @@ class SetStatusDialogFragment : DialogFragment(), PredefinedStatusClickListener override fun onNext(responseBody: ResponseBody) { val predefinedStatusOverall: PredefinedStatusOverall = LoganSquare.parse( - responseBody.string(), PredefinedStatusOverall::class.java + responseBody.string(), + PredefinedStatusOverall::class.java ) predefinedStatusOverall.ocs?.data?.let { it1 -> predefinedStatusesList.addAll(it1) } @@ -461,7 +462,11 @@ class SetStatusDialogFragment : DialogFragment(), PredefinedStatusClickListener selectedPredefinedStatus!!.icon != binding.emoji.text.toString() ) { ncApi.setCustomStatusMessage( - credentials, ApiUtils.getUrlForSetCustomStatus(currentUser?.baseUrl), statusIcon, inputText, clearAt + credentials, + ApiUtils.getUrlForSetCustomStatus(currentUser?.baseUrl), + statusIcon, + inputText, + clearAt ).subscribeOn(Schedulers.io()).observeOn(AndroidSchedulers.mainThread()) ?.subscribe(object : Observer { @@ -553,7 +558,8 @@ class SetStatusDialogFragment : DialogFragment(), PredefinedStatusClickListener override fun onResume() { super.onResume() dialog?.window?.setLayout( - ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT + ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT ) }