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

Feature/fga/gradle perf

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.core.compose.textFieldState
+import io.element.android.libraries.designsystem.components.form.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.libraries.core.compose.OnLifecycleEvent
-import io.element.android.libraries.core.hardware.vibrate
-import io.element.android.libraries.core.screenshot.ImageResult
-import io.element.android.libraries.core.screenshot.screenshot
+import io.element.android.features.rageshake.screenshot.ImageResult
+import io.element.android.features.rageshake.screenshot.screenshot
+import io.element.android.libraries.androidutils.hardware.vibrate
+import io.element.android.libraries.designsystem.utils.OnLifecycleEvent
 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

@@ -0,0 +1,73 @@
+/*
+ * 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.features.rageshake.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
+}

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)