Merge pull request #57 from vector-im/feature/fga/gradle_perf

Feature/fga/gradle perf

.idea/compiler.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="1.8">
+      <module name="ElementX.libraries.composeutils" target="11" />
+    </bytecodeTargetLevel>
   </component>
 </project>

.idea/misc.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="11" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

features/login/build.gradle.kts

@@ -34,14 +34,12 @@ anvil {
 dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
-    implementation(projects.libraries.di)
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.elementresources)
     implementation(projects.libraries.testtags)
-    implementation(libs.appyx.core)
     implementation(projects.libraries.uiStrings)
     ksp(libs.showkase.processor)
     testImplementation(libs.test.junit)

features/login/src/main/kotlin/io/element/android/features/login/changeserver/ChangeServerView.kt

@@ -53,7 +53,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import io.element.android.libraries.architecture.Async
-import io.element.android.libraries.core.compose.textFieldState
+import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.libraries.designsystem.components.VectorIcon
 import io.element.android.features.login.R
 import io.element.android.features.login.error.changeServerError

features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootNode.kt

@@ -29,7 +29,7 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
 import io.element.android.libraries.architecture.presenterConnector
-import io.element.android.libraries.core.compose.OnLifecycleEvent
+import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 import io.element.android.libraries.di.AppScope
 
 @ContributesNode(AppScope::class)

features/login/src/main/kotlin/io/element/android/features/login/root/LoginRootScreen.kt

@@ -58,7 +58,7 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.element.android.libraries.core.compose.textFieldState
+import io.element.android.libraries.designsystem.components.form.textFieldState
 import io.element.android.features.login.error.loginError
 import io.element.android.libraries.testtags.TestTags
 import io.element.android.libraries.testtags.testTag

features/logout/build.gradle.kts

@@ -33,7 +33,6 @@ anvil {
 dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
-    implementation(projects.libraries.di)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
     implementation(projects.libraries.matrix)

features/messages/build.gradle.kts

@@ -33,14 +33,12 @@ anvil {
 dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
-    implementation(projects.libraries.di)
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.textcomposer)
-    implementation(libs.appyx.core)
     implementation(libs.coil.compose)
     implementation(libs.datetime)
     implementation(libs.accompanist.flowlayout)

features/messages/src/main/kotlin/io/element/android/features/messages/MessagesView.kt

@@ -56,7 +56,6 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import io.element.android.libraries.core.compose.LogCompositions
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.features.messages.actionlist.ActionListEvents
@@ -65,6 +64,7 @@ import io.element.android.features.messages.actionlist.model.TimelineItemAction
 import io.element.android.features.messages.timeline.model.TimelineItem
 import io.element.android.features.messages.textcomposer.MessageComposerView
 import io.element.android.features.messages.timeline.TimelineView
+import io.element.android.libraries.designsystem.utils.LogCompositions
 import kotlinx.coroutines.launch
 import timber.log.Timber
 

features/messages/src/main/kotlin/io/element/android/features/messages/timeline/TimelineView.kt

@@ -58,7 +58,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.zIndex
-import io.element.android.libraries.core.compose.PairCombinedPreviewParameter
+import io.element.android.libraries.designsystem.utils.PairCombinedPreviewParameter
 import io.element.android.libraries.designsystem.components.avatar.Avatar
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.features.messages.timeline.model.AggregatedReaction

features/onboarding/build.gradle.kts

@@ -34,7 +34,6 @@ dependencies {
     implementation(projects.libraries.testtags)
     implementation(libs.accompanist.pager)
     implementation(libs.accompanist.pagerindicator)
-    implementation(libs.appyx.core)
     testImplementation(libs.test.junit)
     androidTestImplementation(libs.test.junitext)
     ksp(libs.showkase.processor)

features/preferences/build.gradle.kts

@@ -34,7 +34,6 @@ anvil {
 dependencies {
     implementation(projects.anvilannotations)
     anvil(projects.anvilcodegen)
-    implementation(projects.libraries.di)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
     implementation(projects.libraries.matrixui)

features/rageshake/build.gradle.kts

@@ -32,11 +32,11 @@ anvil {
 }
 
 dependencies {
-    implementation(projects.libraries.core)
     anvil(projects.anvilcodegen)
-    implementation(projects.libraries.di)
-    implementation(projects.libraries.architecture)
     implementation(projects.anvilannotations)
+    implementation(projects.libraries.androidutils)
+    implementation(projects.libraries.core)
+    implementation(projects.libraries.architecture)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.elementresources)
     implementation(projects.libraries.uiStrings)

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/bugreport/BugReportView.kt

@@ -51,10 +51,10 @@ import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
 import io.element.android.libraries.architecture.Async
-import io.element.android.libraries.core.compose.LogCompositions
+import io.element.android.libraries.designsystem.components.form.textFieldState
-import io.element.android.libraries.core.compose.textFieldState
 import io.element.android.libraries.designsystem.components.LabelledCheckbox
 import io.element.android.libraries.designsystem.components.dialogs.ErrorDialog
+import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.ui.strings.R as StringR
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -111,7 +111,9 @@ fun BugReportView(
                         .padding(horizontal = 16.dp, vertical = 16.dp),
                     fontSize = 16.sp,
                 )
-                var descriptionFieldState by textFieldState(stateValue = state.formState.description)
+                var descriptionFieldState by textFieldState(
+                    stateValue = state.formState.description
+                )
                 Column(
                     // modifier = Modifier.weight(1f),
                 ) {

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/crash/ui/CrashDetectionScreen.kt

@@ -19,8 +19,8 @@ package io.element.android.features.rageshake.crash.ui
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
-import io.element.android.libraries.core.compose.LogCompositions
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.ui.strings.R as StringR
 
 @Composable
@@ -28,7 +28,10 @@ fun CrashDetectionView(
     state: CrashDetectionState,
     onOpenBugReport: () -> Unit = { },
 ) {
-    LogCompositions(tag = "Crash", msg = "CrashDetectionScreen")
+    LogCompositions(
+        tag = "Crash",
+        msg = "CrashDetectionScreen"
+    )
 
     fun onPopupDismissed() {
         state.eventSink(CrashDetectionEvents.ResetAllCrashData)

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionEvents.kt

@@ -16,7 +16,7 @@
 
 package io.element.android.features.rageshake.detection
 
-import io.element.android.libraries.core.screenshot.ImageResult
+import io.element.android.features.rageshake.screenshot.ImageResult
 
 sealed interface RageshakeDetectionEvents {
     object Dismiss : RageshakeDetectionEvents

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionPresenter.kt

@@ -23,12 +23,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.saveable.rememberSaveable
-import io.element.android.libraries.architecture.Presenter
-import io.element.android.libraries.core.screenshot.ImageResult
 import io.element.android.features.rageshake.preferences.RageshakePreferencesEvents
 import io.element.android.features.rageshake.preferences.RageshakePreferencesPresenter
 import io.element.android.features.rageshake.rageshake.RageShake
+import io.element.android.features.rageshake.screenshot.ImageResult
 import io.element.android.features.rageshake.screenshot.ScreenshotHolder
+import io.element.android.libraries.architecture.Presenter
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import timber.log.Timber

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/detection/RageshakeDetectionView.kt

@@ -23,12 +23,12 @@ import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.lifecycle.Lifecycle
-import io.element.android.libraries.core.compose.LogCompositions
+import io.element.android.features.rageshake.screenshot.ImageResult
-import io.element.android.libraries.core.compose.OnLifecycleEvent
+import io.element.android.features.rageshake.screenshot.screenshot
-import io.element.android.libraries.core.hardware.vibrate
+import io.element.android.libraries.androidutils.hardware.vibrate
-import io.element.android.libraries.core.screenshot.ImageResult
+import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
-import io.element.android.libraries.core.screenshot.screenshot
 import io.element.android.libraries.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.ui.strings.R as StringR
 
 @Composable
@@ -36,7 +36,10 @@ fun RageshakeDetectionView(
     state: RageshakeDetectionState,
     onOpenBugReport: () -> Unit = { },
 ) {
-    LogCompositions(tag = "Rageshake", msg = "RageshakeDetectionScreen")
+    LogCompositions(
+        tag = "Rageshake",
+        msg = "RageshakeDetectionScreen"
+    )
     val eventSink = state.eventSink
     val context = LocalContext.current
     OnLifecycleEvent { _, event ->

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/logs/VectorFileLogger.kt

@@ -19,17 +19,17 @@ package io.element.android.features.rageshake.logs
 import android.content.Context
 import android.util.Log
 import io.element.android.libraries.core.data.tryOrNull
+import kotlinx.coroutines.DelicateCoroutinesApi
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.GlobalScope
+import kotlinx.coroutines.launch
+import timber.log.Timber
 import java.io.File
 import java.io.PrintWriter
 import java.io.StringWriter
 import java.util.logging.FileHandler
 import java.util.logging.Level
 import java.util.logging.Logger
-import kotlinx.coroutines.DelicateCoroutinesApi
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.launch
-import timber.log.Timber
 
 /**
  * Will be planted in Timber.
@@ -85,7 +85,9 @@ class VectorFileLogger(
             tryOrNull { file.delete() }
         }
 
-        fileHandler = tryOrNull("Failed to initialize FileLogger") {
+        fileHandler = tryOrNull(
+            onError = { Timber.e(it, "Failed to initialize FileLogger") }
+        ) {
             FileHandler(
                 cacheDirectory.absolutePath + "/" + fileNamePrefix + ".%g.txt",
                 maxLogSizeByte,
@@ -134,7 +136,9 @@ class VectorFileLogger(
      * @return The list of files with logs.
      */
     fun getLogFiles(): List<File> {
-        return tryOrNull("## getLogFiles() failed") {
+        return tryOrNull(
+            onError = { Timber.e(it, "## getLogFiles() failed") }
+        ) {
             fileHandler
                 ?.flush()
                 ?.let { 0 until logRotationCount }

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/reporter/BugReporter.kt

@@ -19,7 +19,7 @@ package io.element.android.features.rageshake.reporter
 import android.content.Context
 import android.os.Build
 import io.element.android.libraries.core.extensions.toOnOff
-import io.element.android.libraries.core.file.compressFile
+import io.element.android.libraries.androidutils.file.compressFile
 import io.element.android.libraries.core.mimetype.MimeTypes
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.features.rageshake.R

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/Screenshot.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.screenshot
+package io.element.android.features.rageshake.screenshot
 
 import android.app.Activity
 import android.graphics.Bitmap

features/rageshake/src/main/kotlin/io/element/android/features/rageshake/screenshot/ScreenshotHolder.kt

@@ -18,7 +18,7 @@ package io.element.android.features.rageshake.screenshot
 
 import android.content.Context
 import android.graphics.Bitmap
-import io.element.android.libraries.core.bitmap.writeBitmap
+import io.element.android.libraries.androidutils.bitmap.writeBitmap
 import io.element.android.libraries.di.AppScope
 import io.element.android.libraries.di.ApplicationContext
 import io.element.android.libraries.di.SingleIn

features/roomlist/build.gradle.kts

@@ -34,13 +34,11 @@ dependencies {
     anvil(projects.anvilcodegen)
     implementation(projects.anvilannotations)
 
-    implementation(projects.libraries.di)
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.designsystem)
-    implementation(libs.appyx.core)
     implementation(projects.libraries.elementresources)
     implementation(projects.libraries.uiStrings)
     implementation(libs.datetime)

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/RoomListView.kt

@@ -36,7 +36,6 @@ import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.Velocity
-import io.element.android.libraries.core.compose.LogCompositions
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.features.roomlist.components.RoomListTopBar
 import io.element.android.features.roomlist.components.RoomSummaryRow
@@ -44,6 +43,7 @@ import io.element.android.features.roomlist.model.RoomListEvents
 import io.element.android.features.roomlist.model.RoomListRoomSummary
 import io.element.android.features.roomlist.model.RoomListState
 import io.element.android.features.roomlist.model.stubbedRoomSummaries
+import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.matrix.core.RoomId
 import io.element.android.libraries.matrix.core.UserId
 import io.element.android.libraries.matrix.ui.model.MatrixUser
@@ -103,7 +103,10 @@ fun RoomListView(
         }
     }
     val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior(appBarState)
-    LogCompositions(tag = "RoomListScreen", msg = "Content")
+    LogCompositions(
+        tag = "RoomListScreen",
+        msg = "Content"
+    )
 
     val nestedScrollConnection = remember {
         object : NestedScrollConnection {

features/roomlist/src/main/kotlin/io/element/android/features/roomlist/components/RoomListTopBar.kt

@@ -52,9 +52,9 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
-import io.element.android.libraries.core.compose.LogCompositions
-import io.element.android.libraries.core.compose.textFieldState
 import io.element.android.libraries.designsystem.components.avatar.Avatar
+import io.element.android.libraries.designsystem.components.form.textFieldState
+import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.matrix.ui.model.MatrixUser
 import io.element.android.libraries.ui.strings.R as StringR
 
@@ -66,7 +66,10 @@ fun RoomListTopBar(
     onOpenSettings: () -> Unit,
     scrollBehavior: TopAppBarScrollBehavior
 ) {
-    LogCompositions(tag = "RoomListScreen", msg = "TopBar")
+    LogCompositions(
+        tag = "RoomListScreen",
+        msg = "TopBar"
+    )
     var searchWidgetStateIsOpened by rememberSaveable { mutableStateOf(false) }
 
     fun closeFilter() {

features/template/build.gradle.kts

@@ -35,7 +35,6 @@ dependencies {
     anvil(projects.anvilcodegen)
     implementation(projects.anvilannotations)
 
-    implementation(projects.libraries.di)
     implementation(projects.libraries.core)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix)
@@ -44,8 +43,6 @@ dependencies {
     implementation(projects.libraries.elementresources)
     implementation(projects.libraries.uiStrings)
 
-    implementation(libs.appyx.core)
-
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
     testImplementation(libs.molecule.runtime)

gradle.properties

@@ -23,10 +23,7 @@
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
 org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
-# When configured, Gradle will run in incubating parallel mode.
+
-# This option should only be used with decoupled projects. More details, visit
-# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
 # AndroidX package structure to make it clearer which packages are bundled with the
 # Android operating system, and which are packaged with your app"s APK
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
@@ -37,6 +34,11 @@ kotlin.code.style=official
 # resources declared in the library itself and none from the library's dependencies,
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
+
+org.gradle.caching=true
+org.gradle.configureondemand=true
+org.gradle.parallel=true
+
 # Dummy values for signing secrets / nightly
 signing.element.nightly.storePassword=Secret
 signing.element.nightly.keyId=Secret

gradle/libs.versions.toml

@@ -114,6 +114,7 @@ showkase_processor = { module = "com.airbnb.android:showkase-processor", version
 jsoup = { module = "org.jsoup:jsoup", version.ref = "jsoup" }
 appyx_core = { module = "com.bumble.appyx:core", version.ref = "appyx" }
 molecule-runtime = { module = "app.cash.molecule:molecule-runtime", version.ref = "molecule" }
+timber = "com.jakewharton.timber:timber:5.0.1"
 
 # Di
 inject = "javax.inject:javax.inject:1"

libraries/androidutils/.gitignore

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

libraries/androidutils/build.gradle.kts

@@ -0,0 +1,29 @@
+
+/*
+ * 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("io.element.android-library")
+}
+
+android {
+    namespace = "io.element.android.libraries.androidutils"
+}
+
+dependencies {
+    implementation(libs.timber)
+    implementation(libs.androidx.corektx)
+}

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/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,13 +13,13 @@
  * 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
 import androidx.annotation.Px
 
-class DimensionConverter(val resources: Resources) {
+class DimensionConverter(private val resources: Resources) {
 
     @Px
     fun dpToPx(dp: Int): Int {

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/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 {
+java {
-    namespace = "io.element.android.libraries.core"
+    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(noinline onError: ((Throwable) -> Unit)? = null, operation: () -> A): A? {
-
-inline fun <A> tryOrNull(message: String? = null, operation: () -> A): A? {
     return try {
         operation()
     } catch (any: Throwable) {
-        if (message != null) {
+        onError?.invoke(any)
-            Timber.e("TAG", message, any)
-        }
         null
     }
 }

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

@@ -16,19 +16,10 @@
 
 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/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/elementresources/build.gradle.kts

@@ -19,7 +19,7 @@ plugins {
 }
 
 android {
-    namespace = "io.element.android.element.resources"
+    namespace = "io.element.android.libraries.resources"
 }
 
 dependencies {

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,17 +40,17 @@ 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.libraries.androidutils.ui.DimensionConverter
-import io.element.android.wysiwyg.inputhandlers.models.InlineFormat
+import io.element.android.libraries.androidutils.ui.hideKeyboard
-import io.element.android.libraries.core.ui.DimensionConverter
+import io.element.android.libraries.androidutils.ui.showKeyboard
-import io.element.android.libraries.core.ui.hideKeyboard
-import io.element.android.libraries.core.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
+import io.element.android.libraries.resources.R as ElementR
 import io.element.android.libraries.ui.strings.R as StringR
 
 // Imported from Element Android

settings.gradle.kts

@@ -60,3 +60,4 @@ include(":anvilcodegen")
 include(":libraries:architecture")
 include(":libraries:matrixtest")
 include(":features:template")
+include(":libraries:androidutils")