Refactor some modules + add dependency management (still WIP)

2022-10-27 19:24:57 +02:00 · 2022-10-27 19:24:57 +02:00 · 6f0d8936eb
commit 6f0d8936eb
parent d1c80438d5
89 changed files with 854 additions and 580 deletions
--- a/libraries/core/build.gradle
+++ b/libraries/core/build.gradle
@ -28,7 +28,7 @@ android {
        compose true
    }
    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
+        kotlinCompilerExtensionVersion "1.3.2"
    }
    kotlinOptions {
        jvmTarget = '1.8'
@ -39,13 +39,13 @@ dependencies {
    implementation 'androidx.core:core-ktx:1.9.0'
    implementation 'androidx.appcompat:appcompat:1.5.1'

-    implementation 'com.google.android.material:material:1.6.1'
+    implementation 'com.google.android.material:material:1.7.0'

    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
-    implementation 'androidx.activity:activity-compose:1.6.0'
+    implementation 'androidx.activity:activity-compose:1.6.1'

    implementation 'androidx.fragment:fragment-ktx:1.5.3'

-    implementation 'com.airbnb.android:mavericks-compose:2.7.0'
+    implementation 'com.airbnb.android:mavericks-compose:3.0.1'
 }
--- a/libraries/designsystem/.gitignore
+++ b/libraries/designsystem/.gitignore
@ -0,0 +1 @@
+/build
--- a/libraries/designsystem/build.gradle.kts
+++ b/libraries/designsystem/build.gradle.kts
@ -0,0 +1,7 @@
+plugins {
+    id("io.element.android-compose")
+}
+
+android {
+    namespace = "io.element.android.x.libraries.designsystem"
+}
--- a/libraries/designsystem/consumer-rules.pro
+++ b/libraries/designsystem/consumer-rules.pro
--- a/libraries/designsystem/proguard-rules.pro
+++ b/libraries/designsystem/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
--- a/libraries/designsystem/src/main/AndroidManifest.xml
+++ b/libraries/designsystem/src/main/AndroidManifest.xml
--- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Color.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Color.kt
@ -1,4 +1,4 @@
-package io.element.android.x.ui.theme
+package io.element.android.x.libraries.designsystem

 import androidx.compose.ui.graphics.Color

--- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Theme.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Theme.kt
@ -1,4 +1,4 @@
-package io.element.android.x.ui.theme
+package io.element.android.x.libraries.designsystem

 import android.app.Activity
 import android.os.Build
--- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Type.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/Type.kt
@ -1,4 +1,4 @@
-package io.element.android.x.ui.theme
+package io.element.android.x.libraries.designsystem

 import androidx.compose.material3.Typography
 import androidx.compose.ui.text.TextStyle
--- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorButton.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorButton.kt
@ -1,4 +1,4 @@
-package io.element.android.x.ui.theme.components
+package io.element.android.x.libraries.designsystem.components

 import androidx.compose.material3.Button
 import androidx.compose.material3.Text
--- a/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorTextField.kt
+++ b/libraries/designsystem/src/main/java/io/element/android/x/libraries/designsystem/components/VectorTextField.kt
@ -1,4 +1,4 @@
-package io.element.android.x.ui.theme.components
+package io.element.android.x.libraries.designsystem.components

 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.material3.ExperimentalMaterial3Api
--- a/libraries/sdk/matrix/build.gradle
+++ b/libraries/sdk/matrix/build.gradle
--- a/libraries/sdk/matrix/src/main/AndroidManifest.xml
+++ b/libraries/sdk/matrix/src/main/AndroidManifest.xml
--- a/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/LogTag.kt
+++ b/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/LogTag.kt
--- a/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/Matrix.kt
+++ b/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/Matrix.kt
--- a/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixClient.kt
+++ b/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixClient.kt
--- a/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixInstance.kt
+++ b/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/MatrixInstance.kt
--- a/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/RoomWrapper.kt
+++ b/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/RoomWrapper.kt
--- a/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/store/SessionStore.kt
+++ b/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/store/SessionStore.kt
@ -10,6 +10,10 @@ import kotlinx.coroutines.flow.firstOrNull


 private val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "elementx_sessions")
+private val userIdPreference = stringPreferencesKey("userId")
+// TODO It contains the access token, so it has to be stored in a more secured storage.
+// I would expect the Rust SDK to provide a more obscure token.
+private val restoreTokenPreference = stringPreferencesKey("restoreToken")

 internal class SessionStore(
    context: Context
@ -21,10 +25,6 @@ internal class SessionStore(

    private val store = context.dataStore

-    private val userIdPreference = stringPreferencesKey("userId")
-    // TODO It contains the access token, so it has to be stored in a more secured storage.
-    // I would expect the Rust SDK to provide a more obscure token.
-    private val restoreTokenPreference = stringPreferencesKey("restoreToken")

    suspend fun storeData(sessionData: SessionData) {
        store.edit { prefs ->
--- a/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/util/Error.kt
+++ b/libraries/sdk/matrix/src/main/java/io/element/android/x/sdk/matrix/util/Error.kt
--- a/libraries/ui/screens/login/build.gradle
+++ b/libraries/ui/screens/login/build.gradle
@ -1,61 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace 'io.element.android.x.ui.screen.login'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 29
-        targetSdk 33
-
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-    implementation project(":libraries:core")
-    implementation project(":libraries:ui:theme")
-    implementation project(":libraries:sdk:matrix")
-
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-
-    implementation 'com.google.android.material:material:1.6.1'
-
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.0-rc01'
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
-
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
-    implementation 'androidx.activity:activity-compose:1.6.0'
-
-    implementation 'androidx.fragment:fragment-ktx:1.5.3'
-
-    implementation 'com.airbnb.android:mavericks-compose:2.7.0'
-}
--- a/libraries/ui/screens/login/src/main/AndroidManifest.xml
+++ b/libraries/ui/screens/login/src/main/AndroidManifest.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application>
-        <activity android:name="LoginActivity" />
-    </application>
-
-</manifest>
--- a/libraries/ui/screens/login/src/main/java/io/element/android/x/ui/screen/login/LoginActions.kt
+++ b/libraries/ui/screens/login/src/main/java/io/element/android/x/ui/screen/login/LoginActions.kt
@ -1,8 +0,0 @@
-package io.element.android.x.ui.screen.login
-
-sealed interface LoginActions {
-    data class SetHomeserver(val homeserver: String) : LoginActions
-    data class SetLogin(val login: String) : LoginActions
-    data class SetPassword(val password: String) : LoginActions
-    object Submit : LoginActions
-}
--- a/libraries/ui/screens/login/src/main/java/io/element/android/x/ui/screen/login/LoginActivity.kt
+++ b/libraries/ui/screens/login/src/main/java/io/element/android/x/ui/screen/login/LoginActivity.kt
@ -1,129 +0,0 @@
-package io.element.android.x.ui.screen.login
-
-import android.app.Activity
-import android.os.Bundle
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.text.KeyboardOptions
-import androidx.compose.material3.*
-import androidx.compose.runtime.getValue
-import androidx.compose.ui.Alignment
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.input.ImeAction
-import androidx.compose.ui.text.input.KeyboardType
-import androidx.compose.ui.unit.dp
-import com.airbnb.mvrx.Fail
-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.ui.theme.ElementXTheme
-import io.element.android.x.ui.theme.components.VectorButton
-
-class LoginActivity : ComponentActivity() {
-
-    @OptIn(ExperimentalMaterial3Api::class)
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setContent {
-            ElementXTheme {
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(16.dp),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    Box(modifier = Modifier.fillMaxSize()) {
-                        Column(
-                            modifier = Modifier.fillMaxSize(),
-                        ) {
-                            val viewModel: LoginViewModel = mavericksViewModel()
-                            val state by viewModel.collectAsState()
-                            val isError = state.isLoggedIn is Fail
-                            Image(
-                                painterResource(id = R.drawable.element_logo_green),
-                                contentDescription = null,
-                                modifier = Modifier
-                                    .align(Alignment.CenterHorizontally)
-                                    .padding(40.dp)
-                            )
-                            OutlinedTextField(
-                                value = state.homeserver,
-                                modifier = Modifier.fillMaxWidth(),
-                                onValueChange = {
-                                    viewModel.handle(LoginActions.SetHomeserver(it))
-                                },
-                                keyboardOptions = KeyboardOptions(
-                                    keyboardType = KeyboardType.Uri,
-                                ),
-                            )
-                            OutlinedTextField(
-                                value = state.login,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(top = 8.dp),
-                                onValueChange = {
-                                    viewModel.handle(LoginActions.SetLogin(it))
-                                },
-                                keyboardOptions = KeyboardOptions(
-                                    keyboardType = KeyboardType.Text,
-                                ),
-                            )
-                            OutlinedTextField(
-                                value = state.password,
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(top = 8.dp),
-                                onValueChange = {
-                                    viewModel.handle(LoginActions.SetPassword(it))
-                                },
-                                isError = isError,
-                                keyboardOptions = KeyboardOptions(
-                                    keyboardType = KeyboardType.Password,
-                                    imeAction = ImeAction.Send,
-                                ),
-                            )
-                            if (isError) {
-                                Text(
-                                    text = (state.isLoggedIn as? Fail)?.toString().orEmpty(),
-                                    color = MaterialTheme.colorScheme.error,
-                                    style = MaterialTheme.typography.bodySmall,
-                                    modifier = Modifier.padding(start = 16.dp)
-                                )
-                            }
-                            VectorButton(
-                                text = "Submit",
-                                onClick = {
-                                    viewModel.handle(LoginActions.Submit)
-                                },
-                                enabled = state.submitEnabled,
-                                modifier = Modifier
-                                    .align(Alignment.End)
-                                    .padding(top = 16.dp)
-                            )
-                            if (state.isLoggedIn is Loading) {
-                                // FIXME This does not work, we never enter this if block
-                                CircularProgressIndicator(
-                                    modifier = Modifier.align(Alignment.CenterHorizontally)
-                                )
-                            }
-                            if (state.isLoggedIn is Success) {
-                                openRoomList()
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    private fun openRoomList() {
-        setResult(Activity.RESULT_OK)
-        finish()
-    }
-}
--- a/libraries/ui/screens/login/src/main/java/io/element/android/x/ui/screen/login/LoginViewModel.kt
+++ b/libraries/ui/screens/login/src/main/java/io/element/android/x/ui/screen/login/LoginViewModel.kt
@ -1,84 +0,0 @@
-package io.element.android.x.ui.screen.login
-
-import android.util.Log
-import com.airbnb.mvrx.Fail
-import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MavericksViewModel
-import com.airbnb.mvrx.Success
-import io.element.android.x.sdk.matrix.MatrixInstance
-import kotlinx.coroutines.launch
-
-class LoginViewModel(initialState: LoginViewState) :
-    MavericksViewModel<LoginViewState>(initialState) {
-
-    private val matrix = MatrixInstance.getInstance()
-
-    init {
-        observeState()
-    }
-
-    private fun observeState() {
-        onEach(
-            LoginViewState::homeserver,
-            LoginViewState::login,
-            LoginViewState::password,
-            LoginViewState::isLoggedIn,
-        ) { homeserver, login, password, isLoggedIn ->
-            setState {
-                copy(
-                    submitEnabled = homeserver.isNotEmpty() &&
-                            login.isNotEmpty() &&
-                            password.isNotEmpty() &&
-                            isLoggedIn !is Loading
-                )
-            }
-        }
-    }
-
-    fun handle(action: LoginActions) {
-        when (action) {
-            is LoginActions.SetHomeserver -> handleSetHomeserver(action)
-            is LoginActions.SetLogin -> handleSetName(action)
-            is LoginActions.SetPassword -> handleSetPassword(action)
-            LoginActions.Submit -> handleSubmit()
-        }
-    }
-
-    private fun handleSetHomeserver(action: LoginActions.SetHomeserver) {
-        setState {
-            copy(
-                homeserver = action.homeserver
-            )
-        }
-    }
-
-    private fun handleSubmit() = withState { state ->
-        viewModelScope.launch {
-            setState { copy(isLoggedIn = Loading()) }
-            try {
-                matrix.login(state.homeserver, state.login, state.password)
-                setState { copy(isLoggedIn = Success(Unit)) }
-            } catch (throwable: Throwable) {
-                Log.e("Error", "Cannot login", throwable)
-                setState { copy(isLoggedIn = Fail(throwable)) }
-            }
-        }
-    }
-
-    private fun handleSetPassword(action: LoginActions.SetPassword) {
-        setState {
-            copy(
-                password = action.password
-            )
-        }
-    }
-
-    private fun handleSetName(action: LoginActions.SetLogin) {
-        setState {
-            copy(
-
-                login = action.login
-            )
-        }
-    }
-}
--- a/libraries/ui/screens/login/src/main/java/io/element/android/x/ui/screen/login/LoginViewState.kt
+++ b/libraries/ui/screens/login/src/main/java/io/element/android/x/ui/screen/login/LoginViewState.kt
@ -1,13 +0,0 @@
-package io.element.android.x.ui.screen.login
-
-import com.airbnb.mvrx.Async
-import com.airbnb.mvrx.MavericksState
-import com.airbnb.mvrx.Uninitialized
-
-data class LoginViewState(
-    val homeserver: String = "matrix.org",
-    val login: String = "",
-    val password: String = "",
-    val submitEnabled: Boolean = false,
-    val isLoggedIn: Async<Unit> = Uninitialized,
-) : MavericksState
--- a/libraries/ui/screens/login/src/main/res/drawable/element_logo_green.xml
+++ b/libraries/ui/screens/login/src/main/res/drawable/element_logo_green.xml
@ -1,22 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="64dp"
-    android:height="64dp"
-    android:viewportWidth="64"
-    android:viewportHeight="64">
-  <path
-      android:pathData="M23.04,3.84C23.04,1.7192 24.7593,0 26.88,0C41.0185,0 52.48,11.4615 52.48,25.6C52.48,27.7208 50.7608,29.44 48.64,29.44C46.5193,29.44 44.8,27.7208 44.8,25.6C44.8,15.7031 36.777,7.68 26.88,7.68C24.7593,7.68 23.04,5.9608 23.04,3.84Z"
-      android:fillColor="#0DBD8B"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M40.96,60.16C40.96,62.2808 39.2407,64 37.12,64C22.9815,64 11.52,52.5385 11.52,38.4C11.52,36.2792 13.2392,34.56 15.36,34.56C17.4807,34.56 19.2,36.2792 19.2,38.4C19.2,48.2969 27.223,56.32 37.12,56.32C39.2407,56.32 40.96,58.0392 40.96,60.16Z"
-      android:fillColor="#0DBD8B"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M3.84,40.96C1.7192,40.96 -0,39.2407 -0,37.12C-0,22.9815 11.4615,11.52 25.6,11.52C27.7208,11.52 29.44,13.2392 29.44,15.36C29.44,17.4807 27.7208,19.2 25.6,19.2C15.7031,19.2 7.68,27.223 7.68,37.12C7.68,39.2407 5.9608,40.96 3.84,40.96Z"
-      android:fillColor="#0DBD8B"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M60.16,23.04C62.2808,23.04 64,24.7593 64,26.88C64,41.0185 52.5385,52.48 38.4,52.48C36.2792,52.48 34.56,50.7608 34.56,48.64C34.56,46.5193 36.2792,44.8 38.4,44.8C48.2969,44.8 56.32,36.777 56.32,26.88C56.32,24.7593 58.0392,23.04 60.16,23.04Z"
-      android:fillColor="#0DBD8B"
-      android:fillType="evenOdd"/>
-</vector>
--- a/libraries/ui/screens/roomlist/build.gradle
+++ b/libraries/ui/screens/roomlist/build.gradle
@ -1,62 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace 'io.element.android.x.ui.screen.roomlist'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 29
-        targetSdk 33
-
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-    implementation project(":libraries:core")
-    implementation project(":libraries:ui:theme")
-    implementation project(":libraries:sdk:matrix")
-
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-
-    implementation 'com.google.android.material:material:1.6.1'
-
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.0-rc01'
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
-
-    implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.5.1'
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
-    implementation 'androidx.activity:activity-compose:1.6.0'
-
-    implementation 'androidx.fragment:fragment-ktx:1.5.3'
-
-    implementation 'com.airbnb.android:mavericks-compose:2.7.0'
-    implementation 'io.coil-kt:coil-compose:2.2.1'
-}
--- a/libraries/ui/screens/roomlist/src/main/AndroidManifest.xml
+++ b/libraries/ui/screens/roomlist/src/main/AndroidManifest.xml
@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <application>
-        <activity android:name="RoomListActivity" />
-    </application>
-
-</manifest>
--- a/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/MatrixUser.kt
+++ b/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/MatrixUser.kt
@ -1,6 +0,0 @@
-package io.element.android.x.ui.screen.roomlist
-
-data class MatrixUser(
-    val username: String? = null,
-    val avatarUrl: String? = null,
-)
--- a/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/RoomListActions.kt
+++ b/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/RoomListActions.kt
@ -1,7 +0,0 @@
-package io.element.android.x.ui.screen.roomlist
-
-sealed interface RoomListActions {
-    object Init : RoomListActions
-    object LoadMore : RoomListActions
-    object Logout : RoomListActions
-}
--- a/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/RoomListActivity.kt
+++ b/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/RoomListActivity.kt
@ -1,131 +0,0 @@
-package io.element.android.x.ui.screen.roomlist
-
-import android.os.Bundle
-import android.widget.Toast
-import androidx.activity.ComponentActivity
-import androidx.activity.compose.setContent
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.border
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
-import androidx.compose.foundation.lazy.LazyColumn
-import androidx.compose.foundation.lazy.items
-import androidx.compose.foundation.shape.CircleShape
-import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.ExitToApp
-import androidx.compose.material3.*
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
-import androidx.compose.ui.unit.dp
-import coil.compose.rememberAsyncImagePainter
-import com.airbnb.mvrx.Success
-import com.airbnb.mvrx.compose.collectAsState
-import com.airbnb.mvrx.compose.mavericksViewModel
-import io.element.android.x.ui.theme.ElementXTheme
-import org.matrix.rustcomponents.sdk.Room
-
-class RoomListActivity : ComponentActivity() {
-
-    private var initDone = false
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setContent {
-            ElementXTheme {
-                val viewModel: RoomListViewModel = mavericksViewModel()
-                if (!initDone) {
-                    initDone = true
-                    viewModel.handle(RoomListActions.Init)
-                }
-                val state = viewModel.collectAsState()
-                // A surface container using the 'background' color from the theme
-                Surface(
-                    modifier = Modifier
-                        .fillMaxSize()
-                        .padding(16.dp),
-                    color = MaterialTheme.colorScheme.background
-                ) {
-                    Column(
-                        modifier = Modifier.fillMaxSize()
-                    ) {
-                        OptionMenu(state.value.user, viewModel)
-                        val rooms = state.value.rooms
-                        if (rooms is Success) {
-                            LazyColumn {
-                                items(rooms()) { room ->
-                                    RoomCompose(room) {
-                                        Toast.makeText(
-                                            this@RoomListActivity,
-                                            "Room $it clicked!",
-                                            Toast.LENGTH_SHORT
-                                        ).show()
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                if (state.value.logoutAction is Success) {
-                    finish()
-                }
-            }
-        }
-    }
-
-    @Composable
-    private fun RoomCompose(room: Room, onClick: (String) -> Unit) {
-        Row(
-            modifier = Modifier
-                .fillMaxWidth()
-                .clickable { onClick.invoke(room.id()) },
-        ) {
-            Image(
-                painter = rememberAsyncImagePainter(model = room.avatarUrl()),
-                contentDescription = null,
-                modifier = Modifier.size(32.dp),
-            )
-            Spacer(modifier = Modifier.width(8.dp))
-            Column(
-                modifier = Modifier
-                    .fillMaxWidth()
-                    .height(32.dp),
-            ) {
-                Text(text = "Room: ${room.name() ?: room.id()}")
-                Text(text = if (room.isDirect()) "Direct" else "Room")
-            }
-
-        }
-    }
-
-    @OptIn(ExperimentalMaterial3Api::class)
-    @Composable
-    private fun OptionMenu(matrixUser: MatrixUser, viewModel: RoomListViewModel) {
-        TopAppBar(
-            title = {
-                Row(
-                    modifier = Modifier.fillMaxWidth()
-                ) {
-                    Image(
-                        painter = rememberAsyncImagePainter(matrixUser.avatarUrl),
-                        contentDescription = null,
-                        modifier = Modifier
-                            .size(48.dp)
-                            .clip(CircleShape)
-                            .border(1.5.dp, MaterialTheme.colorScheme.primary, CircleShape)
-                    )
-                    Spacer(modifier = Modifier.width(8.dp))
-                    Text("${matrixUser.username}")
-                }
-            },
-            actions = {
-                IconButton(
-                    onClick = { viewModel.handle(RoomListActions.Logout) }
-                ) {
-                    Icon(Icons.Default.ExitToApp, contentDescription = "logout")
-                }
-            }
-        )
-    }
-}
--- a/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/RoomListViewModel.kt
+++ b/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/RoomListViewModel.kt
@ -1,87 +0,0 @@
-package io.element.android.x.ui.screen.roomlist
-
-import com.airbnb.mvrx.Fail
-import com.airbnb.mvrx.Loading
-import com.airbnb.mvrx.MavericksViewModel
-import com.airbnb.mvrx.Success
-import io.element.android.x.core.data.tryOrNull
-import io.element.android.x.sdk.matrix.MatrixClient
-import io.element.android.x.sdk.matrix.MatrixInstance
-import kotlinx.coroutines.launch
-import org.matrix.rustcomponents.sdk.Room
-import org.matrix.rustcomponents.sdk.StoppableSpawn
-import org.matrix.rustcomponents.sdk.UpdateSummary
-
-class RoomListViewModel(initialState: RoomListViewState) :
-    MavericksViewModel<RoomListViewState>(initialState), MatrixClient.SlidingSyncListener {
-
-    private var sync: StoppableSpawn? = null
-    private val matrix = MatrixInstance.getInstance()
-
-    fun handle(action: RoomListActions) {
-        when (action) {
-            RoomListActions.Init -> handleInit()
-            RoomListActions.LoadMore -> TODO()
-            RoomListActions.Logout -> handleLogout()
-        }
-    }
-
-    private fun handleInit() {
-        viewModelScope.launch {
-            val client = getClient()
-            setState {
-                copy(
-                    user = MatrixUser(
-                        tryOrNull { client.username() } ?: "Room list",
-                        tryOrNull { client.avatarUrl() } ?: "https://previews.123rf.com/images/lkeskinen/lkeskinen1802/lkeskinen180208322/95731150-exemple-de-tampon-%C3%A9tiquette-typographique-timbre-ou-ic%C3%B4ne.jpg",
-                    )
-                )
-            }
-            sync = client.slidingSync(listener = this@RoomListViewModel)
-        }
-    }
-
-    private fun handleLogout() {
-        viewModelScope.launch {
-            setState { copy(logoutAction = Loading()) }
-            try {
-                getClient().logout()
-                setState { copy(logoutAction = Success(Unit)) }
-            } catch (throwable: Throwable) {
-                setState { copy(logoutAction = Fail(throwable)) }
-            }
-        }
-    }
-
-    private suspend fun getClient(): MatrixClient {
-        return matrix.restoreSession()!!
-    }
-
-    override fun onSyncUpdate(
-        summary: UpdateSummary,
-        rooms: List<Room>
-    ) = withState { state ->
-        val list = state.rooms().orEmpty().toMutableList()
-        rooms.forEach { room ->
-            // Either replace or add the room
-            val idx = list.indexOfFirst { it.id() == room.id() }
-            if (idx == -1) {
-                list.add(room)
-            } else {
-                list[idx] = room
-            }
-        }
-
-        setState {
-            copy(
-                rooms = Success(list),
-                summary = Success(summary)
-            )
-        }
-    }
-
-    override fun onCleared() {
-        super.onCleared()
-        sync?.cancel()
-    }
-}
--- a/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/RoomListViewState.kt
+++ b/libraries/ui/screens/roomlist/src/main/java/io/element/android/x/ui/screen/roomlist/RoomListViewState.kt
@ -1,15 +0,0 @@
-package io.element.android.x.ui.screen.roomlist
-
-import com.airbnb.mvrx.Async
-import com.airbnb.mvrx.MavericksState
-import com.airbnb.mvrx.Uninitialized
-import org.matrix.rustcomponents.sdk.Room
-import org.matrix.rustcomponents.sdk.UpdateSummary
-
-data class RoomListViewState(
-    val user: MatrixUser = MatrixUser(),
-    val rooms: Async<List<Room>> = Uninitialized,
-    val summary: Async<UpdateSummary> = Uninitialized,
-    val canLoadMore: Boolean = false,
-    val logoutAction: Async<Unit> = Uninitialized,
-) : MavericksState
--- a/libraries/ui/theme/build.gradle
+++ b/libraries/ui/theme/build.gradle
@ -1,50 +0,0 @@
-plugins {
-    id 'com.android.library'
-    id 'org.jetbrains.kotlin.android'
-}
-
-android {
-    namespace 'io.element.android.x.theme'
-    compileSdk 33
-
-    defaultConfig {
-        minSdk 29
-        targetSdk 33
-
-        consumerProguardFiles "consumer-rules.pro"
-    }
-
-    buildTypes {
-        release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    buildFeatures {
-        compose true
-    }
-    composeOptions {
-        kotlinCompilerExtensionVersion compose_version
-    }
-    kotlinOptions {
-        jvmTarget = '1.8'
-    }
-}
-
-dependencies {
-    implementation 'androidx.core:core-ktx:1.9.0'
-    implementation 'androidx.appcompat:appcompat:1.5.1'
-    implementation 'com.google.android.material:material:1.6.1'
-
-    implementation "androidx.compose.ui:ui:$compose_version"
-    implementation 'androidx.compose.material3:material3:1.0.0-rc01'
-    implementation "androidx.compose.ui:ui-tooling-preview:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
-    debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
-
-    implementation "androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1"
-}
--- a/libraries/ui/theme/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ b/libraries/ui/theme/src/main/res/drawable-v24/ic_launcher_foreground.xml
@ -1,30 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="85.84757"
-                android:endY="92.4963"
-                android:startX="42.9492"
-                android:startY="49.59793"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
--- a/libraries/ui/theme/src/main/res/drawable/ic_launcher_background.xml
+++ b/libraries/ui/theme/src/main/res/drawable/ic_launcher_background.xml
@ -1,170 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-    <path
-        android:fillColor="#3DDC84"
-        android:pathData="M0,0h108v108h-108z" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M9,0L9,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,0L19,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,0L29,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,0L39,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,0L49,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,0L59,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,0L69,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,0L79,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M89,0L89,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M99,0L99,108"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,9L108,9"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,19L108,19"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,29L108,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,39L108,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,49L108,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,59L108,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,69L108,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,79L108,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,89L108,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M0,99L108,99"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,29L89,29"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,39L89,39"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,49L89,49"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,59L89,59"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,69L89,69"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M19,79L89,79"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M29,19L29,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M39,19L39,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M49,19L49,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M59,19L59,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M69,19L69,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-    <path
-        android:fillColor="#00000000"
-        android:pathData="M79,19L79,89"
-        android:strokeWidth="0.8"
-        android:strokeColor="#33FFFFFF" />
-</vector>
--- a/libraries/ui/theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/libraries/ui/theme/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/libraries/ui/theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/libraries/ui/theme/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
--- a/libraries/ui/theme/src/main/res/mipmap-hdpi/ic_launcher.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-hdpi/ic_launcher.webp
--- a/libraries/ui/theme/src/main/res/mipmap-hdpi/ic_launcher_round.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-hdpi/ic_launcher_round.webp
--- a/libraries/ui/theme/src/main/res/mipmap-mdpi/ic_launcher.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-mdpi/ic_launcher.webp
--- a/libraries/ui/theme/src/main/res/mipmap-mdpi/ic_launcher_round.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-mdpi/ic_launcher_round.webp
--- a/libraries/ui/theme/src/main/res/mipmap-xhdpi/ic_launcher.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-xhdpi/ic_launcher.webp
--- a/libraries/ui/theme/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
--- a/libraries/ui/theme/src/main/res/mipmap-xxhdpi/ic_launcher.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-xxhdpi/ic_launcher.webp
--- a/libraries/ui/theme/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
--- a/libraries/ui/theme/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
--- a/libraries/ui/theme/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
+++ b/libraries/ui/theme/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
--- a/libraries/ui/theme/src/main/res/values/colors.xml
+++ b/libraries/ui/theme/src/main/res/values/colors.xml
@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
-    <color name="black">#FF000000</color>
-    <color name="white">#FFFFFFFF</color>
-</resources>
--- a/libraries/ui/theme/src/main/res/values/strings.xml
+++ b/libraries/ui/theme/src/main/res/values/strings.xml
@ -1,3 +0,0 @@
-<resources>
-    <string name="app_name">ElementX</string>
-</resources>
--- a/libraries/ui/theme/src/main/res/values/themes.xml
+++ b/libraries/ui/theme/src/main/res/values/themes.xml
@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <style name="Theme.ElementX" parent="android:Theme.Material.Light.NoActionBar" />
-</resources>
--- a/libraries/ui/theme/src/main/res/xml/backup_rules.xml
+++ b/libraries/ui/theme/src/main/res/xml/backup_rules.xml
@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample backup rules file; uncomment and customize as necessary.
-   See https://developer.android.com/guide/topics/data/autobackup
-   for details.
-   Note: This file is ignored for devices older that API 31
-   See https://developer.android.com/about/versions/12/backup-restore
-->
-<full-backup-content>
-    <!--
-   <include domain="sharedpref" path="."/>
-   <exclude domain="sharedpref" path="device.xml"/>
-->
-</full-backup-content>
--- a/libraries/ui/theme/src/main/res/xml/data_extraction_rules.xml
+++ b/libraries/ui/theme/src/main/res/xml/data_extraction_rules.xml
@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-   Sample data extraction rules file; uncomment and customize as necessary.
-   See https://developer.android.com/about/versions/12/backup-restore#xml-changes
-   for details.
-->
-<data-extraction-rules>
-    <cloud-backup>
-        <!-- TODO: Use <include> and <exclude> to control what is backed up.
-        <include .../>
-        <exclude .../>
-        -->
-    </cloud-backup>
-    <!--
-    <device-transfer>
-        <include .../>
-        <exclude .../>
-    </device-transfer>
-    -->
-</data-extraction-rules>