Sulkta-OSS/element-x-ada
3
0
Fork 0
Code Issues 1 Pull requests 10 Projects Releases Packages Wiki Activity Actions

Cleanup codebase

Browse source
This commit is contained in:
Benoit Marty 2025-08-13 16:42:01 +02:00
parent 6a050569f5
commit f3425c3388
20 changed files with 28 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

13
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersNode.kt
View file

@ -19,7 +19,6 @@ import im.vector.app.features.analytics.plan.MobileScreen
import io.element.android.anvilannotations.ContributesNode
import io.element.android.features.invitepeople.api.InvitePeoplePresenter
import io.element.android.features.invitepeople.api.InvitePeopleRenderer
import io.element.android.libraries.core.coroutine.CoroutineDispatchers
import io.element.android.libraries.di.RoomScope
import io.element.android.libraries.matrix.api.room.JoinedRoom
import io.element.android.services.analytics.api.AnalyticsService
@ -28,12 +27,11 @@ import io.element.android.services.analytics.api.AnalyticsService
class RoomInviteMembersNode @AssistedInject constructor(
@Assisted buildContext: BuildContext,
@Assisted plugins: List<Plugin>,
private val room: JoinedRoom,
private val analyticsService: AnalyticsService,
private val invitePeopleRenderer: InvitePeopleRenderer,
private val invitePeoplePresenterFactory: InvitePeoplePresenter.Factory,
room: JoinedRoom,
invitePeoplePresenterFactory: InvitePeoplePresenter.Factory,
) : Node(buildContext, plugins = plugins) {
init {
lifecycle.subscribe(
onResume = {
@ -50,9 +48,10 @@ class RoomInviteMembersNode @AssistedInject constructor(
RoomInviteMembersView(
state = state,
modifier = modifier,
invitePeopleView = { invitePeopleRenderer.Render(state, Modifier) },
onBackClick = { navigateUp() },
onSubmitClick = { navigateUp() }
)
onDone = { navigateUp() }
) {
invitePeopleRenderer.Render(state, Modifier)
}
}
}

18
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/invite/RoomInviteMembersView.kt
View file

@ -7,9 +7,7 @@
package io.element.android.features.roomdetails.impl.invite
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.consumeWindowInsets
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
@ -18,7 +16,6 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.PreviewParameter
import androidx.compose.ui.unit.dp
import io.element.android.features.invitepeople.api.InvitePeopleEvents
import io.element.android.features.invitepeople.api.InvitePeopleState
import io.element.android.features.invitepeople.api.InvitePeopleStateProvider
@ -34,10 +31,10 @@ import io.element.android.libraries.ui.strings.CommonStrings
@Composable
fun RoomInviteMembersView(
state: InvitePeopleState,
invitePeopleView: @Composable () -> Unit,
onBackClick: () -> Unit,
onSubmitClick: () -> Unit,
onDone: () -> Unit,
modifier: Modifier = Modifier,
invitePeopleView: @Composable () -> Unit,
) {
Scaffold(
modifier = modifier,
@ -52,7 +49,7 @@ fun RoomInviteMembersView(
},
onSubmitClick = {
state.eventSink(InvitePeopleEvents.SendInvites)
onSubmitClick()
onDone()
},
canSend = state.canInvite,
)
@ -60,13 +57,12 @@ fun RoomInviteMembersView(
) { padding ->
Box(
modifier = Modifier
.fillMaxWidth()
.padding(padding)
.consumeWindowInsets(padding),
.fillMaxWidth()
.padding(padding)
.consumeWindowInsets(padding),
) {
invitePeopleView()
}
}
}
@ -97,6 +93,6 @@ internal fun RoomInviteMembersViewPreview(@PreviewParameter(InvitePeopleStatePro
state = state,
invitePeopleView = {},
onBackClick = {},
onSubmitClick = {},
onDone = {},
)
}