Merge branch 'develop' into feature/fga/navigation First step: makes it compile by disabling the new screens (need to migrate to nodes)

features/login/build.gradle.kts

@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
+
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("io.element.android-compose-library")
     alias(libs.plugins.ksp)
@@ -13,7 +31,6 @@ anvil {
     generateDaggerFactories.set(true)
 }
 
-
 dependencies {
     implementation(project(":anvilannotations"))
     anvil(project(":anvilcodegen"))

features/login/src/androidTest/java/io/element/android/x/features/login/ExampleInstrumentedTest.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.login
 
 import androidx.test.ext.junit.runners.AndroidJUnit4

features/login/src/main/AndroidManifest.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <manifest>
 
 </manifest>

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

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 @file:OptIn(ExperimentalMaterial3Api::class)
 
 package io.element.android.x.features.login.changeserver

features/login/src/main/java/io/element/android/x/features/login/error/ErrorFormatter.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.login.error
 
 import androidx.compose.runtime.Composable

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

@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalMaterial3Api::class)
+
 package io.element.android.x.features.login.root
 
 import androidx.compose.foundation.layout.Box

features/login/src/main/res/drawable/ic_baseline_dataset_24.xml

@@ -1,3 +1,19 @@
+<!--
+  ~ 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.
+  -->
+
 <vector android:height="24dp"
     android:tint="#000000"
     android:viewportHeight="24"

features/login/src/test/java/io/element/android/x/features/login/ExampleUnitTest.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.login
 
 import org.junit.Assert.assertEquals

features/logout/.gitignore

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

features/logout/build.gradle.kts

@@ -0,0 +1,46 @@
+/*
+ * 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.
+ */
+
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    id("io.element.android-compose-library")
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.anvil)
+}
+
+android {
+    namespace = "io.element.android.x.features.logout"
+}
+
+anvil {
+    generateDaggerFactories.set(true)
+}
+
+dependencies {
+    implementation(project(":anvilannotations"))
+    anvil(project(":anvilcodegen"))
+    implementation(project(":libraries:di"))
+    implementation(project(":libraries:architecture"))
+    implementation(project(":libraries:core"))
+    implementation(project(":libraries:matrix"))
+    implementation(project(":libraries:designsystem"))
+    implementation(project(":libraries:elementresources"))
+    implementation(libs.mavericks.compose)
+    ksp(libs.showkase.processor)
+    testImplementation(libs.test.junit)
+    androidTestImplementation(libs.test.junitext)
+}

features/logout/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.kts.
+#
+# 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

features/logout/src/androidTest/java/io/element/android/x/features/logout/ExampleInstrumentedTest.kt

@@ -0,0 +1,38 @@
+/*
+ * 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.x.features.logout
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * 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.x.features.login.test", appContext.packageName)
+    }
+}

features/logout/src/main/AndroidManifest.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
+<manifest>
+
+</manifest>

features/logout/src/main/java/io/element/android/x/features/logout/LogoutScreen.kt

@@ -0,0 +1,100 @@
+/*
+ * 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.x.features.logout
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Logout
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.compose.collectAsState
+import com.airbnb.mvrx.compose.mavericksViewModel
+import io.element.android.x.designsystem.ElementXTheme
+import io.element.android.x.designsystem.components.ProgressDialog
+import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.x.designsystem.components.preferences.PreferenceCategory
+import io.element.android.x.designsystem.components.preferences.PreferenceText
+import io.element.android.x.element.resources.R as ElementR
+
+@Composable
+fun LogoutPreference(
+    viewModel: LogoutViewModel = mavericksViewModel(),
+    onSuccessLogout: () -> Unit = { },
+) {
+    val state: LogoutViewState by viewModel.collectAsState()
+    if (state.logoutAction is Success) {
+        onSuccessLogout()
+        return
+    }
+
+    val openDialog = remember { mutableStateOf(false) }
+
+    LogoutPreferenceContent(
+        onClick = {
+            openDialog.value = true
+        }
+    )
+
+    // Log out confirmation dialog
+    if (openDialog.value) {
+        ConfirmationDialog(
+            title = stringResource(id = ElementR.string.action_sign_out),
+            content = stringResource(id = ElementR.string.action_sign_out_confirmation_simple),
+            submitText = stringResource(id = ElementR.string.action_sign_out),
+            onCancelClicked = {
+                openDialog.value = false
+            },
+            onSubmitClicked = {
+                openDialog.value = false
+                viewModel.logout()
+            },
+            onDismiss = {
+                openDialog.value = false
+            }
+        )
+    }
+
+    if (state.logoutAction is Loading) {
+        ProgressDialog(text = "Login out...")
+    }
+}
+
+@Composable
+fun LogoutPreferenceContent(
+    onClick: () -> Unit = {},
+) {
+    PreferenceCategory(title = stringResource(id = ElementR.string.settings_general_title)) {
+        PreferenceText(
+            title = stringResource(id = ElementR.string.action_sign_out),
+            icon = Icons.Default.Logout,
+            onClick = onClick
+        )
+    }
+}
+
+@Composable
+@Preview
+fun LogoutContentPreview() {
+    ElementXTheme(darkTheme = false) {
+        LogoutPreference()
+    }
+}

features/logout/src/main/java/io/element/android/x/features/logout/LogoutViewModel.kt

@@ -0,0 +1,46 @@
+/*
+ * 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.x.features.logout
+
+import com.airbnb.mvrx.MavericksViewModel
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.x.anvilannotations.ContributesViewModel
+import io.element.android.x.architecture.viewmodel.daggerMavericksViewModelFactory
+import io.element.android.x.di.SessionScope
+import io.element.android.x.matrix.MatrixClient
+import kotlinx.coroutines.launch
+
+@ContributesViewModel(SessionScope::class)
+class LogoutViewModel @AssistedInject constructor(
+    private val client: MatrixClient,
+    @Assisted initialState: LogoutViewState
+) : MavericksViewModel<LogoutViewState>(initialState) {
+
+    companion object : MavericksViewModelFactory<LogoutViewModel, LogoutViewState> by daggerMavericksViewModelFactory()
+
+    fun logout() {
+        viewModelScope.launch {
+            suspend {
+                client.logout()
+            }.execute {
+                copy(logoutAction = it)
+            }
+        }
+    }
+}

features/logout/src/main/java/io/element/android/x/features/logout/LogoutViewState.kt

@@ -0,0 +1,25 @@
+/*
+ * 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.x.features.logout
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.Uninitialized
+
+data class LogoutViewState(
+    val logoutAction: Async<Unit> = Uninitialized,
+) : MavericksState

features/logout/src/test/java/io/element/android/x/features/logout/ExampleUnitTest.kt

@@ -0,0 +1,32 @@
+/*
+ * 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.x.features.logout
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * 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)
+    }
+}

features/messages/build.gradle.kts

@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
+
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("io.element.android-compose-library")
     alias(libs.plugins.ksp)
@@ -12,7 +30,6 @@ anvil {
     generateDaggerFactories.set(true)
 }
 
-
 dependencies {
     implementation(project(":anvilannotations"))
     anvil(project(":anvilcodegen"))
@@ -20,6 +37,7 @@ dependencies {
     implementation(project(":libraries:core"))
     implementation(project(":libraries:architecture"))
     implementation(project(":libraries:matrix"))
+    implementation(project(":libraries:matrixui"))
     implementation(project(":libraries:designsystem"))
     implementation(project(":libraries:textcomposer"))
     implementation(libs.appyx.core)

features/messages/src/androidTest/java/io/element/android/x/features/messages/ExampleInstrumentedTest.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages
 
 import androidx.test.ext.junit.runners.AndroidJUnit4

features/messages/src/main/AndroidManifest.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <manifest>
 
 </manifest>

features/messages/src/main/java/io/element/android/x/features/messages/MessageTimelineItemStateFactory.kt

@@ -1,7 +1,22 @@
+/*
+ * 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.x.features.messages
 
 import androidx.recyclerview.widget.DiffUtil
-import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.designsystem.components.avatar.AvatarSize
 import io.element.android.x.features.messages.diff.CacheInvalidator
 import io.element.android.x.features.messages.diff.MatrixTimelineItemsDiffCallback
@@ -18,11 +33,10 @@ import io.element.android.x.features.messages.model.content.MessagesTimelineItem
 import io.element.android.x.features.messages.model.content.MessagesTimelineItemTextContent
 import io.element.android.x.features.messages.model.content.MessagesTimelineItemUnknownContent
 import io.element.android.x.features.messages.util.invalidateLast
-import io.element.android.x.matrix.MatrixClient
 import io.element.android.x.matrix.media.MediaResolver
 import io.element.android.x.matrix.room.MatrixRoom
 import io.element.android.x.matrix.timeline.MatrixTimelineItem
-import kotlin.system.measureTimeMillis
+import io.element.android.x.matrix.ui.MatrixItemHelper
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
@@ -36,9 +50,10 @@ import org.matrix.rustcomponents.sdk.FormattedBody
 import org.matrix.rustcomponents.sdk.MessageFormat
 import org.matrix.rustcomponents.sdk.MessageType
 import timber.log.Timber
+import kotlin.system.measureTimeMillis
 
 class MessageTimelineItemStateFactory(
-    private val client: MatrixClient,
+    private val matrixItemHelper: MatrixItemHelper,
     private val room: MatrixRoom,
     private val dispatcher: CoroutineDispatcher,
 ) {
@@ -137,7 +152,11 @@ class MessageTimelineItemStateFactory(
         val senderDisplayName = room.userDisplayName(currentSender).getOrNull()
         val senderAvatarUrl = room.userAvatarUrl(currentSender).getOrNull()
         val senderAvatarData =
-            loadAvatarData(senderDisplayName ?: currentSender, senderAvatarUrl)
+            matrixItemHelper.loadAvatarData(
+                name = senderDisplayName ?: currentSender,
+                url = senderAvatarUrl,
+                size = AvatarSize.SMALL
+            )
         return MessagesTimelineItemState.MessageEvent(
             id = currentTimelineItem.uniqueId,
             senderId = currentSender,
@@ -227,14 +246,4 @@ class MessageTimelineItemStateFactory(
             else -> MessagesItemGroupPosition.None
         }
     }
-
-    private suspend fun loadAvatarData(
-        name: String,
-        url: String?,
-        size: AvatarSize = AvatarSize.SMALL
-    ): AvatarData {
-        val model = client.mediaResolver()
-            .resolve(url, kind = MediaResolver.Kind.Thumbnail(size.value))
-        return AvatarData(name, model, size)
-    }
 }

features/messages/src/main/java/io/element/android/x/features/messages/MessagesScreen.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 @file:OptIn(
     ExperimentalMaterial3Api::class,
     ExperimentalMaterialApi::class,

features/messages/src/main/java/io/element/android/x/features/messages/MessagesViewModel.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages
 
 import com.airbnb.mvrx.MavericksViewModel
@@ -7,7 +23,6 @@ import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.x.anvilannotations.ContributesViewModel
 import io.element.android.x.architecture.viewmodel.daggerMavericksViewModelFactory
-import io.element.android.x.designsystem.components.avatar.AvatarData
 import io.element.android.x.designsystem.components.avatar.AvatarSize
 import io.element.android.x.di.SessionScope
 import io.element.android.x.features.messages.model.MessagesItemAction
@@ -17,9 +32,9 @@ import io.element.android.x.features.messages.model.MessagesViewState
 import io.element.android.x.features.messages.model.content.MessagesTimelineItemRedactedContent
 import io.element.android.x.features.messages.model.content.MessagesTimelineItemTextBasedContent
 import io.element.android.x.matrix.MatrixClient
-import io.element.android.x.matrix.media.MediaResolver
 import io.element.android.x.matrix.timeline.MatrixTimeline
 import io.element.android.x.matrix.timeline.MatrixTimelineItem
+import io.element.android.x.matrix.ui.MatrixItemHelper
 import io.element.android.x.textcomposer.MessageComposerMode
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.launchIn
@@ -37,9 +52,10 @@ class MessagesViewModel @AssistedInject constructor(
 
     companion object : MavericksViewModelFactory<MessagesViewModel, MessagesViewState> by daggerMavericksViewModelFactory()
 
+    private val matrixItemHelper = MatrixItemHelper(client)
     private val room = client.getRoom(initialState.roomId)!!
     private val messageTimelineItemStateFactory =
-        MessageTimelineItemStateFactory(client, room, Dispatchers.Default)
+        MessageTimelineItemStateFactory(matrixItemHelper, room, Dispatchers.Default)
     private val timeline = room.timeline()
 
     private val timelineCallback = object : MatrixTimeline.Callback {
@@ -145,7 +161,10 @@ class MessagesViewModel @AssistedInject constructor(
         room.syncUpdateFlow()
             .onEach {
                 val avatarData =
-                    loadAvatarData(room.name ?: room.roomId.value, room.avatarUrl, AvatarSize.SMALL)
+                    matrixItemHelper.loadAvatarData(
+                        room = room,
+                        size = AvatarSize.SMALL
+                    )
                 setState {
                     copy(
                         roomName = room.name, roomAvatar = avatarData,
@@ -201,16 +220,6 @@ class MessagesViewModel @AssistedInject constructor(
         setSnackbarContent("Not implemented yet!")
     }
 
-    private suspend fun loadAvatarData(
-        name: String,
-        url: String?,
-        size: AvatarSize = AvatarSize.MEDIUM
-    ): AvatarData {
-        val model = client.mediaResolver()
-            .resolve(url, kind = MediaResolver.Kind.Thumbnail(size.value))
-        return AvatarData(name, model, size)
-    }
-
     override fun onCleared() {
         super.onCleared()
         timeline.callback = null

features/messages/src/main/java/io/element/android/x/features/messages/components/MessageEventBubble.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi

features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesReactionsView.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.components
 
 import androidx.compose.foundation.BorderStroke

features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemActionsSheet.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 @file:OptIn(ExperimentalMaterialApi::class)
 
 package io.element.android.x.features.messages.components

features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemEncryptedView.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.components
 
 import androidx.compose.material.icons.Icons

features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemImageView.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 @file:OptIn(ExperimentalFoundationApi::class)
 
 package io.element.android.x.features.messages.components

features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemInformativeView.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.components
 
 import androidx.compose.foundation.layout.Row

features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemRedactedView.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.components
 
 import androidx.compose.material.icons.Icons

features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemTextView.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.components
 
 import android.text.SpannableString

features/messages/src/main/java/io/element/android/x/features/messages/components/MessagesTimelineItemUnknownView.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.components
 
 import androidx.compose.material.icons.Icons

features/messages/src/main/java/io/element/android/x/features/messages/components/html/HtmlDocument.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.components.html
 
 import androidx.compose.foundation.background

features/messages/src/main/java/io/element/android/x/features/messages/diff/CacheInvalidator.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.diff
 
 import androidx.recyclerview.widget.ListUpdateCallback

features/messages/src/main/java/io/element/android/x/features/messages/diff/MatrixTimelineItemsDiffCallback.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.diff
 
 import androidx.recyclerview.widget.DiffUtil

features/messages/src/main/java/io/element/android/x/features/messages/model/MessagesItemAction.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model
 
 import androidx.annotation.DrawableRes

features/messages/src/main/java/io/element/android/x/features/messages/model/MessagesItemActionsSheetState.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model
 
 import androidx.compose.runtime.Stable

features/messages/src/main/java/io/element/android/x/features/messages/model/MessagesItemGroupPosition.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider

features/messages/src/main/java/io/element/android/x/features/messages/model/MessagesItemReactionState.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model
 
 import androidx.compose.runtime.Stable

features/messages/src/main/java/io/element/android/x/features/messages/model/MessagesTimelineItemState.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model
 
 import io.element.android.x.designsystem.components.avatar.AvatarData

features/messages/src/main/java/io/element/android/x/features/messages/model/MessagesViewState.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model
 
 import androidx.compose.runtime.Stable

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemEmoteContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 import org.jsoup.nodes.Document

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemEncryptedContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 import org.matrix.rustcomponents.sdk.EncryptedMessage

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemImageContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 import io.element.android.x.matrix.media.MediaResolver

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemNoticeContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 import org.jsoup.nodes.Document

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemRedactedContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 object MessagesTimelineItemRedactedContent : MessagesTimelineItemContent

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemTextBasedContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 import org.jsoup.nodes.Document

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemTextContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 import org.jsoup.nodes.Document

features/messages/src/main/java/io/element/android/x/features/messages/model/content/MessagesTimelineItemUnknownContent.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.model.content
 
 object MessagesTimelineItemUnknownContent : MessagesTimelineItemContent

features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerViewModel.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.textcomposer
 
 import com.airbnb.mvrx.MavericksViewModel

features/messages/src/main/java/io/element/android/x/features/messages/textcomposer/MessageComposerViewState.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.textcomposer
 
 import androidx.compose.runtime.Stable

features/messages/src/main/java/io/element/android/x/features/messages/util/MutableListExt.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages.util
 
 internal inline fun <reified T> MutableList<T?>.invalidateLast() {

features/messages/src/test/java/io/element/android/x/features/messages/ExampleUnitTest.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.messages
 
 import org.junit.Assert.assertEquals

features/onboarding/build.gradle.kts

@@ -1,3 +1,21 @@
+/*
+ * 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.
+ */
+
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
 plugins {
     id("io.element.android-compose-library")
     alias(libs.plugins.ksp)

features/onboarding/src/androidTest/java/io/element/android/x/features/login/ExampleInstrumentedTest.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.login
 
 import androidx.test.ext.junit.runners.AndroidJUnit4

features/onboarding/src/main/AndroidManifest.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <manifest>
 
 </manifest>

features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingScreen.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.
+ */
+
 @file:OptIn(ExperimentalMaterial3Api::class)
 
 package io.element.android.x.features.onboarding

features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingViewModel.kt

@@ -0,0 +1,31 @@
+/*
+ * 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.x.features.onboarding
+
+import com.airbnb.mvrx.MavericksViewModel
+
+class OnBoardingViewModel(initialState: OnBoardingViewState) :
+    MavericksViewModel<OnBoardingViewState>(initialState) {
+
+    fun onPageChanged(page: Int) {
+        setState {
+            copy(
+                currentPage = page,
+            )
+        }
+    }
+}

features/onboarding/src/main/java/io/element/android/x/features/onboarding/OnBoardingViewState.kt

@@ -0,0 +1,23 @@
+/*
+ * 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.x.features.onboarding
+
+import com.airbnb.mvrx.MavericksState
+
+data class OnBoardingViewState(
+    val currentPage: Int = 0,
+) : MavericksState

features/onboarding/src/main/java/io/element/android/x/features/onboarding/SplashCarouselState.kt

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

features/onboarding/src/main/java/io/element/android/x/features/onboarding/SplashCarouselStateFactory.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.onboarding
 
 import androidx.annotation.DrawableRes

features/onboarding/src/main/res/drawable/bg_carousel_page_1.xml

@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="@integer/rtl_mirror_flip"
         android:endColor="#3372C7DA"
         android:startColor="#33BBE7CF" />
-</shape>
+</shape>

features/onboarding/src/main/res/drawable/bg_carousel_page_2.xml

@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="@integer/rtl_mirror_flip"
         android:endColor="#33B972DA"
         android:startColor="#3372C7DA" />
-</shape>
+</shape>

features/onboarding/src/main/res/drawable/bg_carousel_page_3.xml

@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="@integer/rtl_mirror_flip"
         android:endColor="#330DBD8B"
         android:startColor="#33B972DA" />
-</shape>
+</shape>

features/onboarding/src/main/res/drawable/bg_carousel_page_4.xml

@@ -1,7 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <gradient
         android:angle="@integer/rtl_mirror_flip"
         android:endColor="#33BBE7CF"
         android:startColor="#330DBD8B" />
-</shape>
+</shape>

features/onboarding/src/main/res/drawable/bg_color_background.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?android:colorBackground" />
-</shape>
+</shape>

features/onboarding/src/main/res/drawable/bg_gradient_ftue_breaker.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>

features/onboarding/src/main/res/values/strings.xml

@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
 <resources>
     <string name="cut_the_slack_from_teams">Cut the slack from teams.</string>
-</resources>
+</resources>

features/onboarding/src/test/java/io/element/android/x/features/login/ExampleUnitTest.kt

@@ -1,3 +1,19 @@
+/*
+ * 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.x.features.login
 
 import org.junit.Assert.assertEquals

features/preferences/.gitignore

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

features/preferences/build.gradle.kts

@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    id("io.element.android-compose-library")
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.anvil)
+}
+
+android {
+    namespace = "io.element.android.x.features.preferences"
+}
+
+anvil {
+    generateDaggerFactories.set(true)
+}
+
+dependencies {
+    implementation(project(":anvilannotations"))
+    anvil(project(":anvilcodegen"))
+    implementation(project(":libraries:di"))
+    implementation(project(":libraries:architecture"))
+    implementation(project(":libraries:core"))
+    implementation(project(":libraries:matrixui"))
+    implementation(project(":features:rageshake"))
+    implementation(project(":features:logout"))
+    implementation(project(":libraries:designsystem"))
+    implementation(project(":libraries:elementresources"))
+    implementation(libs.mavericks.compose)
+    implementation(libs.datetime)
+    implementation(libs.accompanist.placeholder)
+    testImplementation(libs.test.junit)
+    androidTestImplementation(libs.test.junitext)
+    ksp(libs.showkase.processor)
+}

features/preferences/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

features/preferences/src/androidTest/java/io/element/android/x/features/preferences/ExampleInstrumentedTest.kt

@@ -0,0 +1,38 @@
+/*
+ * 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.x.features.preferences
+
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * 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.x.features.preferences.test", appContext.packageName)
+    }
+}

features/preferences/src/main/AndroidManifest.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
+<manifest>
+
+</manifest>

features/preferences/src/main/java/io/element/android/x/features/preferences/PreferencesScreen.kt

@@ -0,0 +1,66 @@
+/*
+ * 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.x.features.preferences
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import io.element.android.x.designsystem.components.preferences.PreferenceScreen
+import io.element.android.x.element.resources.R as ElementR
+import io.element.android.x.features.logout.LogoutPreference
+import io.element.android.x.features.preferences.user.UserPreferences
+import io.element.android.x.features.rageshake.preferences.RageshakePreferences
+
+@Composable
+fun PreferencesScreen(
+    onBackPressed: () -> Unit = {},
+    onOpenRageShake: () -> Unit = {},
+    onSuccessLogout: () -> Unit = {},
+) {
+    // TODO Hierarchy!
+    // Include pref from other modules
+    PreferencesContent(
+        onBackPressed = onBackPressed,
+        onOpenRageShake = onOpenRageShake,
+        onSuccessLogout = onSuccessLogout,
+    )
+}
+
+@Composable
+fun PreferencesContent(
+    modifier: Modifier = Modifier,
+    onBackPressed: () -> Unit = {},
+    onOpenRageShake: () -> Unit = {},
+    onSuccessLogout: () -> Unit = {},
+) {
+    PreferenceScreen(
+        modifier = modifier,
+        onBackPressed = onBackPressed,
+        title = stringResource(id = ElementR.string.settings)
+    ) {
+        UserPreferences()
+        RageshakePreferences(onOpenRageShake = onOpenRageShake)
+        LogoutPreference(onSuccessLogout = onSuccessLogout)
+    }
+}
+
+@Preview
+@Composable
+fun PreferencesContentPreview() {
+    PreferencesContent()
+}

features/preferences/src/main/java/io/element/android/x/features/preferences/user/UserPreferences.kt

@@ -0,0 +1,44 @@
+/*
+ * 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.x.features.preferences.user
+
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.height
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import com.airbnb.mvrx.compose.collectAsState
+import com.airbnb.mvrx.compose.mavericksViewModel
+import io.element.android.x.matrix.ui.components.MatrixUserHeader
+import io.element.android.x.matrix.ui.viewmodels.user.UserViewModel
+import io.element.android.x.matrix.ui.viewmodels.user.UserViewState
+
+@Composable
+fun UserPreferences(
+    modifier: Modifier = Modifier,
+    viewModel: UserViewModel = mavericksViewModel(),
+) {
+    val user by viewModel.collectAsState(UserViewState::user)
+    when (user()) {
+        null -> Spacer(modifier = modifier.height(1.dp))
+        else -> MatrixUserHeader(
+            modifier = modifier,
+            matrixUser = user.invoke()!!
+        )
+    }
+}

features/preferences/src/test/java/io/element/android/x/features/preferences/ExampleUnitTest.kt

@@ -0,0 +1,32 @@
+/*
+ * 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.x.features.preferences
+
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+/**
+ * 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)
+    }
+}

features/rageshake/.gitignore

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

features/rageshake/build.gradle.kts

@@ -0,0 +1,49 @@
+/*
+ * 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.
+ */
+
+// TODO: Remove once https://youtrack.jetbrains.com/issue/KTIJ-19369 is fixed
+@Suppress("DSL_SCOPE_VIOLATION")
+plugins {
+    id("io.element.android-compose-library")
+    alias(libs.plugins.ksp)
+    alias(libs.plugins.anvil)
+}
+
+android {
+    namespace = "io.element.android.x.features.rageshake"
+}
+
+anvil {
+    generateDaggerFactories.set(true)
+}
+
+dependencies {
+    implementation(project(":libraries:core"))
+    anvil(project(":anvilcodegen"))
+    implementation(project(":libraries:di"))
+    implementation(project(":libraries:architecture"))
+    implementation(project(":anvilannotations"))
+    implementation(project(":libraries:designsystem"))
+    implementation(project(":libraries:elementresources"))
+    implementation(libs.mavericks.compose)
+    implementation(libs.squareup.seismic)
+    implementation(libs.androidx.datastore.preferences)
+    implementation(libs.coil)
+    implementation(libs.coil.compose)
+    ksp(libs.showkase.processor)
+    testImplementation(libs.test.junit)
+    androidTestImplementation(libs.test.junitext)
+}

features/rageshake/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.kts.
+#
+# 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

features/rageshake/src/main/AndroidManifest.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ 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.
+  -->
+
+<manifest>
+
+</manifest>

features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportScreen.kt

@@ -0,0 +1,248 @@
+/*
+ * 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.
+ */
+
+@file:OptIn(ExperimentalMaterial3Api::class)
+
+package io.element.android.x.features.rageshake.bugreport
+
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.imePadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.systemBarsPadding
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material3.Button
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.input.ImeAction
+import androidx.compose.ui.text.input.KeyboardType
+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 coil.compose.AsyncImage
+import coil.request.ImageRequest
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import com.airbnb.mvrx.compose.collectAsState
+import com.airbnb.mvrx.compose.mavericksViewModel
+import io.element.android.x.core.compose.LogCompositions
+import io.element.android.x.designsystem.ElementXTheme
+import io.element.android.x.designsystem.components.LabelledCheckbox
+import io.element.android.x.designsystem.components.dialogs.ErrorDialog
+import io.element.android.x.element.resources.R as ElementR
+
+@Composable
+fun BugReportScreen(
+    viewModel: BugReportViewModel = mavericksViewModel(),
+    onDone: () -> Unit = { },
+) {
+    val state: BugReportViewState by viewModel.collectAsState()
+    val formState: BugReportFormState by viewModel.formState
+    LogCompositions(tag = "Rageshake", msg = "Root")
+    if (state.sending is Success) {
+        onDone()
+    }
+    BugReportContent(
+        state = state,
+        formState = formState,
+        onDescriptionChanged = viewModel::onSetDescription,
+        onSetSendLog = viewModel::onSetSendLog,
+        onSetSendCrashLog = viewModel::onSetSendCrashLog,
+        onSetCanContact = viewModel::onSetCanContact,
+        onSetSendScreenshot = viewModel::onSetSendScreenshot,
+        onSubmit = viewModel::onSubmit,
+        onFailureDialogClosed = viewModel::onFailureDialogClosed,
+        onDone = onDone,
+    )
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun BugReportContent(
+    state: BugReportViewState,
+    formState: BugReportFormState,
+    modifier: Modifier = Modifier,
+    onDescriptionChanged: (String) -> Unit = {},
+    onSetSendLog: (Boolean) -> Unit = {},
+    onSetSendCrashLog: (Boolean) -> Unit = {},
+    onSetCanContact: (Boolean) -> Unit = {},
+    onSetSendScreenshot: (Boolean) -> Unit = {},
+    onSubmit: () -> Unit = {},
+    onFailureDialogClosed: () -> Unit = { },
+    onDone: () -> Unit = { },
+) {
+    Surface(
+        modifier = modifier,
+        color = MaterialTheme.colorScheme.background,
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxSize()
+                .systemBarsPadding()
+                .imePadding()
+        ) {
+            val scrollState = rememberScrollState()
+            Column(
+                modifier = Modifier
+                    .verticalScroll(
+                        state = scrollState,
+                    )
+                    .padding(horizontal = 16.dp),
+            ) {
+                val isError = state.sending is Fail
+                val isFormEnabled = state.sending !is Loading
+                // Title
+                Text(
+                    text = stringResource(id = ElementR.string.send_bug_report),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp, vertical = 16.dp),
+                    textAlign = TextAlign.Center,
+                    fontWeight = FontWeight.Bold,
+                    fontSize = 24.sp,
+                )
+                // Form
+                Text(
+                    text = stringResource(id = ElementR.string.send_bug_report_description),
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(horizontal = 16.dp, vertical = 16.dp),
+                    fontSize = 16.sp,
+                )
+                Column(
+                    // modifier = Modifier.weight(1f),
+                ) {
+                    OutlinedTextField(
+                        value = formState.description,
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(top = 16.dp),
+                        enabled = isFormEnabled,
+                        label = {
+                            Text(text = stringResource(id = ElementR.string.send_bug_report_placeholder))
+                        },
+                        supportingText = {
+                            Text(text = stringResource(id = ElementR.string.send_bug_report_description_in_english))
+                        },
+                        onValueChange = onDescriptionChanged,
+                        keyboardOptions = KeyboardOptions(
+                            keyboardType = KeyboardType.Text,
+                            imeAction = ImeAction.Next
+                        ),
+                        // TODO Error text too short
+                    )
+                }
+                LabelledCheckbox(
+                    checked = state.sendLogs,
+                    onCheckedChange = onSetSendLog,
+                    enabled = isFormEnabled,
+                    text = stringResource(id = ElementR.string.send_bug_report_include_logs)
+                )
+                if (state.hasCrashLogs) {
+                    LabelledCheckbox(
+                        checked = state.sendCrashLogs,
+                        onCheckedChange = onSetSendCrashLog,
+                        enabled = isFormEnabled,
+                        text = stringResource(id = ElementR.string.send_bug_report_include_crash_logs)
+                    )
+                }
+                LabelledCheckbox(
+                    checked = state.canContact,
+                    onCheckedChange = onSetCanContact,
+                    enabled = isFormEnabled,
+                    text = stringResource(id = ElementR.string.you_may_contact_me)
+                )
+                if (state.screenshotUri != null) {
+                    LabelledCheckbox(
+                        checked = state.sendScreenshot,
+                        onCheckedChange = onSetSendScreenshot,
+                        enabled = isFormEnabled,
+                        text = stringResource(id = ElementR.string.send_bug_report_include_screenshot)
+                    )
+                    if (state.sendScreenshot) {
+                        Box(
+                            modifier = Modifier.fillMaxWidth(),
+                            contentAlignment = Alignment.Center
+                        ) {
+                            val context = LocalContext.current
+                            val model = ImageRequest.Builder(context)
+                                .data(state.screenshotUri)
+                                .build()
+                            AsyncImage(
+                                modifier = Modifier.fillMaxWidth(fraction = 0.5f),
+                                model = model,
+                                contentDescription = null
+                            )
+                        }
+                    }
+                }
+                // Submit
+                Button(
+                    onClick = onSubmit,
+                    enabled = state.submitEnabled,
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(vertical = 32.dp)
+                ) {
+                    Text(text = stringResource(id = ElementR.string.action_send))
+                }
+            }
+            when (state.sending) {
+                Uninitialized -> Unit
+                is Loading -> {
+                    CircularProgressIndicator(
+                        progress = state.sendingProgress,
+                        modifier = Modifier.align(Alignment.Center)
+                    )
+                }
+                is Fail -> ErrorDialog(
+                    content = state.sending.error.toString(),
+                    onDismiss = onFailureDialogClosed,
+                )
+                is Success -> onDone()
+            }
+        }
+    }
+}
+
+@Composable
+@Preview
+fun BugReportContentPreview() {
+    ElementXTheme(darkTheme = false) {
+        BugReportContent(
+            state = BugReportViewState(),
+            formState = BugReportFormState.Default
+        )
+    }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportViewModel.kt

@@ -0,0 +1,175 @@
+/*
+ * 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.x.features.rageshake.bugreport
+
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.snapshotFlow
+import androidx.core.net.toUri
+import com.airbnb.mvrx.Fail
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MavericksViewModel
+import com.airbnb.mvrx.MavericksViewModelFactory
+import com.airbnb.mvrx.Success
+import com.airbnb.mvrx.Uninitialized
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.x.anvilannotations.ContributesViewModel
+import io.element.android.x.architecture.viewmodel.daggerMavericksViewModelFactory
+import io.element.android.x.di.AppScope
+import io.element.android.x.features.rageshake.crash.CrashDataStore
+import io.element.android.x.features.rageshake.logs.VectorFileLogger
+import io.element.android.x.features.rageshake.reporter.BugReporter
+import io.element.android.x.features.rageshake.reporter.ReportType
+import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.launch
+
+@ContributesViewModel(AppScope::class)
+class BugReportViewModel @AssistedInject constructor(
+    @Assisted initialState: BugReportViewState,
+    private val bugReporter: BugReporter,
+    private val crashDataStore: CrashDataStore,
+    private val screenshotHolder: ScreenshotHolder,
+    private val appCoroutineScope: CoroutineScope
+) :
+    MavericksViewModel<BugReportViewState>(initialState) {
+
+    companion object :
+        MavericksViewModelFactory<BugReportViewModel, BugReportViewState> by daggerMavericksViewModelFactory()
+
+    var formState = mutableStateOf(BugReportFormState.Default)
+        private set
+
+    init {
+        snapshotFlow { formState.value }
+            .onEach {
+                setState { copy(formState = it) }
+            }.launchIn(viewModelScope)
+        observerCrashDataStore()
+        setState {
+            copy(
+                screenshotUri = screenshotHolder.getFile()?.toUri()?.toString()
+            )
+        }
+    }
+
+    private fun observerCrashDataStore() {
+        viewModelScope.launch {
+            crashDataStore.crashInfo().collect {
+                setState {
+                    copy(
+                        hasCrashLogs = it.isNotEmpty()
+                    )
+                }
+            }
+        }
+    }
+
+    private val listener: BugReporter.IMXBugReportListener = object : BugReporter.IMXBugReportListener {
+        override fun onUploadCancelled() {
+            setState {
+                copy(
+                    sendingProgress = 0F,
+                    sending = Uninitialized
+                )
+            }
+        }
+
+        override fun onUploadFailed(reason: String?) {
+            setState {
+                copy(
+                    sendingProgress = 0F,
+                    sending = Fail(Exception(reason))
+                )
+            }
+        }
+
+        override fun onProgress(progress: Int) {
+            setState {
+                copy(
+                    sendingProgress = progress.toFloat() / 100,
+                    sending = Loading()
+                )
+            }
+        }
+
+        override fun onUploadSucceed(reportUrl: String?) {
+            setState {
+                copy(
+                    sendingProgress = 1F,
+                    sending = Success(Unit)
+                )
+            }
+        }
+    }
+
+    override fun onCleared() {
+        // Use appCoroutineScope because we don't want this coroutine to be cancelled
+        appCoroutineScope.launch(Dispatchers.IO) {
+            screenshotHolder.reset()
+            crashDataStore.reset()
+            VectorFileLogger.getFromTimber().reset()
+        }
+        super.onCleared()
+    }
+
+    fun onSubmit() {
+        setState {
+            copy(
+                sendingProgress = 0F,
+                sending = Loading()
+            )
+        }
+        withState { state ->
+            bugReporter.sendBugReport(
+                coroutineScope = viewModelScope,
+                reportType = ReportType.BUG_REPORT,
+                withDevicesLogs = state.sendLogs,
+                withCrashLogs = state.hasCrashLogs && state.sendCrashLogs,
+                withKeyRequestHistory = false,
+                withScreenshot = state.sendScreenshot,
+                theBugDescription = state.formState.description,
+                serverVersion = "",
+                canContact = state.canContact,
+                customFields = emptyMap(),
+                listener = listener
+            )
+        }
+    }
+
+    fun onFailureDialogClosed() {
+        setState {
+            copy(
+                sendingProgress = 0F,
+                sending = Uninitialized
+            )
+        }
+    }
+
+    fun onSetDescription(str: String) {
+        formState.value = formState.value.copy(description = str)
+        setState { copy(sending = Uninitialized) }
+    }
+
+    fun onSetSendLog(value: Boolean) = setState { copy(sendLogs = value) }
+    fun onSetSendCrashLog(value: Boolean) = setState { copy(sendCrashLogs = value) }
+    fun onSetCanContact(value: Boolean) = setState { copy(canContact = value) }
+    fun onSetSendScreenshot(value: Boolean) = setState { copy(sendScreenshot = value) }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/bugreport/BugReportViewState.kt

@@ -0,0 +1,45 @@
+/*
+ * 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.x.features.rageshake.bugreport
+
+import com.airbnb.mvrx.Async
+import com.airbnb.mvrx.Loading
+import com.airbnb.mvrx.MavericksState
+import com.airbnb.mvrx.Uninitialized
+
+data class BugReportViewState(
+    val formState: BugReportFormState = BugReportFormState.Default,
+    val sendLogs: Boolean = true,
+    val hasCrashLogs: Boolean = false,
+    val sendCrashLogs: Boolean = true,
+    val canContact: Boolean = false,
+    val sendScreenshot: Boolean = false,
+    val screenshotUri: String? = null,
+    val sendingProgress: Float = 0F,
+    val sending: Async<Unit> = Uninitialized,
+) : MavericksState {
+    val submitEnabled =
+        formState.description.length > 10 && sending !is Loading
+}
+
+data class BugReportFormState(
+    val description: String,
+) {
+    companion object {
+        val Default = BugReportFormState("")
+    }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/crash/CrashDataStore.kt

@@ -0,0 +1,74 @@
+/*
+ * 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.x.features.rageshake.crash
+
+import android.content.Context
+import androidx.datastore.core.DataStore
+import androidx.datastore.preferences.core.Preferences
+import androidx.datastore.preferences.core.booleanPreferencesKey
+import androidx.datastore.preferences.core.edit
+import androidx.datastore.preferences.core.stringPreferencesKey
+import androidx.datastore.preferences.preferencesDataStore
+import io.element.android.x.core.bool.orFalse
+import io.element.android.x.di.ApplicationContext
+import javax.inject.Inject
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.runBlocking
+
+private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "elementx_crash")
+
+private val appHasCrashedKey = booleanPreferencesKey("appHasCrashed")
+private val crashDataKey = stringPreferencesKey("crashData")
+
+class CrashDataStore @Inject constructor(
+    @ApplicationContext context: Context
+) {
+    private val store = context.dataStore
+
+    fun setCrashData(crashData: String) {
+        // Must block
+        runBlocking {
+            store.edit { prefs ->
+                prefs[appHasCrashedKey] = true
+                prefs[crashDataKey] = crashData
+            }
+        }
+    }
+
+    suspend fun resetAppHasCrashed() {
+        store.edit { prefs ->
+            prefs[appHasCrashedKey] = false
+        }
+    }
+
+    fun appHasCrashed(): Flow<Boolean> {
+        return store.data.map { prefs ->
+            prefs[appHasCrashedKey].orFalse()
+        }
+    }
+
+    fun crashInfo(): Flow<String> {
+        return store.data.map { prefs ->
+            prefs[crashDataKey].orEmpty()
+        }
+    }
+
+    suspend fun reset() {
+        store.edit { it.clear() }
+    }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/crash/VectorUncaughtExceptionHandler.kt

@@ -0,0 +1,81 @@
+/*
+ * 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.x.features.rageshake.crash
+
+import android.content.Context
+import android.os.Build
+import io.element.android.x.core.data.tryOrNull
+import java.io.PrintWriter
+import java.io.StringWriter
+import timber.log.Timber
+
+class VectorUncaughtExceptionHandler(
+    context: Context
+) : Thread.UncaughtExceptionHandler {
+    private val crashDataStore = CrashDataStore(context)
+    private var previousHandler: Thread.UncaughtExceptionHandler? = null
+
+    /**
+     * Activate this handler.
+     */
+    fun activate() {
+        previousHandler = Thread.getDefaultUncaughtExceptionHandler()
+        Thread.setDefaultUncaughtExceptionHandler(this)
+    }
+
+    /**
+     * An uncaught exception has been triggered.
+     *
+     * @param thread the thread
+     * @param throwable the throwable
+     */
+    @Suppress("PrintStackTrace")
+    override fun uncaughtException(thread: Thread, throwable: Throwable) {
+        Timber.v("Uncaught exception: $throwable")
+        val bugDescription = buildString {
+            val appName = "ElementX"
+            // append(appName + " Build : " + versionCodeProvider.getVersionCode() + "\n")
+            append("$appName Version : 1.0") // ${versionProvider.getVersion(longFormat = true)}\n")
+            // append("SDK Version : ${Matrix.getSdkVersion()}\n")
+            append("Phone : " + Build.MODEL.trim() + " (" + Build.VERSION.INCREMENTAL + " " + Build.VERSION.RELEASE + " " + Build.VERSION.CODENAME + ")\n")
+            append("Memory statuses \n")
+            var freeSize = 0L
+            var totalSize = 0L
+            var usedSize = -1L
+            tryOrNull {
+                val info = Runtime.getRuntime()
+                freeSize = info.freeMemory()
+                totalSize = info.totalMemory()
+                usedSize = totalSize - freeSize
+            }
+            append("usedSize   " + usedSize / 1048576L + " MB\n")
+            append("freeSize   " + freeSize / 1048576L + " MB\n")
+            append("totalSize   " + totalSize / 1048576L + " MB\n")
+            append("Thread: ")
+            append(thread.name)
+            append(", Exception: ")
+            val sw = StringWriter()
+            val pw = PrintWriter(sw, true)
+            throwable.printStackTrace(pw)
+            append(sw.buffer.toString())
+        }
+        Timber.e("FATAL EXCEPTION $bugDescription")
+        crashDataStore.setCrashData(bugDescription)
+        // Show the classical system popup
+        previousHandler?.uncaughtException(thread, throwable)
+    }
+}

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

@@ -0,0 +1,77 @@
+/*
+ * 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.x.features.rageshake.crash.ui
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.airbnb.mvrx.compose.collectAsState
+import com.airbnb.mvrx.compose.mavericksViewModel
+import io.element.android.x.core.compose.LogCompositions
+import io.element.android.x.designsystem.ElementXTheme
+import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.x.element.resources.R as ElementR
+
+@Composable
+fun CrashDetectionScreen(
+    viewModel: CrashDetectionViewModel = mavericksViewModel(),
+    onOpenBugReport: () -> Unit = { },
+) {
+    val state: CrashDetectionViewState by viewModel.collectAsState()
+    LogCompositions(tag = "Crash", msg = "CrashDetectionScreen")
+
+    if (state.crashDetected) {
+        CrashDetectionContent(
+            state,
+            onYesClicked = {
+                viewModel.onYes()
+                onOpenBugReport()
+            },
+            onNoClicked = viewModel::onPopupDismissed,
+            onDismiss = viewModel::onPopupDismissed,
+        )
+    }
+}
+
+@Composable
+fun CrashDetectionContent(
+    state: CrashDetectionViewState,
+    onNoClicked: () -> Unit = { },
+    onYesClicked: () -> Unit = { },
+    onDismiss: () -> Unit = { },
+) {
+    ConfirmationDialog(
+        title = stringResource(id = ElementR.string.send_bug_report),
+        content = stringResource(id = ElementR.string.send_bug_report_app_crashed),
+        submitText = stringResource(id = ElementR.string.yes),
+        cancelText = stringResource(id = ElementR.string.no),
+        onCancelClicked = onNoClicked,
+        onSubmitClicked = onYesClicked,
+        onDismiss = onDismiss,
+    )
+}
+
+@Preview
+@Composable
+fun CrashDetectionContentPreview() {
+    ElementXTheme {
+        CrashDetectionContent(
+            state = CrashDetectionViewState()
+        )
+    }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/crash/ui/CrashDetectionViewModel.kt

@@ -0,0 +1,65 @@
+/*
+ * 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.x.features.rageshake.crash.ui
+
+import com.airbnb.mvrx.MavericksViewModel
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.x.anvilannotations.ContributesViewModel
+import io.element.android.x.architecture.viewmodel.daggerMavericksViewModelFactory
+import io.element.android.x.di.AppScope
+import io.element.android.x.features.rageshake.crash.CrashDataStore
+import kotlinx.coroutines.launch
+
+@ContributesViewModel(AppScope::class)
+class CrashDetectionViewModel @AssistedInject constructor(
+    @Assisted initialState: CrashDetectionViewState,
+    private val crashDataStore: CrashDataStore,
+) : MavericksViewModel<CrashDetectionViewState>(initialState) {
+
+    companion object :
+        MavericksViewModelFactory<CrashDetectionViewModel, CrashDetectionViewState> by daggerMavericksViewModelFactory()
+
+    init {
+        observeDataStore()
+    }
+
+    private fun observeDataStore() {
+        viewModelScope.launch {
+            crashDataStore.appHasCrashed().collect { appHasCrashed ->
+                setState {
+                    copy(
+                        crashDetected = appHasCrashed
+                    )
+                }
+            }
+        }
+    }
+
+    fun onYes() {
+        viewModelScope.launch {
+            crashDataStore.resetAppHasCrashed()
+        }
+    }
+
+    fun onPopupDismissed() {
+        viewModelScope.launch {
+            crashDataStore.reset()
+        }
+    }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/crash/ui/CrashDetectionViewState.kt

@@ -0,0 +1,23 @@
+/*
+ * 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.x.features.rageshake.crash.ui
+
+import com.airbnb.mvrx.MavericksState
+
+data class CrashDetectionViewState(
+    val crashDetected: Boolean = false,
+) : MavericksState

features/rageshake/src/main/java/io/element/android/x/features/rageshake/detection/RageshakeDetectionScreen.kt

@@ -0,0 +1,114 @@
+/*
+ * 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.x.features.rageshake.detection
+
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.lifecycle.Lifecycle
+import com.airbnb.mvrx.compose.collectAsState
+import com.airbnb.mvrx.compose.mavericksViewModel
+import io.element.android.x.core.compose.LogCompositions
+import io.element.android.x.core.compose.OnLifecycleEvent
+import io.element.android.x.core.hardware.vibrate
+import io.element.android.x.core.screenshot.ImageResult
+import io.element.android.x.core.screenshot.screenshot
+import io.element.android.x.designsystem.ElementXTheme
+import io.element.android.x.designsystem.components.dialogs.ConfirmationDialog
+import io.element.android.x.element.resources.R as ElementR
+
+@Composable
+fun RageshakeDetectionScreen(
+    viewModel: RageshakeDetectionViewModel = mavericksViewModel(),
+    onOpenBugReport: () -> Unit = { },
+) {
+    val state: RageshakeDetectionViewState by viewModel.collectAsState()
+    LogCompositions(tag = "Rageshake", msg = "RageshakeDetectionScreen")
+    val context = LocalContext.current
+    OnLifecycleEvent { _, event ->
+        when (event) {
+            Lifecycle.Event.ON_RESUME -> viewModel.start()
+            Lifecycle.Event.ON_PAUSE -> viewModel.stop()
+            else -> Unit
+        }
+    }
+
+    when {
+        state.takeScreenshot -> TakeScreenshot(
+            onScreenshotTaken = viewModel::onScreenshotTaken
+        )
+        state.showDialog -> {
+            LaunchedEffect(key1 = "RS_diag") {
+                context.vibrate()
+            }
+            RageshakeDialogContent(
+                state,
+                onNoClicked = viewModel::onNo,
+                onDisableClicked = {
+                    viewModel.onEnableClicked(false)
+                },
+                onYesClicked = {
+                    onOpenBugReport()
+                    viewModel.onYes()
+                }
+            )
+        }
+    }
+}
+
+@Composable
+private fun TakeScreenshot(
+    onScreenshotTaken: (ImageResult) -> Unit = {}
+) {
+    val view = LocalView.current
+    view.screenshot {
+        onScreenshotTaken(it)
+    }
+}
+
+@Composable
+fun RageshakeDialogContent(
+    state: RageshakeDetectionViewState,
+    onNoClicked: () -> Unit = { },
+    onDisableClicked: () -> Unit = { },
+    onYesClicked: () -> Unit = { },
+) {
+    ConfirmationDialog(
+        title = stringResource(id = ElementR.string.send_bug_report),
+        content = stringResource(id = ElementR.string.send_bug_report_alert_message),
+        thirdButtonText = stringResource(id = ElementR.string.action_disable),
+        submitText = stringResource(id = ElementR.string.yes),
+        cancelText = stringResource(id = ElementR.string.no),
+        onThirdButtonClicked = onDisableClicked,
+        onSubmitClicked = onYesClicked,
+        onDismiss = onNoClicked,
+    )
+}
+
+@Preview
+@Composable
+fun RageshakeDialogContentPreview() {
+    ElementXTheme {
+        RageshakeDialogContent(
+            state = RageshakeDetectionViewState()
+        )
+    }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/detection/RageshakeDetectionViewModel.kt

@@ -0,0 +1,190 @@
+/*
+ * 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.x.features.rageshake.detection
+
+import com.airbnb.mvrx.MavericksViewModel
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedInject
+import io.element.android.x.anvilannotations.ContributesViewModel
+import io.element.android.x.architecture.viewmodel.daggerMavericksViewModelFactory
+import io.element.android.x.core.screenshot.ImageResult
+import io.element.android.x.di.AppScope
+import io.element.android.x.features.rageshake.rageshake.RageShake
+import io.element.android.x.features.rageshake.rageshake.RageshakeDataStore
+import io.element.android.x.features.rageshake.screenshot.ScreenshotHolder
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.distinctUntilChanged
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import timber.log.Timber
+
+@ContributesViewModel(AppScope::class)
+class RageshakeDetectionViewModel @AssistedInject constructor(
+    @Assisted initialState: RageshakeDetectionViewState,
+    private val rageshakeDataStore: RageshakeDataStore,
+    private val screenshotHolder: ScreenshotHolder,
+    private val rageShake: RageShake,
+) : MavericksViewModel<RageshakeDetectionViewState>(initialState) {
+
+    companion object :
+        MavericksViewModelFactory<RageshakeDetectionViewModel, RageshakeDetectionViewState> by daggerMavericksViewModelFactory()
+
+    init {
+        setState {
+            copy(
+                isSupported = rageShake.isAvailable()
+            )
+        }
+        observeDataStore()
+        observeState()
+    }
+
+    private fun observeDataStore() {
+        viewModelScope.launch {
+            rageshakeDataStore.isEnabled().collect { isEnabled ->
+                setState {
+                    copy(
+                        isEnabled = isEnabled
+                    )
+                }
+            }
+        }
+        viewModelScope.launch {
+            rageshakeDataStore.sensitivity().collect { sensitivity ->
+                setState {
+                    copy(
+                        sensitivity = sensitivity
+                    )
+                }
+            }
+        }
+    }
+
+    private fun observeState() {
+        viewModelScope.launch {
+            stateFlow
+                .map {
+                    it.isSupported &&
+                        it.isEnabled &&
+                        it.isStarted &&
+                        !it.takeScreenshot &&
+                        !it.showDialog
+                }
+                .distinctUntilChanged()
+                .collect(::handleRageShake)
+        }
+        viewModelScope.launch {
+            stateFlow
+                .map {
+                    it.sensitivity
+                }
+                .distinctUntilChanged()
+                .collect {
+                    rageShake.setSensitivity(it)
+                }
+        }
+    }
+
+    private fun handleRageShake(shouldStart: Boolean) {
+        if (shouldStart) {
+            withState {
+                rageShake.start(it.sensitivity)
+            }
+            rageShake.interceptor = {
+                setState {
+                    copy(
+                        takeScreenshot = true
+                    )
+                }
+            }
+        } else {
+            rageShake.stop()
+            rageShake.interceptor = null
+        }
+    }
+
+    fun onScreenshotTaken(imageResult: ImageResult) {
+        viewModelScope.launch(Dispatchers.IO) {
+            screenshotHolder.reset()
+            when (imageResult) {
+                is ImageResult.Error -> {
+                    Timber.e(imageResult.exception, "Unable to write screenshot")
+                }
+                is ImageResult.Success -> {
+                    screenshotHolder.writeBitmap(imageResult.data)
+                }
+            }
+            setState {
+                copy(
+                    takeScreenshot = false,
+                    showDialog = true,
+                )
+            }
+        }
+    }
+
+    fun start() {
+        setState {
+            copy(isStarted = true)
+        }
+    }
+
+    private fun onPopupDismissed() {
+        setState {
+            copy(
+                showDialog = false
+            )
+        }
+    }
+
+    fun onNo() {
+        onPopupDismissed()
+    }
+
+    fun onYes() {
+        onPopupDismissed()
+    }
+
+    fun onEnableClicked(enabled: Boolean) {
+        viewModelScope.launch {
+            rageshakeDataStore.setIsEnabled(enabled)
+        }
+        if (!enabled) {
+            onPopupDismissed()
+        }
+    }
+
+    fun onSensitivityChange(sensitivity: Float) {
+        viewModelScope.launch {
+            rageshakeDataStore.setSensitivity(sensitivity)
+        }
+        rageShake.setSensitivity(sensitivity)
+    }
+
+    fun stop() {
+        setState {
+            copy(isStarted = false)
+        }
+    }
+
+    override fun onCleared() {
+        super.onCleared()
+        stop()
+        handleRageShake(false)
+    }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/detection/RageshakeDetectionViewState.kt

@@ -0,0 +1,28 @@
+/*
+ * 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.x.features.rageshake.detection
+
+import com.airbnb.mvrx.MavericksState
+
+data class RageshakeDetectionViewState(
+    val takeScreenshot: Boolean = false,
+    val showDialog: Boolean = false,
+    val isEnabled: Boolean = true,
+    val isStarted: Boolean = false,
+    val isSupported: Boolean = false,
+    val sensitivity: Float = 0.5f,
+) : MavericksState

features/rageshake/src/main/java/io/element/android/x/features/rageshake/logs/LogFormatter.kt

@@ -0,0 +1,64 @@
+/*
+ * 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.x.features.rageshake.logs
+
+import java.io.PrintWriter
+import java.io.StringWriter
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+import java.util.TimeZone
+import java.util.logging.Formatter
+import java.util.logging.LogRecord
+
+internal class LogFormatter : Formatter() {
+
+    override fun format(r: LogRecord): String {
+        if (!mIsTimeZoneSet) {
+            DATE_FORMAT.timeZone = TimeZone.getTimeZone("UTC")
+            mIsTimeZoneSet = true
+        }
+
+        val thrown = r.thrown
+        if (thrown != null) {
+            val sw = StringWriter()
+            val pw = PrintWriter(sw)
+            sw.write(r.message)
+            sw.write(LINE_SEPARATOR)
+            thrown.printStackTrace(pw)
+            pw.flush()
+            return sw.toString()
+        } else {
+            val b = StringBuilder()
+            val date = DATE_FORMAT.format(Date(r.millis))
+            b.append(date)
+            b.append("Z ")
+            b.append(r.message)
+            b.append(LINE_SEPARATOR)
+            return b.toString()
+        }
+    }
+
+    companion object {
+        private val LINE_SEPARATOR = System.getProperty("line.separator") ?: "\n"
+
+        //            private val DATE_FORMAT = SimpleDateFormat("MM-dd HH:mm:ss.SSS", Locale.US)
+        private val DATE_FORMAT = SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss*SSSZZZZ", Locale.US)
+
+        private var mIsTimeZoneSet = false
+    }
+}

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

@@ -0,0 +1,174 @@
+/*
+ * 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.x.features.rageshake.logs
+
+import android.content.Context
+import android.util.Log
+import io.element.android.x.core.data.tryOrNull
+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.
+ */
+class VectorFileLogger(
+    context: Context,
+    // private val vectorPreferences: VectorPreferences
+) : Timber.Tree() {
+
+    companion object {
+        fun getFromTimber(): VectorFileLogger {
+            return Timber.forest().filterIsInstance<VectorFileLogger>().first()
+        }
+
+        private const val SIZE_20MB = 20 * 1024 * 1024
+        private const val SIZE_50MB = 50 * 1024 * 1024
+    }
+
+    /*
+    private val maxLogSizeByte = if (vectorPreferences.labAllowedExtendedLogging()) SIZE_50MB else SIZE_20MB
+    private val logRotationCount = if (vectorPreferences.labAllowedExtendedLogging()) 15 else 7
+     */
+    private val maxLogSizeByte = SIZE_20MB
+    private val logRotationCount = 7
+
+    private val logger = Logger.getLogger(context.packageName).apply {
+        tryOrNull {
+            useParentHandlers = false
+            level = Level.ALL
+        }
+    }
+
+    private val fileHandler: FileHandler?
+    private val cacheDirectory = File(context.cacheDir, "logs")
+    private var fileNamePrefix = "logs"
+
+    private val prioPrefixes = mapOf(
+        Log.VERBOSE to "V/ ",
+        Log.DEBUG to "D/ ",
+        Log.INFO to "I/ ",
+        Log.WARN to "W/ ",
+        Log.ERROR to "E/ ",
+        Log.ASSERT to "WTF/ "
+    )
+
+    init {
+        if (!cacheDirectory.exists()) {
+            cacheDirectory.mkdirs()
+        }
+
+        for (i in 0..15) {
+            val file = File(cacheDirectory, "elementLogs.${i}.txt")
+            tryOrNull { file.delete() }
+        }
+
+        fileHandler = tryOrNull("Failed to initialize FileLogger") {
+            FileHandler(
+                cacheDirectory.absolutePath + "/" + fileNamePrefix + ".%g.txt",
+                maxLogSizeByte,
+                logRotationCount
+            )
+                .also { it.formatter = LogFormatter() }
+                .also { logger.addHandler(it) }
+        }
+    }
+
+    fun reset() {
+        // Delete all files
+        getLogFiles().map {
+            tryOrNull { it.delete() }
+        }
+    }
+
+    @OptIn(DelicateCoroutinesApi::class)
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
+        fileHandler ?: return
+        GlobalScope.launch(Dispatchers.IO) {
+            if (skipLog(priority)) return@launch
+            if (t != null) {
+                logToFile(t)
+            }
+            logToFile(prioPrefixes[priority] ?: "$priority ", tag ?: "Tag", message)
+        }
+    }
+
+    private fun skipLog(priority: Int): Boolean {
+        /*
+        return if (vectorPreferences.labAllowedExtendedLogging()) {
+            false
+        } else {
+            // Exclude verbose logs
+            priority < Log.DEBUG
+        }
+         */
+        // Exclude verbose logs
+        return priority < Log.DEBUG
+    }
+
+    /**
+     * Adds our own log files to the provided list of files.
+     *
+     * @return The list of files with logs.
+     */
+    fun getLogFiles(): List<File> {
+        return tryOrNull("## getLogFiles() failed") {
+            fileHandler
+                ?.flush()
+                ?.let { 0 until logRotationCount }
+                ?.mapNotNull { index ->
+                    File(cacheDirectory, "$fileNamePrefix.${index}.txt")
+                        .takeIf { it.exists() }
+                }
+        }
+            .orEmpty()
+    }
+
+    /**
+     * Log an Throwable.
+     *
+     * @param throwable the throwable to log
+     */
+    private fun logToFile(throwable: Throwable?) {
+        throwable ?: return
+
+        val errors = StringWriter()
+        throwable.printStackTrace(PrintWriter(errors))
+
+        logger.info(errors.toString())
+    }
+
+    private fun logToFile(level: String, tag: String, content: String) {
+        val b = StringBuilder()
+        b.append(Thread.currentThread().id)
+        b.append(" ")
+        b.append(level)
+        b.append("/")
+        b.append(tag)
+        b.append(": ")
+        b.append(content)
+        logger.info(b.toString())
+    }
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/preferences/RageshakePreferenceCategory.kt

@@ -0,0 +1,87 @@
+/*
+ * 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.x.features.rageshake.preferences
+
+import androidx.compose.foundation.layout.Column
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.BugReport
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.tooling.preview.Preview
+import com.airbnb.mvrx.compose.collectAsState
+import com.airbnb.mvrx.compose.mavericksViewModel
+import io.element.android.x.designsystem.components.preferences.PreferenceCategory
+import io.element.android.x.designsystem.components.preferences.PreferenceSlide
+import io.element.android.x.designsystem.components.preferences.PreferenceSwitch
+import io.element.android.x.designsystem.components.preferences.PreferenceText
+import io.element.android.x.element.resources.R as ElementR
+import io.element.android.x.features.rageshake.detection.RageshakeDetectionViewModel
+import io.element.android.x.features.rageshake.detection.RageshakeDetectionViewState
+
+@Composable
+fun RageshakePreferences(
+    onOpenRageShake: () -> Unit = {},
+) {
+    RageshakePreferencesContent(
+        onOpenRageShake = onOpenRageShake,
+    )
+}
+
+@Composable
+fun RageshakePreferencesContent(
+    modifier: Modifier = Modifier,
+    viewModel: RageshakeDetectionViewModel = mavericksViewModel(),
+    onOpenRageShake: () -> Unit = {},
+) {
+    val state: RageshakeDetectionViewState by viewModel.collectAsState()
+    Column(modifier = modifier) {
+        PreferenceCategory(title = stringResource(id = ElementR.string.send_bug_report)) {
+            PreferenceText(
+                title = stringResource(id = ElementR.string.send_bug_report),
+                icon = Icons.Default.BugReport,
+                onClick = onOpenRageShake
+            )
+        }
+        PreferenceCategory(title = stringResource(id = ElementR.string.settings_rageshake)) {
+            if (state.isSupported) {
+                PreferenceSwitch(
+                    title = stringResource(id = ElementR.string.send_bug_report_rage_shake),
+                    isChecked = state.isEnabled,
+                    onCheckedChange = viewModel::onEnableClicked
+                )
+                PreferenceSlide(
+                    title = stringResource(id = ElementR.string.settings_rageshake_detection_threshold),
+                    // summary = stringResource(id = ElementR.string.settings_rageshake_detection_threshold_summary),
+                    value = state.sensitivity,
+                    enabled = state.isEnabled,
+                    steps = 3 /* 5 possible values - steps are in ]0, 1[ */,
+                    onValueChange = viewModel::onSensitivityChange
+                )
+            } else {
+                PreferenceText(title = "Rageshaking is not supported by your device")
+            }
+        }
+    }
+}
+
+@Composable
+@Preview
+fun RageshakePreferencePreview() {
+    RageshakePreferences()
+}

features/rageshake/src/main/java/io/element/android/x/features/rageshake/rageshake/RageShake.kt

@@ -0,0 +1,72 @@
+/*
+ * 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.x.features.rageshake.rageshake
+
+import android.content.Context
+import android.hardware.Sensor
+import android.hardware.SensorManager
+import androidx.core.content.getSystemService
+import com.squareup.seismic.ShakeDetector
+import io.element.android.x.di.AppScope
+import io.element.android.x.di.ApplicationContext
+import io.element.android.x.di.SingleIn
+import javax.inject.Inject
+
+@SingleIn(AppScope::class)
+class RageShake @Inject constructor(
+    @ApplicationContext context: Context,
+) : ShakeDetector.Listener {
+
+    private var sensorManager = context.getSystemService<SensorManager>()
+    private var shakeDetector: ShakeDetector? = null
+
+    var interceptor: (() -> Unit)? = null
+
+    /**
+     * Check if the feature is available on this device.
+     */
+    fun isAvailable(): Boolean {
+        return sensorManager?.getDefaultSensor(Sensor.TYPE_ACCELEROMETER) != null
+    }
+
+    fun start(sensitivity: Float) {
+        sensorManager?.let {
+            shakeDetector = ShakeDetector(this).apply {
+                start(it, SensorManager.SENSOR_DELAY_GAME)
+            }
+            setSensitivity(sensitivity)
+        }
+    }
+
+    fun stop() {
+        shakeDetector?.stop()
+    }
+
+    /**
+     * sensitivity will be {0, O.25, 0.5, 0.75, 1} and converted to
+     * [ShakeDetector.SENSITIVITY_LIGHT (=11), ShakeDetector.SENSITIVITY_HARD (=15)].
+     */
+    fun setSensitivity(sensitivity: Float) {
+        shakeDetector?.setSensitivity(
+            ShakeDetector.SENSITIVITY_LIGHT + (sensitivity * 4).toInt()
+        )
+    }
+
+    override fun hearShake() {
+        interceptor?.invoke()
+    }
+}