Merge branch 'develop' into feature/fga/presenter_tests

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

@@ -48,6 +48,7 @@ import androidx.compose.ui.focus.FocusRequester
 import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.input.nestedscroll.nestedScroll
+import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.sp
@@ -55,6 +56,7 @@ import io.element.android.x.core.compose.LogCompositions
 import io.element.android.x.core.compose.textFieldState
 import io.element.android.x.designsystem.components.avatar.Avatar
 import io.element.android.x.matrix.ui.model.MatrixUser
+import io.element.android.x.ui.strings.R as StringR
 
 @Composable
 fun RoomListTopBar(
@@ -185,7 +187,7 @@ private fun DefaultRoomListTopBar(
         title = {
             Text(
                 fontWeight = FontWeight.Bold,
-                text = "All Chats"
+                text = stringResource(id = StringR.string.all_chats)
             )
         },
         navigationIcon = {

features/roomlist/src/test/kotlin/io/element/android/x/features/roomlist/ExampleUnitTest.kt

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.x.matrix.media
+
+class FakeMediaResolver : MediaResolver {
+    override suspend fun resolve(url: String?, kind: MediaResolver.Kind): ByteArray? {
+        return null
+    }
+
+    override suspend fun resolve(meta: MediaResolver.Meta): ByteArray? {
+        return null
+    }
+}