Cleanup codebase

This commit is contained in:
Benoit Marty 2025-08-13 16:42:01 +02:00
parent 586e840a74
commit 0dba05be0a
20 changed files with 28 additions and 48 deletions

View file

@ -44,7 +44,6 @@ class CreateRoomFlowNode @AssistedInject constructor(
buildContext = buildContext,
plugins = plugins
) {
private fun onRoomCreated(roomId: RoomId) {
plugins<CreateRoomEntryPoint.Callback>().forEach { it.onRoomCreated(roomId) }
}

View file

@ -18,9 +18,7 @@ import javax.inject.Inject
@ContributesBinding(SessionScope::class)
class DefaultCreateRoomEntryPoint @Inject constructor() : CreateRoomEntryPoint {
override fun nodeBuilder(parentNode: Node, buildContext: BuildContext): CreateRoomEntryPoint.NodeBuilder {
val plugins = ArrayList<Plugin>()
return object : CreateRoomEntryPoint.NodeBuilder {

View file

@ -30,7 +30,6 @@ class AddPeopleNode @AssistedInject constructor(
invitePeoplePresenterFactory: InvitePeoplePresenter.Factory,
private val invitePeopleRenderer: InvitePeopleRenderer,
) : Node(buildContext, plugins = plugins) {
data class Inputs(
val joinedRoom: JoinedRoom
) : NodeInputs
@ -51,8 +50,9 @@ class AddPeopleNode @AssistedInject constructor(
val state = invitePeoplePresenter.present()
AddPeopleView(
state = state,
invitePeopleView = { invitePeopleRenderer.Render(state, Modifier) },
onFinish = ::onFinish
)
onFinish = ::onFinish,
) {
invitePeopleRenderer.Render(state, Modifier)
}
}
}

View file

@ -30,9 +30,9 @@ import io.element.android.libraries.ui.strings.CommonStrings
@Composable
fun AddPeopleView(
state: InvitePeopleState,
invitePeopleView: @Composable () -> Unit,
onFinish: () -> Unit,
modifier: Modifier = Modifier,
invitePeopleView: @Composable () -> Unit,
) {
HeaderFooterPage(
modifier = modifier,

View file

@ -7,7 +7,6 @@
package io.element.android.features.createroom.impl.configureroom
import io.element.android.libraries.matrix.api.user.MatrixUser
import io.element.android.libraries.matrix.ui.media.AvatarAction
sealed interface ConfigureRoomEvents {

View file

@ -18,7 +18,6 @@ import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import im.vector.app.features.analytics.plan.MobileScreen
import io.element.android.anvilannotations.ContributesNode
import io.element.android.libraries.architecture.inputs
import io.element.android.libraries.di.SessionScope
import io.element.android.libraries.matrix.api.core.RoomId
import io.element.android.services.analytics.api.AnalyticsService
@ -30,8 +29,7 @@ class ConfigureRoomNode @AssistedInject constructor(
private val presenter: ConfigureRoomPresenter,
private val analyticsService: AnalyticsService,
) : Node(buildContext, plugins = plugins) {
interface Callback: Plugin {
interface Callback : Plugin {
fun onCreateRoomSuccess(roomId: RoomId)
}
@ -43,7 +41,7 @@ class ConfigureRoomNode @AssistedInject constructor(
)
}
private fun onCreateRoomSuccess(roomId: RoomId){
private fun onCreateRoomSuccess(roomId: RoomId) {
plugins<Callback>().forEach { it.onCreateRoomSuccess(roomId) }
}

View file

@ -12,7 +12,6 @@ import io.element.android.libraries.androidutils.file.safeDelete
import io.element.android.libraries.matrix.api.room.alias.RoomAliasHelper
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.flow.getAndUpdate
import java.io.File
import javax.inject.Inject

View file

@ -139,8 +139,6 @@ class ConfigureRoomPresenterTest {
val initialState = initialState()
var expectedConfig = CreateRoomConfig()
assertThat(initialState.config).isEqualTo(expectedConfig)
// Room name
initialState.eventSink(ConfigureRoomEvents.RoomNameChanged(A_ROOM_NAME))
var newState = awaitItem()
@ -250,7 +248,7 @@ class ConfigureRoomPresenterTest {
val matrixClient = createMatrixClient()
val analyticsService = FakeAnalyticsService()
val mediaPreProcessor = FakeMediaPreProcessor()
val dataStore = CreateRoomConfigStore( FakeRoomAliasHelper())
val dataStore = CreateRoomConfigStore(FakeRoomAliasHelper())
val presenter = createConfigureRoomPresenter(
dataStore = dataStore,
mediaPreProcessor = mediaPreProcessor,