Merge branch 'develop' into feature/fga/improve_node_architecture

samples/minimal/build.gradle.kts

@@ -47,12 +47,16 @@ android {
 
 dependencies {
     implementation(libs.androidx.activity.compose)
-    implementation(projects.libraries.matrix)
+    implementation(projects.libraries.matrix.api)
+    implementation(projects.libraries.matrix.impl)
+    implementation(projects.libraries.sessionStorage.implMemory)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.core)
-    implementation(projects.libraries.dateformatter)
+    implementation(projects.libraries.dateformatter.api)
+    implementation(projects.libraries.dateformatter.impl)
     implementation(projects.features.roomlist)
     implementation(projects.features.login)
+    implementation(libs.coroutines.core)
     coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.2")
 }

samples/minimal/src/main/kotlin/io/element/android/samples/minimal/LoginScreen.kt

@@ -21,7 +21,7 @@ import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import io.element.android.features.login.impl.root.LoginRootPresenter
 import io.element.android.features.login.impl.root.LoginRootScreen
-import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
 
 class LoginScreen(private val authenticationService: MatrixAuthenticationService) {
 
@@ -33,7 +33,8 @@ class LoginScreen(private val authenticationService: MatrixAuthenticationService
         val state = presenter.present()
         LoginRootScreen(
             state = state,
-            modifier = modifier
+            modifier = modifier,
+            onBackPressed = {},
         )
     }
 }

samples/minimal/src/main/kotlin/io/element/android/samples/minimal/MainActivity.kt

@@ -29,9 +29,9 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
 import io.element.android.libraries.designsystem.theme.ElementTheme
-import io.element.android.libraries.matrix.auth.MatrixAuthenticationService
-import io.element.android.libraries.matrix.auth.RustMatrixAuthenticationService
-import io.element.android.libraries.matrix.session.PreferencesSessionStore
+import io.element.android.libraries.matrix.api.auth.MatrixAuthenticationService
+import io.element.android.libraries.matrix.impl.auth.RustMatrixAuthenticationService
+import io.element.android.libraries.sessionstorage.impl.memory.InMemorySessionStore
 import kotlinx.coroutines.runBlocking
 import org.matrix.rustcomponents.sdk.AuthenticationService
 import java.io.File
@@ -45,7 +45,7 @@ class MainActivity : ComponentActivity() {
             baseDirectory = baseDirectory,
             coroutineScope = Singleton.appScope,
             coroutineDispatchers = Singleton.coroutineDispatchers,
-            sessionStore = PreferencesSessionStore(applicationContext),
+            sessionStore = InMemorySessionStore(),
             authService = AuthenticationService(baseDirectory.absolutePath, null, null),
         )
     }

samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt

@@ -24,8 +24,8 @@ import io.element.android.features.roomlist.impl.RoomListView
 import io.element.android.libraries.dateformatter.impl.DateFormatters
 import io.element.android.libraries.dateformatter.impl.DefaultLastMessageFormatter
 import io.element.android.libraries.dateformatter.impl.LocalDateTimeProvider
-import io.element.android.libraries.matrix.MatrixClient
-import io.element.android.libraries.matrix.core.RoomId
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.matrix.api.core.RoomId
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone

samples/minimal/src/main/kotlin/io/element/android/samples/minimal/Singleton.kt

@@ -17,8 +17,8 @@
 package io.element.android.samples.minimal
 
 import io.element.android.libraries.core.coroutine.CoroutineDispatchers
-import io.element.android.libraries.matrix.tracing.TracingConfigurations
-import io.element.android.libraries.matrix.tracing.setupTracing
+import io.element.android.libraries.matrix.impl.tracing.setupTracing
+import io.element.android.libraries.matrix.api.tracing.TracingConfigurations
 import kotlinx.coroutines.CoroutineName
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.MainScope

samples/minimal/src/main/res/values-night/themes.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (c) 2023 New Vector Ltd
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<resources>
+    <style name="Theme.ElementX" parent="android:Theme.Material.NoActionBar" />
+</resources>

samples/minimal/src/main/res/values/themes.xml

@@ -16,6 +16,5 @@
   -->
 
 <resources>
-
     <style name="Theme.ElementX" parent="android:Theme.Material.Light.NoActionBar" />
 </resources>