Change/move some gradle modules to be better separated. Let core module be a kotlin lib.

libraries/androidutils/.gitignore

@@ -0,0 +1 @@
+/build

libraries/androidutils/build.gradle.kts

@@ -0,0 +1,61 @@
+
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+plugins {
+    id("com.android.library")
+    id("org.jetbrains.kotlin.android")
+}
+
+android {
+    namespace = "io.element.android.libraries.androidutils"
+    compileSdk = 32
+
+    defaultConfig {
+        minSdk = 21
+        targetSdk = 32
+
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles("consumer-rules.pro")
+    }
+
+    buildTypes {
+        release {
+            isMinifyEnabled = false
+            proguardFiles(
+                getDefaultProguardFile("proguard-android-optimize.txt"),
+                "proguard-rules.pro"
+            )
+        }
+    }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_1_8
+        targetCompatibility = JavaVersion.VERSION_1_8
+    }
+    kotlinOptions {
+        jvmTarget = "1.8"
+    }
+}
+
+dependencies {
+    implementation(libs.timber)
+    implementation("androidx.core:core-ktx:1.7.0")
+    implementation("androidx.appcompat:appcompat:1.6.0")
+    implementation("com.google.android.material:material:1.7.0")
+    testImplementation("junit:junit:4.13.2")
+    androidTestImplementation("androidx.test.ext:junit:1.1.5")
+    androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
+}

libraries/androidutils/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

libraries/androidutils/src/androidTest/java/io/element/android/libraries/androidutils/ExampleInstrumentedTest.kt

@@ -0,0 +1,40 @@
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.androidutils
+
+import androidx.test.platform.app.InstrumentationRegistry
+import androidx.test.ext.junit.runners.AndroidJUnit4
+
+import org.junit.Test
+import org.junit.runner.RunWith
+
+import org.junit.Assert.*
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+@RunWith(AndroidJUnit4::class)
+class ExampleInstrumentedTest {
+    @Test
+    fun useAppContext() {
+        // Context of the app under test.
+        val appContext = InstrumentationRegistry.getInstrumentation().targetContext
+        assertEquals("io.element.android.libraries.androidutils.test", appContext.packageName)
+    }
+}

libraries/androidutils/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-  ~ Copyright (c) 2022 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.
@@ -16,7 +16,5 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
     <uses-permission android:name="android.permission.VIBRATE" />
-
 </manifest>

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/bitmap/Bitmap.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.bitmap
+package io.element.android.libraries.androidutils.bitmap
 
 import android.graphics.Bitmap
 import java.io.File

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/extensions/isEmail.kt

@@ -0,0 +1,24 @@
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.androidutils.extensions
+
+import android.util.Patterns
+
+/**
+ * Check if a CharSequence is an email.
+ */
+fun CharSequence.isEmail() = Patterns.EMAIL_ADDRESS.matcher(this).matches()

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/file/compressFile.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.
@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.file
+package io.element.android.libraries.androidutils.file
 
+import timber.log.Timber
 import java.io.File
 import java.util.zip.GZIPOutputStream
-import timber.log.Timber
 
 /**
  * GZip a file.

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/hardware/vibrator.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.hardware
+package io.element.android.libraries.androidutils.hardware
 
 import android.content.Context
 import android.os.Build

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/DimensionConverter.kt

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package io.element.android.libraries.core.ui
+package io.element.android.libraries.androidutils.ui
 
 import android.content.res.Resources
 import android.util.TypedValue

libraries/androidutils/src/main/kotlin/io/element/android/libraries/androidutils/ui/View.kt

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.ui
+package io.element.android.libraries.androidutils.ui
 
 import android.view.View
 import android.view.inputmethod.InputMethodManager

libraries/androidutils/src/test/java/io/element/android/libraries/androidutils/ExampleUnitTest.kt

@@ -0,0 +1,33 @@
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.libraries.androidutils
+
+import org.junit.Test
+
+import org.junit.Assert.*
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * See [testing documentation](http://d.android.com/tools/testing).
+ */
+class ExampleUnitTest {
+    @Test
+    fun addition_isCorrect() {
+        assertEquals(4, 2 + 2)
+    }
+}

libraries/core/build.gradle.kts

@@ -1,3 +1,4 @@
+
 /*
  * Copyright (c) 2022 New Vector Ltd
  *
@@ -14,10 +15,18 @@
  * limitations under the License.
  */
 
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
-    id("io.element.android-compose-library")
+    id("java-library")
+    alias(libs.plugins.kotlin.jvm)
 }
 
-android {
-    namespace = "io.element.android.libraries.core"
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    implementation(libs.coroutines.core)
 }

libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/CoroutineDispatchers.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.

libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/TimingOperators.kt

@@ -1,104 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.libraries.core.coroutine
-
-import android.os.SystemClock
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.channels.Channel
-import kotlinx.coroutines.channels.ClosedReceiveChannelException
-import kotlinx.coroutines.channels.ReceiveChannel
-import kotlinx.coroutines.channels.produce
-import kotlinx.coroutines.coroutineScope
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.consumeAsFlow
-import kotlinx.coroutines.flow.flow
-import kotlinx.coroutines.isActive
-import kotlinx.coroutines.selects.select
-
-@ExperimentalCoroutinesApi
-fun <T> Flow<T>.chunk(durationInMillis: Long): Flow<List<T>> {
-    require(durationInMillis > 0) { "Duration should be greater than 0" }
-    return flow {
-        coroutineScope {
-            val events = ArrayList<T>()
-            val ticker = fixedPeriodTicker(durationInMillis)
-            try {
-                val upstreamValues = produce(capacity = Channel.CONFLATED) {
-                    collect { value -> send(value) }
-                }
-                while (isActive) {
-                    var hasTimedOut = false
-                    select<Unit> {
-                        upstreamValues.onReceive {
-                            events.add(it)
-                        }
-                        ticker.onReceive {
-                            hasTimedOut = true
-                        }
-                    }
-                    if (hasTimedOut && events.isNotEmpty()) {
-                        emit(events.toList())
-                        events.clear()
-                    }
-                }
-            } catch (e: ClosedReceiveChannelException) {
-                // drain remaining events
-                if (events.isNotEmpty()) emit(events.toList())
-            } finally {
-                ticker.cancel()
-            }
-        }
-    }
-}
-
-@ExperimentalCoroutinesApi
-fun <T> Flow<T>.throttleFirst(windowDuration: Long): Flow<T> = flow {
-    var windowStartTime = SystemClock.elapsedRealtime()
-    var emitted = false
-    collect { value ->
-        val currentTime = SystemClock.elapsedRealtime()
-        val delta = currentTime - windowStartTime
-        if (delta >= windowDuration) {
-            windowStartTime += delta / windowDuration * windowDuration
-            emitted = false
-        }
-        if (!emitted) {
-            emit(value)
-            emitted = true
-        }
-    }
-}
-
-@ExperimentalCoroutinesApi
-fun tickerFlow(scope: CoroutineScope, delayMillis: Long, initialDelayMillis: Long = delayMillis): Flow<Unit> {
-    return scope.fixedPeriodTicker(delayMillis, initialDelayMillis).consumeAsFlow()
-}
-
-@ExperimentalCoroutinesApi
-private fun CoroutineScope.fixedPeriodTicker(delayMillis: Long, initialDelayMillis: Long = delayMillis): ReceiveChannel<Unit> {
-    require(delayMillis >= 0) { "Expected non-negative delay, but has $delayMillis ms" }
-    require(initialDelayMillis >= 0) { "Expected non-negative initial delay, but has $initialDelayMillis ms" }
-    return produce(capacity = 0) {
-        delay(initialDelayMillis)
-        while (true) {
-            channel.send(Unit)
-            delay(delayMillis)
-        }
-    }
-}

libraries/core/src/main/kotlin/io/element/android/libraries/core/coroutine/pmap.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.

libraries/core/src/main/kotlin/io/element/android/libraries/core/data/Try.kt

@@ -16,15 +16,11 @@
 
 package io.element.android.libraries.core.data
 
-import timber.log.Timber
-
-inline fun <A> tryOrNull(message: String? = null, operation: () -> A): A? {
+inline fun <A> tryOrNull(noinline onError: ((Throwable) -> Unit)? = null, operation: () -> A): A? {
     return try {
         operation()
     } catch (any: Throwable) {
-        if (message != null) {
-            Timber.e("TAG", message, any)
-        }
+        onError?.invoke(any)
         null
     }
 }

libraries/core/src/main/kotlin/io/element/android/libraries/core/extensions/BasicExtensions.kt

@@ -16,19 +16,11 @@
 
 package io.element.android.libraries.core.extensions
 
-import android.util.Patterns
 
 fun Boolean.toOnOff() = if (this) "ON" else "OFF"
 
 inline fun <T> T.ooi(block: (T) -> Unit): T = also(block)
 
-/**
- * Check if a CharSequence is an email.
- */
-fun CharSequence.isEmail() = Patterns.EMAIL_ADDRESS.matcher(this).matches()
-
-// fun CharSequence.isMatrixId() = MatrixPatterns.isUserId(this.toString())
-
 /**
  * Return empty CharSequence if the CharSequence is null.
  */

libraries/core/src/main/kotlin/io/element/android/libraries/core/screenshot/Screenshot.kt

@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2022 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
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package io.element.android.libraries.core.screenshot
-
-import android.app.Activity
-import android.graphics.Bitmap
-import android.graphics.Canvas
-import android.os.Build
-import android.os.Handler
-import android.os.Looper
-import android.view.PixelCopy
-import android.view.View
-
-fun View.screenshot(bitmapCallback: (ImageResult) -> Unit) {
-    try {
-        val handler = Handler(Looper.getMainLooper())
-        val bitmap = Bitmap.createBitmap(
-            width,
-            height,
-            Bitmap.Config.ARGB_8888,
-        )
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            PixelCopy.request(
-                (this.context as Activity).window,
-                clipBounds,
-                bitmap,
-                {
-                    when (it) {
-                        PixelCopy.SUCCESS -> {
-                            bitmapCallback.invoke(ImageResult.Success(bitmap))
-                        }
-                        else -> {
-                            bitmapCallback.invoke(ImageResult.Error(Exception(it.toString())))
-                        }
-                    }
-                },
-                handler
-            )
-        } else {
-            handler.post {
-                val canvas = Canvas(bitmap)
-                    .apply {
-                        translate(-clipBounds.left.toFloat(), -clipBounds.top.toFloat())
-                    }
-                this.draw(canvas)
-                canvas.setBitmap(null)
-                bitmapCallback.invoke(ImageResult.Success(bitmap))
-            }
-        }
-    } catch (e: Exception) {
-        bitmapCallback.invoke(ImageResult.Error(e))
-    }
-}
-
-sealed interface ImageResult {
-    data class Error(val exception: Exception) : ImageResult
-    data class Success(val data: Bitmap) : ImageResult
-}

libraries/coroutines/.gitignore

@@ -0,0 +1 @@
+/build

libraries/coroutines/build.gradle.kts

@@ -0,0 +1,30 @@
+/*
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    id("java-library")
+    alias(libs.plugins.kotlin.jvm)
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_1_8
+    targetCompatibility = JavaVersion.VERSION_1_8
+}
+
+dependencies {
+    implementation(libs.coroutines.core)
+}

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/form/TextFieldLocalState.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.compose
+package io.element.android.libraries.designsystem.components.form
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.MutableState

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/components/keyboard/Keyboard.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.compose
+package io.element.android.libraries.designsystem.components.keyboard
 
 import androidx.compose.foundation.layout.ExperimentalLayoutApi
 import androidx.compose.foundation.layout.WindowInsets

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/LogCompositions.kt

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.compose
+package io.element.android.libraries.designsystem.utils
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.SideEffect
 import androidx.compose.runtime.remember
-import io.element.android.libraries.core.BuildConfig
+import io.element.android.libraries.designsystem.BuildConfig
 import timber.log.Timber
 
 // Note the inline function below which ensures that this function is essentially

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/OnLifecycleEvent.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.compose
+package io.element.android.libraries.designsystem.utils
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.DisposableEffect

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/utils/PairCombinedPreviewParameter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2022 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.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.element.android.libraries.core.compose
+package io.element.android.libraries.designsystem.utils
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 

libraries/matrix/src/main/kotlin/io/element/android/libraries/matrix/RustMatrixClient.kt

@@ -26,7 +26,6 @@ import io.element.android.libraries.matrix.room.MatrixRoom
 import io.element.android.libraries.matrix.room.RoomSummaryDataSource
 import io.element.android.libraries.matrix.room.RustMatrixRoom
 import io.element.android.libraries.matrix.room.RustRoomSummaryDataSource
-import io.element.android.libraries.matrix.session.PreferencesSessionStore
 import io.element.android.libraries.matrix.session.SessionStore
 import io.element.android.libraries.matrix.session.sessionId
 import io.element.android.libraries.matrix.sync.SlidingSyncObserverProxy

libraries/textcomposer/build.gradle.kts

@@ -32,6 +32,7 @@ android {
 dependencies {
     implementation(projects.libraries.elementresources)
     implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.androidutils)
     implementation(projects.libraries.core)
     implementation(projects.libraries.matrix)
     implementation(libs.wysiwyg)

libraries/textcomposer/src/main/kotlin/io/element/android/libraries/textcomposer/RichTextComposerLayout.kt

@@ -40,14 +40,13 @@ import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
 import androidx.core.view.updateLayoutParams
 import com.google.android.material.shape.MaterialShapeDrawable
-import io.element.android.wysiwyg.EditorEditText
-import io.element.android.wysiwyg.inputhandlers.models.InlineFormat
-import io.element.android.libraries.core.ui.DimensionConverter
-import io.element.android.libraries.core.ui.hideKeyboard
-import io.element.android.libraries.core.ui.showKeyboard
+import io.element.android.libraries.androidutils.ui.hideKeyboard
+import io.element.android.libraries.androidutils.ui.showKeyboard
 import io.element.android.libraries.textcomposer.databinding.ComposerRichTextLayoutBinding
 import io.element.android.libraries.textcomposer.databinding.ViewRichTextMenuButtonBinding
 import io.element.android.libraries.textcomposer.tools.setTextIfDifferent
+import io.element.android.wysiwyg.EditorEditText
+import io.element.android.wysiwyg.inputhandlers.models.InlineFormat
 import uniffi.wysiwyg_composer.ActionState
 import uniffi.wysiwyg_composer.ComposerAction
 import io.element.android.element.resources.R as ElementR
@@ -118,7 +117,8 @@ class RichTextComposerLayout @JvmOverloads constructor(
         }
     }
 
-    private val dimensionConverter = DimensionConverter(resources)
+    private val dimensionConverter =
+        io.element.android.libraries.androidutils.ui.DimensionConverter(resources)
 
     fun setFullScreen(isFullScreen: Boolean, animated: Boolean, manageKeyboard: Boolean) {
         if (!animated && views.composerLayout.layoutParams != null) {