diff --git a/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootNode.kt b/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootNode.kt
index 0ddfcc4b96..110f50a3e8 100644
--- a/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootNode.kt
+++ b/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootNode.kt
@@ -43,7 +43,7 @@ class CreateRoomRootNode @AssistedInject constructor(
@Composable
override fun View(modifier: Modifier) {
val state = presenter.present()
- CreateRoomRootView(
+ CreateRoomRootScreen(
state = state,
modifier = modifier
)
diff --git a/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootView.kt b/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt
similarity index 62%
rename from features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootView.kt
rename to features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt
index 70ac7eea65..0bbbaeede1 100644
--- a/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootView.kt
+++ b/features/createroom/src/main/kotlin/io/element/android/features/createroom/root/CreateRoomRootScreen.kt
@@ -17,26 +17,44 @@
package io.element.android.features.createroom.root
import androidx.compose.foundation.layout.Box
-import androidx.compose.material3.MaterialTheme
+import androidx.compose.foundation.layout.displayCutoutPadding
+import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.tooling.preview.PreviewParameter
import io.element.android.libraries.designsystem.preview.ElementPreviewDark
import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.components.Icon
+import io.element.android.libraries.designsystem.theme.components.IconButton
import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.designsystem.R.drawable as DrawableR
+import io.element.android.libraries.ui.strings.R.string as StringR
@Composable
-fun CreateRoomRootView(
+fun CreateRoomRootScreen(
state: CreateRoomRootState,
modifier: Modifier = Modifier,
+ onBackPressed: () -> Unit = {}
) {
- Box(modifier, contentAlignment = Alignment.Center) {
+ Box(
+ modifier = modifier
+ .fillMaxWidth()
+ .displayCutoutPadding(),
+ ) {
Text(
- "CreateRoom feature view",
- color = MaterialTheme.colorScheme.primary,
+ text = stringResource(id = StringR.create_chat),
+ modifier = Modifier.align(Alignment.Center)
)
+ IconButton(
+ modifier = Modifier
+ .align(Alignment.CenterEnd),
+ onClick = onBackPressed,
+ ) {
+ Icon(resourceId = DrawableR.ic_close, contentDescription = stringResource(id = StringR.action_close))
+ }
}
}
@@ -52,7 +70,7 @@ fun CreateRoomRootViewDarkPreview(@PreviewParameter(CreateRoomRootStateProvider:
@Composable
private fun ContentToPreview(state: CreateRoomRootState) {
- CreateRoomRootView(
+ CreateRoomRootScreen(
state = state,
)
}
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt
index 65593a9069..67aa3b39cd 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsDark.kt
@@ -43,8 +43,8 @@ fun elementColorsDark() = ElementColors(
val materialColorSchemeDark = darkColorScheme(
primary = Color.White,
onPrimary = Color.Black,
- primaryContainer = Color.White,
- onPrimaryContainer = Color.Black,
+ primaryContainer = Color.Black,
+ onPrimaryContainer = Color.White,
// TODO inversePrimary = ColorDarkTokens.InversePrimary,
secondary = DarkGrey,
// TODO onSecondary = ColorDarkTokens.OnSecondary,
diff --git a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsLight.kt b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsLight.kt
index c885f9ec43..99a24c2871 100644
--- a/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsLight.kt
+++ b/libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/theme/ColorsLight.kt
@@ -44,8 +44,8 @@ fun elementColorsLight() = ElementColors(
val materialColorSchemeLight = lightColorScheme(
primary = Black_900,
onPrimary = Color.White,
- primaryContainer = Color.Black,
- onPrimaryContainer = Color.White,
+ primaryContainer = Color.White,
+ onPrimaryContainer = Color.Black,
// TODO inversePrimary = ColorLightTokens.InversePrimary,
secondary = Gray_200,
// TODO onSecondary = ColorLightTokens.OnSecondary,
diff --git a/libraries/designsystem/src/main/res/drawable/ic_close.xml b/libraries/designsystem/src/main/res/drawable/ic_close.xml
new file mode 100644
index 0000000000..a54429f21f
--- /dev/null
+++ b/libraries/designsystem/src/main/res/drawable/ic_close.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/libraries/ui-strings/src/main/res/values/strings_eax.xml b/libraries/ui-strings/src/main/res/values/strings_eax.xml
index 0ed87ec9f0..ee0ee67aed 100644
--- a/libraries/ui-strings/src/main/res/values/strings_eax.xml
+++ b/libraries/ui-strings/src/main/res/values/strings_eax.xml
@@ -14,5 +14,6 @@
You can only connect to an existing server that supports sliding sync. Your homeserver admin will need to configure it.
Server not supported
This server currently doesn\'t support sliding sync.
+ Create chat