Skip to content

Commit 32d678e

Browse files
committed
WIP - linter
Signed-off-by: rapterjet2004 <[email protected]>
1 parent 085ecc7 commit 32d678e

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4060,15 +4060,16 @@ class ChatActivity :
40604060

40614061
fun pinMessage(message: ChatMessage) {
40624062
val url = ApiUtils.getUrlForChatMessagePinning(chatApiVersion, conversationUser?.baseUrl, roomToken, message.id)
4063-
binding.genericComposeView.setContent {
4063+
binding.genericComposeView.apply {
40644064
val shouldDismiss = mutableStateOf(false)
4065+
setContent {
4066+
GetPinnedOptionsDialog(shouldDismiss, context, viewThemeUtils) { zonedDateTime ->
4067+
zonedDateTime?.let {
4068+
chatViewModel.pinMessage(credentials!!, url, pinUntil = zonedDateTime.toEpochSecond().toInt())
4069+
} ?: chatViewModel.pinMessage(credentials!!, url)
40654070

4066-
GetPinnedOptionsDialog(shouldDismiss, context, viewThemeUtils) { zonedDateTime ->
4067-
zonedDateTime?.let {
4068-
chatViewModel.pinMessage(credentials!!, url, pinUntil = zonedDateTime.toEpochSecond().toInt())
4069-
} ?: chatViewModel.pinMessage(credentials!!, url)
4070-
4071-
shouldDismiss.value = true
4071+
shouldDismiss.value = true
4072+
}
40724073
}
40734074
}
40744075
}

app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import android.view.View
1818
import android.view.ViewGroup
1919
import android.view.inputmethod.InputMethodManager
2020
import androidx.appcompat.app.AlertDialog
21+
import androidx.appcompat.content.res.AppCompatResources
2122
import androidx.lifecycle.lifecycleScope
2223
import autodagger.AutoInjector
2324
import com.google.android.material.bottomsheet.BottomSheetBehavior
@@ -407,7 +408,7 @@ class MessageActionsDialog(
407408

408409
if (currentConversation?.lastPinnedId == message.jsonMessageId.toLong()) {
409410
dialogMessageActionsBinding.menuPinMessageText.text = context.getString(R.string.unpin_message)
410-
val unpinnedDrawable = context.getDrawable(R.drawable.keep_off_24px)
411+
val unpinnedDrawable = AppCompatResources.getDrawable(context, R.drawable.keep_off_24px)
411412
dialogMessageActionsBinding.menuPinMessageIcon.setImageDrawable(unpinnedDrawable)
412413
}
413414
}

0 commit comments

Comments
 (0)