Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Fix detekt

Browse source
This commit is contained in:
ganfra 2023-01-16 18:17:56 +01:00
parent b622ad6000
commit 0fc8ed9b33
4 changed files with 24 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

35
features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerPresenter.kt
View file

@ -76,22 +76,23 @@ class MessageComposerPresenter @Inject constructor(
value = MessageComposerMode.Normal("") value = MessageComposerMode.Normal("")
} }
private fun CoroutineScope.sendMessage(text: String, composerMode: MutableState<MessageComposerMode>, textState: MutableState<StableCharSequence>) = launch { private fun CoroutineScope.sendMessage(text: String, composerMode: MutableState<MessageComposerMode>, textState: MutableState<StableCharSequence>) =
val capturedMode = composerMode.value launch {
// Reset composer right away val capturedMode = composerMode.value
textState.value = "".toStableCharSequence() // Reset composer right away
composerMode.setToNormal() textState.value = "".toStableCharSequence()
when (capturedMode) { composerMode.setToNormal()
is MessageComposerMode.Normal -> room.sendMessage(text) when (capturedMode) {
is MessageComposerMode.Edit -> room.editMessage( is MessageComposerMode.Normal -> room.sendMessage(text)
capturedMode.eventId, is MessageComposerMode.Edit -> room.editMessage(
text capturedMode.eventId,
) text
is MessageComposerMode.Quote -> TODO() )
is MessageComposerMode.Reply -> room.replyMessage( is MessageComposerMode.Quote -> TODO()
capturedMode.eventId, is MessageComposerMode.Reply -> room.replyMessage(
text capturedMode.eventId,
) text
)
}
} }
}
} }

5
features/messages/src/main/java/io/element/android/x/features/messages/timeline/TimelinePresenter.kt
View file

@ -52,7 +52,10 @@ class TimelinePresenter @Inject constructor(
private val timelineItemsFactory = private val timelineItemsFactory =
TimelineItemsFactory(matrixItemHelper, room, coroutineDispatchers.computation) 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) { override fun onPushedTimelineItem(timelineItem: MatrixTimelineItem) {
coroutineScope.launch { coroutineScope.launch {
timelineItemsFactory.pushItem(timelineItem) timelineItemsFactory.pushItem(timelineItem)

2
libraries/architecture/src/main/java/io/element/android/x/architecture/Bindings.kt
View file

@ -24,7 +24,6 @@ import io.element.android.x.core.di.DaggerComponentOwner
inline fun <reified T : Any> Node.bindings() = bindings(T::class.java) inline fun <reified T : Any> Node.bindings() = bindings(T::class.java)
inline fun <reified T : Any> Context.bindings() = bindings(T::class.java) inline fun <reified T : Any> Context.bindings() = bindings(T::class.java)
/** Use no-arg extension function instead: [Context.bindings] */
fun <T : Any> Context.bindings(klass: Class<T>): T { fun <T : Any> Context.bindings(klass: Class<T>): T {
// search dagger components in the context hierarchy // search dagger components in the context hierarchy
return generateSequence(this) { (it as? ContextWrapper)?.baseContext } return generateSequence(this) { (it as? ContextWrapper)?.baseContext }
@ -37,7 +36,6 @@ fun <T : Any> Context.bindings(klass: Class<T>): T {
?: error("Unable to find bindings for ${klass.name}") ?: error("Unable to find bindings for ${klass.name}")
} }
/** Use no-arg extension function instead: [Node.bindings] */
fun <T : Any> Node.bindings(klass: Class<T>): T { fun <T : Any> Node.bindings(klass: Class<T>): T {
// search dagger components in node hierarchy // search dagger components in node hierarchy
return generateSequence(this, Node::parent) return generateSequence(this, Node::parent)

4
libraries/architecture/src/main/java/io/element/android/x/architecture/NodeKey.kt
View file

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
* You may obtain a copy of the License at * 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 * Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS, * distributed under the License is distributed on an "AS IS" BASIS,