Merge branches 'develop' and 'develop' of ssh://github.com/vector-im/element-x-android-poc into develop

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

@@ -26,6 +26,8 @@ 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.components.VectorIcon
+import io.element.android.x.features.login.R
 import io.element.android.x.features.login.error.changeServerError
 
 @Composable
@@ -62,7 +64,7 @@ fun ChangeServerContent(
             )
             {
                 val isError = state.changeServerAction is Fail
-                Text(
+                Box(
                     modifier = Modifier
                         .padding(top = 99.dp)
                         .size(width = 81.dp, height = 73.dp)
@@ -70,11 +72,16 @@ fun ChangeServerContent(
                         .background(
                             color = MaterialTheme.colorScheme.surfaceVariant,
                             shape = RoundedCornerShape(32.dp)
-                        ),
-                    text = "\uDBC2\uDEAC",
-                    fontSize = 34.sp,
-                    textAlign = TextAlign.Center,
                         )
+                ) {
+                    VectorIcon(
+                        modifier = Modifier
+                            .align(Alignment.Center)
+                            .size(width = 48.dp, height = 48.dp),
+                        // TODO Update with design input
+                        resourceId = R.drawable.ic_baseline_dataset_24,
+                    )
+                }
                 Text(
                     text = "Your server",
                     modifier = Modifier

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

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M19,3H5C3.9,3 3,3.9 3,5v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5C21,3.9 20.1,3 19,3zM11,17H7v-4h4V17zM11,11H7V7h4V11zM17,17h-4v-4h4V17zM17,11h-4V7h4V11z"/>
+</vector>