diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt b/features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt index e118034113..aba47ec90b 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt @@ -76,22 +76,23 @@ class MessageComposerPresenter @Inject constructor( value = MessageComposerMode.Normal("") } - private fun CoroutineScope.sendMessage(text: String, composerMode: MutableState, textState: MutableState) = launch { - val capturedMode = composerMode.value - // Reset composer right away - textState.value = "".toStableCharSequence() - composerMode.setToNormal() - when (capturedMode) { - is MessageComposerMode.Normal -> room.sendMessage(text) - is MessageComposerMode.Edit -> room.editMessage( - capturedMode.eventId, - text - ) - is MessageComposerMode.Quote -> TODO() - is MessageComposerMode.Reply -> room.replyMessage( - capturedMode.eventId, - text - ) + private fun CoroutineScope.sendMessage(text: String, composerMode: MutableState, textState: MutableState) = + launch { + val capturedMode = composerMode.value + // Reset composer right away + textState.value = "".toStableCharSequence() + composerMode.setToNormal() + when (capturedMode) { + is MessageComposerMode.Normal -> room.sendMessage(text) + is MessageComposerMode.Edit -> room.editMessage( + capturedMode.eventId, + text + ) + is MessageComposerMode.Quote -> TODO() + is MessageComposerMode.Reply -> room.replyMessage( + capturedMode.eventId, + text + ) + } } - } } diff --git a/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt b/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt index 28db417053..9cbd2a4acf 100644 --- a/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt +++ b/features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt @@ -52,7 +52,10 @@ class TimelinePresenter @Inject constructor( private val timelineItemsFactory = TimelineItemsFactory(matrixItemHelper, room, coroutineDispatchers.computation) - private class TimelineCallback(private val coroutineScope: CoroutineScope, private val timelineItemsFactory: TimelineItemsFactory) : MatrixTimeline.Callback { + private class TimelineCallback( + private val coroutineScope: CoroutineScope, + private val timelineItemsFactory: TimelineItemsFactory, + ) : MatrixTimeline.Callback { override fun onPushedTimelineItem(timelineItem: MatrixTimelineItem) { coroutineScope.launch { timelineItemsFactory.pushItem(timelineItem) diff --git a/libraries/architecture/src/main/java/io/element/android/x/architecture/Bindings.kt b/libraries/architecture/src/main/java/io/element/android/x/architecture/Bindings.kt index 65badae56f..9844a99896 100644 --- a/libraries/architecture/src/main/java/io/element/android/x/architecture/Bindings.kt +++ b/libraries/architecture/src/main/java/io/element/android/x/architecture/Bindings.kt @@ -24,7 +24,6 @@ import io.element.android.x.core.di.DaggerComponentOwner inline fun Node.bindings() = bindings(T::class.java) inline fun Context.bindings() = bindings(T::class.java) -/** Use no-arg extension function instead: [Context.bindings] */ fun Context.bindings(klass: Class): T { // search dagger components in the context hierarchy return generateSequence(this) { (it as? ContextWrapper)?.baseContext } @@ -37,7 +36,6 @@ fun Context.bindings(klass: Class): T { ?: error("Unable to find bindings for ${klass.name}") } -/** Use no-arg extension function instead: [Node.bindings] */ fun Node.bindings(klass: Class): T { // search dagger components in node hierarchy return generateSequence(this, Node::parent) diff --git a/libraries/architecture/src/main/java/io/element/android/x/architecture/NodeKey.kt b/libraries/architecture/src/main/java/io/element/android/x/architecture/NodeKey.kt index 63e178552e..59150edf5f 100644 --- a/libraries/architecture/src/main/java/io/element/android/x/architecture/NodeKey.kt +++ b/libraries/architecture/src/main/java/io/element/android/x/architecture/NodeKey.kt @@ -1,11 +1,11 @@ /* - * Copyright 2019 New Vector Ltd + * Copyright (c) 2023 New Vector Ltd * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS,