Skip to content

Commit

Permalink
Fixed ktlintCheck
Browse files Browse the repository at this point in the history
Signed-off-by: Smarshal21 <[email protected]>
  • Loading branch information
Smarshal21 committed Nov 14, 2023
1 parent c173c70 commit ac030a2
Show file tree
Hide file tree
Showing 4 changed files with 15 additions and 10 deletions.
1 change: 0 additions & 1 deletion app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -1428,7 +1428,6 @@ class ChatActivity :
val smileyButton = binding.messageInputView.findViewById<ImageButton>(R.id.smileyButton)

smileyButton?.setOnClickListener {

if (!isEmojiPickerVisible) {
binding.messageInputView.findViewById<FrameLayout>(R.id.emoji_picker).visibility = View.VISIBLE
isEmojiPickerVisible = true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = ""

Expand Down Expand Up @@ -98,10 +96,8 @@ class RenameConversationDialogFragment : DialogFragment() {

override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)

setupListeners()
setupStateObserver()

}

override fun onStart() {
Expand Down Expand Up @@ -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
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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) }

Expand Down Expand Up @@ -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<GenericOverall> {

Expand Down Expand Up @@ -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
)
}

Expand Down

0 comments on commit ac030a2

Please sign in to comment.