Room navigation : some clean up

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/invitelist/InviteListStateProvider.kt

@@ -18,17 +18,16 @@ package io.element.android.features.invite.impl.invitelist
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.invite.api.response.AcceptDeclineInviteState
-import io.element.android.features.invite.impl.model.InviteListInviteSummary
-import io.element.android.features.invite.impl.model.InviteSender
 import io.element.android.features.invite.api.response.AcceptDeclineInviteStateProvider
 import io.element.android.features.invite.api.response.anAcceptDeclineInviteState
+import io.element.android.features.invite.impl.model.InviteListInviteSummary
+import io.element.android.features.invite.impl.model.InviteSender
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.core.UserId
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 
 open class InviteListStateProvider : PreviewParameterProvider<InviteListState> {
-
     private val acceptDeclineInviteStateProvider = AcceptDeclineInviteStateProvider()
 
     override val values: Sequence<InviteListState>

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenter.kt

@@ -23,7 +23,6 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.runtime.setValue
-import com.squareup.anvil.annotations.ContributesBinding
 import im.vector.app.features.analytics.plan.JoinedRoom
 import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
 import io.element.android.features.invite.api.response.AcceptDeclineInviteState
@@ -32,7 +31,6 @@ import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.architecture.runCatchingUpdatingState
 import io.element.android.libraries.architecture.runUpdatingState
-import io.element.android.libraries.di.SessionScope
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.push.api.notifications.NotificationDrawerManager
@@ -49,10 +47,8 @@ class AcceptDeclineInvitePresenter @Inject constructor(
     private val analyticsService: AnalyticsService,
     private val notificationDrawerManager: NotificationDrawerManager,
 ) : Presenter<AcceptDeclineInviteState> {
-
     @Composable
     override fun present(): AcceptDeclineInviteState {
-
         val localCoroutineScope = rememberCoroutineScope()
         val acceptedAction: MutableState<AsyncAction<RoomId>> = remember { mutableStateOf(AsyncAction.Uninitialized) }
         val declinedAction: MutableState<AsyncAction<RoomId>> = remember { mutableStateOf(AsyncAction.Uninitialized) }

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInviteViewWrapper.kt

@@ -27,7 +27,6 @@ import javax.inject.Inject
 
 @ContributesBinding(SessionScope::class)
 class AcceptDeclineInviteViewWrapper @Inject constructor() : AcceptDeclineInviteView {
-
     @Composable
     override fun Render(
         state: AcceptDeclineInviteState,

features/invite/impl/src/main/kotlin/io/element/android/features/invite/impl/response/InternalAcceptDeclineInviteEvents.kt

@@ -18,7 +18,7 @@ package io.element.android.features.invite.impl.response
 
 import io.element.android.features.invite.api.response.AcceptDeclineInviteEvents
 
-sealed interface InternalAcceptDeclineInviteEvents: AcceptDeclineInviteEvents {
+sealed interface InternalAcceptDeclineInviteEvents : AcceptDeclineInviteEvents {
     data object ConfirmDeclineInvite : InternalAcceptDeclineInviteEvents
     data object CancelDeclineInvite : InternalAcceptDeclineInviteEvents
     data object DismissAcceptError : InternalAcceptDeclineInviteEvents

features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/invitelist/InviteListPresenterTests.kt

@@ -24,11 +24,7 @@ import com.google.common.truth.Truth.assertThat
 import io.element.android.features.invite.api.SeenInvitesStore
 import io.element.android.features.invite.api.response.AcceptDeclineInviteState
 import io.element.android.features.invite.api.response.anAcceptDeclineInviteState
-import io.element.android.features.invite.impl.invitelist.InviteListEvents
-import io.element.android.features.invite.impl.invitelist.InviteListPresenter
-import io.element.android.features.invite.impl.invitelist.InviteListState
 import io.element.android.features.invite.test.FakeSeenInvitesStore
-import io.element.android.libraries.architecture.AsyncData
 import io.element.android.libraries.architecture.Presenter
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
@@ -43,14 +39,9 @@ import io.element.android.libraries.matrix.test.A_ROOM_NAME
 import io.element.android.libraries.matrix.test.A_USER_ID
 import io.element.android.libraries.matrix.test.A_USER_NAME
 import io.element.android.libraries.matrix.test.FakeMatrixClient
-import io.element.android.libraries.matrix.test.room.FakeMatrixRoom
 import io.element.android.libraries.matrix.test.room.aRoomMember
 import io.element.android.libraries.matrix.test.room.aRoomSummaryDetails
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
-import io.element.android.libraries.push.api.notifications.NotificationDrawerManager
-import io.element.android.libraries.push.test.notifications.FakeNotificationDrawerManager
-import io.element.android.services.analytics.api.AnalyticsService
-import io.element.android.services.analytics.test.FakeAnalyticsService
 import io.element.android.tests.testutils.WarmUpRule
 import kotlinx.coroutines.test.runTest
 import org.junit.Rule

features/invite/impl/src/test/kotlin/io/element/android/features/invite/impl/response/AcceptDeclineInvitePresenterTest.kt

@@ -40,7 +40,6 @@ import org.junit.Test
 import java.util.Optional
 
 class AcceptDeclineInvitePresenterTest {
-
     @get:Rule
     val warmUpRule = WarmUpRule()
 

features/joinroom/api/src/main/kotlin/io/element/android/features/joinroom/api/JoinRoomEntryPoint.kt

@@ -25,7 +25,6 @@ import io.element.android.libraries.matrix.api.core.RoomId
 import java.util.Optional
 
 interface JoinRoomEntryPoint : FeatureEntryPoint {
-
     fun createNode(parentNode: Node, buildContext: BuildContext, inputs: Inputs): Node
 
     data class Inputs(
@@ -33,4 +32,3 @@ interface JoinRoomEntryPoint : FeatureEntryPoint {
         val roomDescription: Optional<RoomDescription>,
     ) : NodeInputs
 }
-

features/joinroom/impl/build.gradle.kts

@@ -43,7 +43,6 @@ dependencies {
     implementation(projects.features.roomdirectory.api)
     implementation(projects.libraries.uiStrings)
 
-
     testImplementation(libs.test.junit)
     testImplementation(libs.coroutines.test)
     testImplementation(libs.molecule.runtime)

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/DefaultJoinRoomEntryPoint.kt

@@ -26,7 +26,6 @@ import javax.inject.Inject
 
 @ContributesBinding(AppScope::class)
 class DefaultJoinRoomEntryPoint @Inject constructor() : JoinRoomEntryPoint {
-
     override fun createNode(parentNode: Node, buildContext: BuildContext, inputs: JoinRoomEntryPoint.Inputs): Node {
         return parentNode.createNode<JoinRoomNode>(
             buildContext = buildContext,

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomEvents.kt

@@ -17,7 +17,7 @@
 package io.element.android.features.joinroom.impl
 
 sealed interface JoinRoomEvents {
-    data object JoinRoom: JoinRoomEvents
+    data object JoinRoom : JoinRoomEvents
     data object AcceptInvite : JoinRoomEvents
     data object DeclineInvite : JoinRoomEvents
 }

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomNode.kt

@@ -36,7 +36,6 @@ class JoinRoomNode @AssistedInject constructor(
     presenterFactory: JoinRoomPresenter.Factory,
     private val acceptDeclineInviteView: AcceptDeclineInviteView,
 ) : Node(buildContext, plugins = plugins) {
-
     private val inputs: JoinRoomEntryPoint.Inputs = inputs()
     private val presenter = presenterFactory.create(inputs.roomId, inputs.roomDescription)
 

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenter.kt

@@ -40,7 +40,6 @@ class JoinRoomPresenter @AssistedInject constructor(
     private val matrixClient: MatrixClient,
     private val acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState>,
 ) : Presenter<JoinRoomState> {
-
     interface Factory {
         fun create(roomId: RoomId, roomDescription: Optional<RoomDescription>): JoinRoomPresenter
     }

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomState.kt

@@ -28,7 +28,7 @@ data class JoinRoomState(
     val acceptDeclineInviteState: AcceptDeclineInviteState,
     val eventSink: (JoinRoomEvents) -> Unit
 ) {
-    val joinAuthorisationStatus = when(contentState) {
+    val joinAuthorisationStatus = when (contentState) {
         is ContentState.Loaded -> contentState.joinAuthorisationStatus
         else -> JoinAuthorisationStatus.Unknown
     }

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomStateProvider.kt

@@ -75,4 +75,3 @@ fun aJoinRoomState(
     acceptDeclineInviteState = acceptDeclineInviteState,
     eventSink = eventSink
 )
-

features/joinroom/impl/src/main/kotlin/io/element/android/features/joinroom/impl/JoinRoomView.kt

@@ -16,7 +16,6 @@
 
 package io.element.android.features.joinroom.impl
 
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -32,7 +31,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.text.style.TextOverflow
@@ -138,14 +136,10 @@ private fun JoinRoomContent(
     contentState: ContentState,
     modifier: Modifier = Modifier,
 ) {
-
-    Column(
-        modifier = modifier.fillMaxWidth(),
-        horizontalAlignment = Alignment.CenterHorizontally
-    ) {
     when (contentState) {
         is ContentState.Loaded -> {
             ContentScaffold(
+                modifier = modifier,
                 avatar = {
                     Avatar(contentState.avatarData(AvatarSize.RoomHeader))
                 },
@@ -167,6 +161,7 @@ private fun JoinRoomContent(
         }
         is ContentState.UnknownRoom -> {
             ContentScaffold(
+                modifier = modifier,
                 avatar = {
                     PlaceholderAtom(width = AvatarSize.RoomHeader.dp, height = AvatarSize.RoomHeader.dp)
                 },
@@ -180,6 +175,7 @@ private fun JoinRoomContent(
         }
         is ContentState.Loading -> {
             ContentScaffold(
+                modifier = modifier,
                 avatar = {
                     PlaceholderAtom(width = AvatarSize.RoomHeader.dp, height = AvatarSize.RoomHeader.dp)
                 },
@@ -192,7 +188,6 @@ private fun JoinRoomContent(
             )
         }
     }
-    }
 }
 
 @Composable
@@ -200,9 +195,14 @@ private fun ContentScaffold(
     avatar: @Composable () -> Unit,
     title: @Composable () -> Unit,
     subtitle: @Composable () -> Unit,
+    modifier: Modifier = Modifier,
     description: @Composable (() -> Unit)? = null,
     memberCount: @Composable (() -> Unit)? = null,
 ) {
+    Column(
+        modifier = modifier.fillMaxWidth(),
+        horizontalAlignment = Alignment.CenterHorizontally
+    ) {
         avatar()
         Spacer(modifier = Modifier.height(16.dp))
         title()
@@ -217,6 +217,7 @@ private fun ContentScaffold(
             description()
         }
         Spacer(modifier = Modifier.height(24.dp))
+    }
 }
 
 @Composable
@@ -256,7 +257,6 @@ private fun Description(description: String, modifier: Modifier = Modifier) {
 
 @Composable
 private fun MembersCount(memberCount: Long) {
-    Spacer(modifier = Modifier.height(8.dp))
     Row(
         modifier = Modifier
                 .background(color = ElementTheme.colors.bgSubtleSecondary, shape = CircleShape)

features/joinroom/impl/src/test/kotlin/io/element/android/features/joinroom/impl/JoinRoomPresenterTest.kt

@@ -41,7 +41,6 @@ import org.junit.Test
 import java.util.Optional
 
 class JoinRoomPresenterTest {
-
     @get:Rule
     val warmUpRule = WarmUpRule()
 
@@ -136,7 +135,6 @@ class JoinRoomPresenterTest {
                         listOf(value(AcceptDeclineInviteEvents.AcceptInvite(inviteData))),
                         listOf(value(AcceptDeclineInviteEvents.DeclineInvite(inviteData))),
                     )
-
             }
         }
     }

features/leaveroom/impl/src/test/kotlin/io/element/android/features/leaveroom/impl/LeaveRoomPresenterImplTest.kt

@@ -164,7 +164,7 @@ class LeaveRoomPresenterImplTest {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
                     result = FakeMatrixRoom().apply {
-                        this.leaveRoomLambda = { Result.failure(RuntimeException("Blimey!"))}
+                        this.leaveRoomLambda = { Result.failure(RuntimeException("Blimey!")) }
                     },
                 )
             }
@@ -210,7 +210,7 @@ class LeaveRoomPresenterImplTest {
                 givenGetRoomResult(
                     roomId = A_ROOM_ID,
                     result = FakeMatrixRoom().apply {
-                        this.leaveRoomLambda = { Result.failure(RuntimeException("Blimey!"))}
+                        this.leaveRoomLambda = { Result.failure(RuntimeException("Blimey!")) }
                     },
                 )
             }

features/location/impl/src/test/kotlin/io/element/android/features/location/impl/common/actions/AndroidLocationActionsTest.kt

@@ -18,11 +18,9 @@ package io.element.android.features.location.impl.common.actions
 
 import com.google.common.truth.Truth.assertThat
 import io.element.android.features.location.api.Location
-import org.junit.Ignore
 import org.junit.Test
 import java.net.URLEncoder
 
-@Ignore
 internal class AndroidLocationActionsTest {
     // We use an Android-native encoder in the actual app, switch to an equivalent JVM one for the tests
     private fun urlEncoder(input: String) = URLEncoder.encode(input, "US-ASCII")

features/roomdirectory/api/src/main/kotlin/io/element/android/features/roomdirectory/api/RoomDescription.kt

@@ -21,6 +21,7 @@ import androidx.compose.runtime.Immutable
 import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.components.avatar.AvatarSize
 import io.element.android.libraries.matrix.api.core.RoomId
+import kotlinx.parcelize.IgnoredOnParcel
 import kotlinx.parcelize.Parcelize
 
 @Parcelize
@@ -34,15 +35,16 @@ data class RoomDescription(
     val joinRule: JoinRule,
     val numberOfMembers: Long,
 ) : Parcelable {
-
     enum class JoinRule {
         PUBLIC,
         KNOCK,
         UNKNOWN
     }
 
+    @IgnoredOnParcel
     val computedName = name ?: alias ?: roomId.value
 
+    @IgnoredOnParcel
     val computedDescription: String
         get() {
             return when {
@@ -53,7 +55,8 @@ data class RoomDescription(
             }
         }
 
-    fun canBeJoined() = joinRule == JoinRule.PUBLIC || joinRule == JoinRule.KNOCK
+    @IgnoredOnParcel
+    val canJoinOrKnock = joinRule == JoinRule.PUBLIC || joinRule == JoinRule.KNOCK
 
     fun avatarData(size: AvatarSize) = AvatarData(
         id = roomId.value,

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryNode.kt

@@ -36,7 +36,6 @@ class RoomDirectoryNode @AssistedInject constructor(
     @Assisted plugins: List<Plugin>,
     private val presenter: RoomDirectoryPresenter,
 ) : Node(buildContext, plugins = plugins) {
-
     private fun onResultClicked(roomDescription: RoomDescription) {
         plugins<RoomDirectoryEntryPoint.Callback>().forEach {
             it.onResultClicked(roomDescription)

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryView.kt

@@ -306,7 +306,7 @@ private fun RoomDirectoryRoomRow(
                 overflow = TextOverflow.Ellipsis,
             )
         }
-        if (roomDescription.canBeJoined()) {
+        if (roomDescription.canJoinOrKnock) {
             Text(
                 text = stringResource(id = CommonStrings.action_join),
                 color = ElementTheme.colors.textSuccessPrimary,

features/roomdirectory/impl/src/main/kotlin/io/element/android/features/roomdirectory/impl/root/model/RoomDescription.kt

@@ -20,7 +20,6 @@ import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.libraries.matrix.api.roomdirectory.RoomDescription as MatrixRoomDescription
 
 fun MatrixRoomDescription.toFeatureModel(): RoomDescription {
-
     return RoomDescription(
         roomId = roomId,
         name = name,

features/roomdirectory/impl/src/test/kotlin/io/element/android/features/roomdirectory/impl/root/RoomDirectoryViewTest.kt

@@ -17,12 +17,9 @@
 package io.element.android.features.roomdirectory.impl.root
 
 import androidx.activity.ComponentActivity
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.test.junit4.AndroidComposeTestRule
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.compose.ui.test.onAllNodesWithTag
-import androidx.compose.ui.test.onAllNodesWithText
-import androidx.compose.ui.test.onChild
 import androidx.compose.ui.test.onFirst
 import androidx.compose.ui.test.onNodeWithTag
 import androidx.compose.ui.test.onNodeWithText
@@ -33,7 +30,6 @@ import io.element.android.features.roomdirectory.api.RoomDescription
 import io.element.android.libraries.architecture.AsyncAction
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.testtags.TestTags
-import io.element.android.libraries.ui.strings.CommonStrings
 import io.element.android.tests.testutils.EnsureNeverCalled
 import io.element.android.tests.testutils.EnsureNeverCalledWithParam
 import io.element.android.tests.testutils.EventsRecorder
@@ -74,7 +70,7 @@ class RoomDirectoryViewTest {
                 state = state,
                 onResultClicked = callback,
             )
-            rule.onNodeWithText(clickedRoom.name).performClick()
+            rule.onNodeWithText(clickedRoom.computedName).performClick()
         }
     }
 

libraries/designsystem/src/main/kotlin/io/element/android/libraries/designsystem/atomic/pages/HeaderFooterPage.kt

@@ -35,6 +35,7 @@ import io.element.android.libraries.designsystem.theme.components.Text
 
 /**
  * @param modifier Classical modifier.
+ * @param paddingValues padding values to apply to the content.
  * @param background optional background component.
  * @param topBar optional topBar.
  * @param header optional header.

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/MatrixClient.kt

@@ -27,7 +27,6 @@ import io.element.android.libraries.matrix.api.notification.NotificationService
 import io.element.android.libraries.matrix.api.notificationsettings.NotificationSettingsService
 import io.element.android.libraries.matrix.api.oidc.AccountManagementAction
 import io.element.android.libraries.matrix.api.pusher.PushersService
-import io.element.android.libraries.matrix.api.room.CurrentUserMembership
 import io.element.android.libraries.matrix.api.room.MatrixRoom
 import io.element.android.libraries.matrix.api.room.MatrixRoomInfo
 import io.element.android.libraries.matrix.api.room.RoomMembershipObserver
@@ -100,4 +99,3 @@ interface MatrixClient : Closeable {
     suspend fun trackRecentlyVisitedRoom(roomId: RoomId): Result<Unit>
     suspend fun getRecentlyVisitedRooms(): Result<List<RoomId>>
 }
-

libraries/matrix/api/src/main/kotlin/io/element/android/libraries/matrix/api/roomlist/RoomListService.kt

@@ -79,11 +79,8 @@ interface RoomListService {
      * The state of the service as a flow.
      */
     val state: StateFlow<State>
-
 }
 
 fun RoomList.loadedStateFlow(): Flow<RoomList.LoadingState.Loaded> {
     return loadingState.filterIsInstance()
 }
-
-

libraries/matrix/test/src/main/kotlin/io/element/android/libraries/matrix/test/FakeMatrixClient.kt

@@ -276,5 +276,4 @@ class FakeMatrixClient(
     }
 
     override fun getRoomInfoFlow(roomId: RoomId) = getRoomInfoFlowLambda(roomId)
-
 }

libraries/testtags/src/main/kotlin/io/element/android/libraries/testtags/TestTags.kt

@@ -107,7 +107,7 @@ object TestTags {
     val searchTextField = TestTag("search_text_field")
 
     /**
-     * Generic call to action
+     * Generic call to action.
      */
     val callToAction = TestTag("call_to_action")
 }