From 42075176a189dd7a7fe05956fbf19eed40b353e9 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Mon, 12 Dec 2022 17:34:33 +0100 Subject: [PATCH] Fix detekt issues. --- .../element/android/x/matrix/core/EventId.kt | 2 +- .../android/x/matrix/media/MediaKeyer.kt | 2 +- .../io/element/android/x/matrix/util/Error.kt | 2 +- .../x/textcomposer/RichTextComposerLayout.kt | 2 +- .../android/x/textcomposer/TextComposer.kt | 111 +++++++++--------- 5 files changed, 60 insertions(+), 59 deletions(-) diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/core/EventId.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/core/EventId.kt index ee90c7d1d0..bcc6801a1f 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/core/EventId.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/core/EventId.kt @@ -3,4 +3,4 @@ package io.element.android.x.matrix.core import java.io.Serializable @JvmInline -value class EventId(val value: String) : Serializable \ No newline at end of file +value class EventId(val value: String) : Serializable diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/media/MediaKeyer.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/media/MediaKeyer.kt index 4bc77018fa..03f244cc14 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/media/MediaKeyer.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/media/MediaKeyer.kt @@ -7,4 +7,4 @@ internal class MediaKeyer : Keyer { override fun key(data: MediaResolver.Meta, options: Options): String? { return "${data.source.url()}_${data.kind}" } -} \ No newline at end of file +} diff --git a/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt b/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt index c7f4e6ac12..db44533b73 100644 --- a/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt +++ b/libraries/matrix/src/main/java/io/element/android/x/matrix/util/Error.kt @@ -12,4 +12,4 @@ fun logError(throwable: Throwable) { Timber.e("Error", throwable) } } -} \ No newline at end of file +} diff --git a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt index 34cc3065b1..44bdcbc090 100644 --- a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt +++ b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/RichTextComposerLayout.kt @@ -485,7 +485,7 @@ class RichTextComposerLayout @JvmOverloads constructor( } else { views.composerModeGroup.isGone = true (mode as? MessageComposerMode.Normal)?.content?.let { text -> - // TODO: un-comment once we update to a version of the lib > 0.8.0 + // TODO un-comment once we update to a version of the lib > 0.8.0 /* if (isTextFormattingEnabled) { replaceFormattedContent(text) diff --git a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt index bb57ca98af..6efa2e633b 100644 --- a/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt +++ b/libraries/textcomposer/src/main/java/io/element/android/x/textcomposer/TextComposer.kt @@ -22,80 +22,81 @@ import io.element.android.x.element.resources.R as ElementR @Composable fun TextComposer( - onSendMessage: (String) -> Unit, - modifier: Modifier = Modifier, fullscreen: Boolean, - onFullscreenToggle: () -> Unit, + composerText: String?, composerMode: MessageComposerMode, - onCloseSpecialMode: () -> Unit, - onComposerTextChange: (CharSequence) -> Unit, composerCanSendMessage: Boolean, - composerText: String?, + modifier: Modifier = Modifier, + onSendMessage: (String) -> Unit = {}, + onFullscreenToggle: () -> Unit = {}, + onCloseSpecialMode: () -> Unit = {}, + onComposerTextChange: (CharSequence) -> Unit = {}, ) { if (LocalInspectionMode.current) { FakeComposer(modifier) - return - } + } else { + val isInDarkMode = isSystemInDarkTheme() + AndroidView( + modifier = modifier, + factory = { context -> + RichTextComposerLayout(context).apply { + // Sets up listeners for View -> Compose communication + this.callback = object : Callback { + override fun onRichContentSelected(contentUri: Uri): Boolean { + return false + } - val isInDarkMode = isSystemInDarkTheme() - AndroidView( - modifier = modifier, - factory = { context -> - RichTextComposerLayout(context).apply { - // Sets up listeners for View -> Compose communication - this.callback = object : Callback { - override fun onRichContentSelected(contentUri: Uri): Boolean { - return false - } + override fun onTextChanged(text: CharSequence) { + onComposerTextChange(text) + } - override fun onTextChanged(text: CharSequence) { - onComposerTextChange(text) - } + override fun onCloseRelatedMessage() { + onCloseSpecialMode() + } - override fun onCloseRelatedMessage() { - onCloseSpecialMode() - } + override fun onSendMessage(text: CharSequence) { + // text contains markdown. + onSendMessage(text.toString()) + } - override fun onSendMessage(text: CharSequence) { - // text contains markdown. - onSendMessage(text.toString()) - } + override fun onAddAttachment() { + } - override fun onAddAttachment() { - } + override fun onExpandOrCompactChange() { + } - override fun onExpandOrCompactChange() { + override fun onFullScreenModeChanged() { + onFullscreenToggle() + } } - - override fun onFullScreenModeChanged() { - onFullscreenToggle() + setFullScreen(fullscreen, animated = false, manageKeyboard = true) + (this as MessageComposerView).apply { + setup(isInDarkMode, composerMode) } } - setFullScreen(fullscreen, animated = false, manageKeyboard = true) - (this as MessageComposerView).apply { - setup(isInDarkMode, composerMode) - } - } - }, - update = { view -> - // View's been inflated or state read in this block has been updated - // Add logic here if necessary + }, + update = { view -> + // View's been inflated or state read in this block has been updated + // Add logic here if necessary - // As selectedItem is read here, AndroidView will recompose - // whenever the state changes - // Example of Compose -> View communication - val messageComposerView = (view as MessageComposerView) - view.setFullScreen(fullscreen, animated = false, manageKeyboard = false) - messageComposerView.renderComposerMode(composerMode) - messageComposerView.sendButton.isInvisible = !composerCanSendMessage - messageComposerView.setTextIfDifferent(composerText ?: "") - messageComposerView.editText.requestFocus() - } - ) + // As selectedItem is read here, AndroidView will recompose + // whenever the state changes + // Example of Compose -> View communication + val messageComposerView = (view as MessageComposerView) + view.setFullScreen(fullscreen, animated = false, manageKeyboard = false) + messageComposerView.renderComposerMode(composerMode) + messageComposerView.sendButton.isInvisible = !composerCanSendMessage + messageComposerView.setTextIfDifferent(composerText ?: "") + messageComposerView.editText.requestFocus() + } + ) + } } @Composable -private fun FakeComposer(modifier: Modifier) { +private fun FakeComposer( + modifier: Modifier = Modifier, +) { // AndroidView is not Available in this mode, just render a Text Box( modifier = modifier