Merge pull request #3966 from element-hq/feature/fga/create_room_conf…

…ig_improvements changes: iterate on room create screen
element-hq · Nov 29, 2024 · 31678c9 · 31678c9
2 parents 74e9dbe + 6c9e974
commit 31678c9
Show file tree

Hide file tree

Showing 14 changed files with 29 additions and 26 deletions.
diff --git a/...m/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt b/...m/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt
@@ -102,7 +102,10 @@ class CreateRoomDataStore @Inject constructor(
         createRoomConfigFlow.getAndUpdate { config ->
             config.copy(
                 roomVisibility = when (config.roomVisibility) {
-                    is RoomVisibilityState.Public -> config.roomVisibility.copy(roomAddress = RoomAddress.Edited(address))
+                    is RoomVisibilityState.Public -> {
+                        val sanitizedAddress = address.lowercase()
+                        config.roomVisibility.copy(roomAddress = RoomAddress.Edited(sanitizedAddress))
+                    }
                     else -> config.roomVisibility
                 }
             )

diff --git a/...ain/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt b/...ain/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomView.kt
@@ -240,9 +240,9 @@ private fun RoomTopic(
         modifier = modifier,
         label = stringResource(R.string.screen_create_room_topic_label),
         value = topic,
-        placeholder = stringResource(CommonStrings.common_topic_placeholder),
         onValueChange = onTopicChange,
         maxLines = 3,
+        supportingText = stringResource(CommonStrings.common_topic_placeholder),
         keyboardOptions = KeyboardOptions(
             capitalization = KeyboardCapitalization.Sentences,
         ),

diff --git a/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en.png b/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_0_en.png
diff --git a/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en.png b/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_1_en.png
diff --git a/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en.png b/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_2_en.png
diff --git a/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en.png b/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_3_en.png
diff --git a/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en.png b/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_4_en.png
diff --git a/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en.png b/...ts/images/features.createroom.impl.configureroom_ConfigureRoomViewDark_5_en.png
diff --git a/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en.png b/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_0_en.png
diff --git a/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en.png b/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_1_en.png
diff --git a/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en.png b/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_2_en.png
diff --git a/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en.png b/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_3_en.png
diff --git a/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en.png b/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_4_en.png
diff --git a/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en.png b/...s/images/features.createroom.impl.configureroom_ConfigureRoomViewLight_5_en.png