Select private privacy by default

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomConfig.kt

@@ -27,5 +27,5 @@ data class CreateRoomConfig(
     val topic: String? = null,
     val avatarUri: Uri? = null,
     val invites: ImmutableList<MatrixUser> = persistentListOf(),
-    val privacy: RoomPrivacy? = null,
+    val privacy: RoomPrivacy = RoomPrivacy.Private,
 )

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/CreateRoomDataStore.kt

@@ -60,7 +60,7 @@ class CreateRoomDataStore @Inject constructor(
         createRoomConfigFlow.tryEmit(createRoomConfigFlow.value.copy(avatarUri = uri))
     }
 
-    fun setPrivacy(privacy: RoomPrivacy?) {
+    fun setPrivacy(privacy: RoomPrivacy) {
         createRoomConfigFlow.tryEmit(createRoomConfigFlow.value.copy(privacy = privacy))
     }
 

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomEvents.kt

@@ -23,7 +23,7 @@ import io.element.android.libraries.matrix.api.user.MatrixUser
 sealed interface ConfigureRoomEvents {
     data class RoomNameChanged(val name: String) : ConfigureRoomEvents
     data class TopicChanged(val topic: String) : ConfigureRoomEvents
-    data class RoomPrivacyChanged(val privacy: RoomPrivacy?) : ConfigureRoomEvents
+    data class RoomPrivacyChanged(val privacy: RoomPrivacy) : ConfigureRoomEvents
     data class RemoveFromSelection(val matrixUser: MatrixUser) : ConfigureRoomEvents
     data class CreateRoom(val config: CreateRoomConfig) : ConfigureRoomEvents
     data class HandleAvatarAction(val action: AvatarAction) : ConfigureRoomEvents

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt

@@ -56,11 +56,6 @@ class ConfigureRoomPresenter @Inject constructor(
     @Composable
     override fun present(): ConfigureRoomState {
         val createRoomConfig = dataStore.getCreateRoomConfig().collectAsState(CreateRoomConfig())
-        val isCreateButtonEnabled by remember(createRoomConfig.value.roomName, createRoomConfig.value.privacy) {
-            derivedStateOf {
-                createRoomConfig.value.roomName.isNullOrEmpty().not() && createRoomConfig.value.privacy != null
-            }
-        }
 
         val cameraPhotoPicker = mediaPickerProvider.registerCameraPhotoPicker(
             onResult = { uri -> if (uri != null) dataStore.setAvatarUri(uri = uri, cached = true) },
@@ -108,7 +103,6 @@ class ConfigureRoomPresenter @Inject constructor(
 
         return ConfigureRoomState(
             config = createRoomConfig.value,
-            isCreateButtonEnabled = isCreateButtonEnabled,
             avatarActions = avatarActions,
             createRoomAction = createRoomAction.value,
             eventSink = ::handleEvents,

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomState.kt

@@ -24,8 +24,9 @@ import kotlinx.collections.immutable.ImmutableList
 
 data class ConfigureRoomState(
     val config: CreateRoomConfig,
-    val isCreateButtonEnabled: Boolean,
     val avatarActions: ImmutableList<AvatarAction>,
     val createRoomAction: Async<RoomId>,
     val eventSink: (ConfigureRoomEvents) -> Unit
-)
+) {
+    val isCreateButtonEnabled: Boolean = config.roomName.isNullOrEmpty().not()
+}

features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomStateProvider.kt

@@ -31,16 +31,14 @@ open class ConfigureRoomStateProvider : PreviewParameterProvider<ConfigureRoomSt
                     roomName = "Room 101",
                     topic = "Room topic for this room when the text goes onto multiple lines and is really long, there shouldn’t be more than 3 lines",
                     invites = aListOfSelectedUsers(),
-                    privacy = RoomPrivacy.Private,
+                    privacy = RoomPrivacy.Public,
                 ),
-                isCreateButtonEnabled = true,
             ),
         )
 }
 
 fun aConfigureRoomState() = ConfigureRoomState(
     config = CreateRoomConfig(),
-    isCreateButtonEnabled = false,
     avatarActions = persistentListOf(),
     createRoomAction = Async.Uninitialized,
     eventSink = { },

features/createroom/impl/src/test/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenterTests.kt

@@ -97,7 +97,7 @@ class ConfigureRoomPresenterTests {
             assertThat(initialState.config.topic).isNull()
             assertThat(initialState.config.invites).isEmpty()
             assertThat(initialState.config.avatarUri).isNull()
-            assertThat(initialState.config.privacy).isNull()
+            assertThat(initialState.config.privacy).isEqualTo(RoomPrivacy.Private)
         }
     }
 
@@ -115,13 +115,6 @@ class ConfigureRoomPresenterTests {
             var newState: ConfigureRoomState = awaitItem()
             config = config.copy(roomName = A_ROOM_NAME)
             assertThat(newState.config).isEqualTo(config)
-            assertThat(newState.isCreateButtonEnabled).isFalse()
-
-            // Select privacy
-            newState.eventSink(ConfigureRoomEvents.RoomPrivacyChanged(RoomPrivacy.Private))
-            newState = awaitItem()
-            config = config.copy(privacy = RoomPrivacy.Private)
-            assertThat(newState.config).isEqualTo(config)
             assertThat(newState.isCreateButtonEnabled).isTrue()
 
             // Clear room name