Create LoggedIn presenter

appnav/build.gradle.kts

@@ -41,12 +41,16 @@ dependencies {
     allFeaturesApi(rootDir)
 
     implementation(projects.libraries.core)
+    implementation(projects.libraries.androidutils)
     implementation(projects.libraries.architecture)
     implementation(projects.libraries.matrix.api)
     implementation(projects.libraries.push.api)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.uiStrings)
+    implementation(projects.libraries.permissions.api)
+    implementation(projects.libraries.permissions.noop)
+
     implementation(projects.features.verifysession.api)
     implementation(projects.features.roomdetails.api)
     implementation(projects.tests.uitests)

appnav/src/main/kotlin/io/element/android/appnav/LoggedInFlowNode.kt

@@ -35,6 +35,8 @@ import com.bumble.appyx.navmodel.backstack.operation.push
 import dagger.assisted.Assisted
 import dagger.assisted.AssistedInject
 import io.element.android.anvilannotations.ContributesNode
+import io.element.android.appnav.loggedin.LoggedInPresenter
+import io.element.android.appnav.loggedin.LoggedInView
 import io.element.android.features.createroom.api.CreateRoomEntryPoint
 import io.element.android.features.preferences.api.PreferencesEntryPoint
 import io.element.android.features.roomlist.api.RoomListEntryPoint
@@ -52,7 +54,6 @@ import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.MAIN_SPACE
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.ui.di.MatrixUIBindings
-import io.element.android.libraries.push.api.PushService
 import io.element.android.services.appnavstate.api.AppNavigationStateService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -71,7 +72,7 @@ class LoggedInFlowNode @AssistedInject constructor(
     private val verifySessionEntryPoint: VerifySessionEntryPoint,
     private val coroutineScope: CoroutineScope,
     snackbarDispatcher: SnackbarDispatcher,
-    private val pushService: PushService,
+    private val loggedInPresenter: LoggedInPresenter,
 ) : BackstackNode<LoggedInFlowNode.NavTarget>(
     backstack = BackStack(
         initialElement = NavTarget.RoomList,
@@ -114,10 +115,6 @@ class LoggedInFlowNode @AssistedInject constructor(
                 // TODO We do not support Space yet, so directly navigate to main space
                 appNavigationStateService.onNavigateToSpace(MAIN_SPACE)
                 loggedInFlowProcessor.observeEvents(coroutineScope)
-                runBlocking {
-                    // TODO
-                    pushService.registerPusher(inputs.matrixClient.sessionId)
-                }
             },
             onDestroy = {
                 val imageLoaderFactory = bindings<MatrixUIBindings>().notLoggedInImageLoaderFactory()
@@ -208,11 +205,16 @@ class LoggedInFlowNode @AssistedInject constructor(
 
     @Composable
     override fun View(modifier: Modifier) {
-        Children(
+        val loggedInState = loggedInPresenter.present()
-            navModel = backstack,
+        LoggedInView(
-            modifier = modifier,
+            state = loggedInState
-            // Animate navigation to settings and to a room
+        ) {
-            transitionHandler = rememberDefaultTransitionHandler(),
+            Children(
-        )
+                navModel = backstack,
+                modifier = modifier,
+                // Animate navigation to settings and to a room
+                transitionHandler = rememberDefaultTransitionHandler(),
+            )
+        }
     }
 }

appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInEvents.kt

@@ -0,0 +1,22 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.appnav.loggedin
+
+// TODO Add your events or remove the file completely if no events
+sealed interface LoggedInEvents {
+    object MyEvent : LoggedInEvents
+}

appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInPresenter.kt

@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.appnav.loggedin
+
+import android.Manifest
+import android.os.Build
+import androidx.compose.runtime.Composable
+import io.element.android.libraries.architecture.Presenter
+import io.element.android.libraries.matrix.api.MatrixClient
+import io.element.android.libraries.permissions.api.PermissionsPresenter
+import io.element.android.libraries.permissions.noop.NoopPermissionsPresenter
+import io.element.android.libraries.push.api.PushService
+import javax.inject.Inject
+
+class LoggedInPresenter @Inject constructor(
+    private val permissionsPresenterFactory: PermissionsPresenter.Factory,
+   // private val matrixClient: MatrixClient,
+   // private val pushService: PushService,
+) : Presenter<LoggedInState> {
+
+    private val postNotificationPermissionsPresenter by lazy {
+        // Ask for POST_NOTIFICATION PERMISSION on Android 13+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+            permissionsPresenterFactory.create(Manifest.permission.POST_NOTIFICATIONS)
+        } else {
+            NoopPermissionsPresenter()
+        }
+    }
+
+    @Composable
+    override fun present(): LoggedInState {
+
+        // TODO EAx pushService.registerPusher(matrixClient.sessionId)
+
+        val permissionsState = postNotificationPermissionsPresenter.present()
+
+        fun handleEvents(event: LoggedInEvents) {
+            when (event) {
+                LoggedInEvents.MyEvent -> Unit
+            }
+        }
+
+        return LoggedInState(
+            permissionsState = permissionsState,
+            eventSink = ::handleEvents
+        )
+    }
+}

appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInState.kt

@@ -0,0 +1,24 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.appnav.loggedin
+
+import io.element.android.libraries.permissions.api.PermissionsState
+
+data class LoggedInState(
+    val permissionsState: PermissionsState,
+    val eventSink: (LoggedInEvents) -> Unit
+)

appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInStateProvider.kt

@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.appnav.loggedin
+
+import androidx.compose.ui.tooling.preview.PreviewParameterProvider
+import io.element.android.libraries.permissions.api.createDummyPostNotificationPermissionsState
+
+open class LoggedInStateProvider : PreviewParameterProvider<LoggedInState> {
+    override val values: Sequence<LoggedInState>
+        get() = sequenceOf(
+            aLoggedInState(),
+            // Add other state here
+        )
+}
+
+fun aLoggedInState() = LoggedInState(
+    permissionsState = createDummyPostNotificationPermissionsState(),
+    eventSink = {}
+)

appnav/src/main/kotlin/io/element/android/appnav/loggedin/LoggedInView.kt

@@ -0,0 +1,76 @@
+/*
+ * Copyright (c) 2023 New Vector Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package io.element.android.appnav.loggedin
+
+import android.app.Activity
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.BoxScope
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.tooling.preview.PreviewParameter
+import io.element.android.libraries.androidutils.system.openAppSettingsPage
+import io.element.android.libraries.designsystem.preview.ElementPreviewDark
+import io.element.android.libraries.designsystem.preview.ElementPreviewLight
+import io.element.android.libraries.designsystem.theme.components.Text
+import io.element.android.libraries.permissions.api.PermissionsView
+
+@Composable
+fun LoggedInView(
+    state: LoggedInState,
+    modifier: Modifier = Modifier,
+    children: @Composable BoxScope.() -> Unit,
+) {
+    val activity = LocalContext.current as? Activity
+
+    Box(
+        modifier = modifier
+            .fillMaxSize(),
+        contentAlignment = Alignment.TopCenter,
+    ) {
+        children()
+
+        PermissionsView(
+            state = state.permissionsState,
+            openSystemSettings = {
+                activity?.let { openAppSettingsPage(it, "") }
+            }
+        )
+    }
+}
+
+@Preview
+@Composable
+fun LoggedInViewLightPreview(@PreviewParameter(LoggedInStateProvider::class) state: LoggedInState) =
+    ElementPreviewLight { ContentToPreview(state) }
+
+@Preview
+@Composable
+fun LoggedInViewDarkPreview(@PreviewParameter(LoggedInStateProvider::class) state: LoggedInState) =
+    ElementPreviewDark { ContentToPreview(state) }
+
+@Composable
+private fun ContentToPreview(state: LoggedInState) {
+    LoggedInView(
+        state = state
+    ) {
+        Text("Children")
+    }
+}

features/roomlist/impl/build.gradle.kts

@@ -47,8 +47,6 @@ dependencies {
     implementation(projects.libraries.matrixui)
     implementation(projects.libraries.designsystem)
     implementation(projects.libraries.elementresources)
-    implementation(projects.libraries.permissions.api)
-    implementation(projects.libraries.permissions.noop)
     implementation(projects.libraries.testtags)
     implementation(projects.libraries.uiStrings)
     implementation(projects.libraries.dateformatter.api)

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt

@@ -16,8 +16,6 @@
 
 package io.element.android.features.roomlist.impl
 
-import android.Manifest
-import android.os.Build
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.MutableState
@@ -45,8 +43,6 @@ import io.element.android.libraries.matrix.api.room.RoomSummary
 import io.element.android.libraries.matrix.api.verification.SessionVerificationService
 import io.element.android.libraries.matrix.api.verification.SessionVerifiedStatus
 import io.element.android.libraries.matrix.ui.model.MatrixUser
-import io.element.android.libraries.permissions.api.PermissionsPresenter
-import io.element.android.libraries.permissions.noop.NoopPermissionsPresenter
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import kotlinx.collections.immutable.toImmutableList
@@ -63,20 +59,10 @@ class RoomListPresenter @Inject constructor(
     private val roomLastMessageFormatter: RoomLastMessageFormatter,
     private val sessionVerificationService: SessionVerificationService,
     private val snackbarDispatcher: SnackbarDispatcher,
-    private val permissionsPresenterFactory: PermissionsPresenter.Factory,
 ) : Presenter<RoomListState> {
 
     private val roomMembershipObserver: RoomMembershipObserver = client.roomMembershipObserver()
 
-    private val postNotificationPermissionsPresenter by lazy {
-        // Ask for POST_NOTIFICATION PERMISSION on Android 13+
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-            permissionsPresenterFactory.create(Manifest.permission.POST_NOTIFICATIONS)
-        } else {
-            NoopPermissionsPresenter()
-        }
-    }
-
     @Composable
     override fun present(): RoomListState {
         val matrixUser: MutableState<MatrixUser?> = remember {
@@ -119,15 +105,12 @@ class RoomListPresenter @Inject constructor(
 
         val snackbarMessage = handleSnackbarMessage(snackbarDispatcher)
 
-        val permissionsState = postNotificationPermissionsPresenter.present()
-
         return RoomListState(
             matrixUser = matrixUser.value,
             roomList = filteredRoomSummaries.value,
             filter = filter,
             displayVerificationPrompt = displayVerificationPrompt,
             snackbarMessage = snackbarMessage,
-            permissionsState = permissionsState,
             eventSink = ::handleEvents
         )
     }

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt

@@ -20,7 +20,6 @@ import androidx.compose.runtime.Immutable
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.libraries.designsystem.utils.SnackbarMessage
 import io.element.android.libraries.matrix.ui.model.MatrixUser
-import io.element.android.libraries.permissions.api.PermissionsState
 import kotlinx.collections.immutable.ImmutableList
 
 @Immutable
@@ -30,6 +29,5 @@ data class RoomListState(
     val filter: String,
     val displayVerificationPrompt: Boolean,
     val snackbarMessage: SnackbarMessage?,
-    val permissionsState: PermissionsState,
     val eventSink: (RoomListEvents) -> Unit
 )

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListStateProvider.kt

@@ -23,7 +23,6 @@ import io.element.android.libraries.designsystem.components.avatar.AvatarData
 import io.element.android.libraries.designsystem.utils.SnackbarMessage
 import io.element.android.libraries.matrix.api.core.UserId
 import io.element.android.libraries.matrix.ui.model.MatrixUser
-import io.element.android.libraries.permissions.api.createDummyPostNotificationPermissionsState
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf
 import io.element.android.libraries.ui.strings.R as StringR
@@ -43,7 +42,6 @@ internal fun aRoomListState() = RoomListState(
     filter = "filter",
     snackbarMessage = null,
     displayVerificationPrompt = false,
-    permissionsState = createDummyPostNotificationPermissionsState(),
     eventSink = {}
 )
 

features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListView.kt

@@ -16,7 +16,6 @@
 
 package io.element.android.features.roomlist.impl
 
-import android.app.Activity
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
@@ -49,7 +48,6 @@ import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.input.nestedscroll.NestedScrollConnection
 import androidx.compose.ui.input.nestedscroll.nestedScroll
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
@@ -59,7 +57,6 @@ import androidx.compose.ui.unit.dp
 import io.element.android.features.roomlist.impl.components.RoomListTopBar
 import io.element.android.features.roomlist.impl.components.RoomSummaryRow
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
-import io.element.android.libraries.androidutils.system.openAppSettingsPage
 import io.element.android.libraries.designsystem.ElementTextStyles
 import io.element.android.libraries.designsystem.preview.ElementPreviewDark
 import io.element.android.libraries.designsystem.preview.ElementPreviewLight
@@ -72,7 +69,6 @@ import io.element.android.libraries.designsystem.theme.components.Text
 import io.element.android.libraries.designsystem.utils.LogCompositions
 import io.element.android.libraries.matrix.api.core.RoomId
 import kotlinx.coroutines.launch
-import io.element.android.libraries.permissions.api.PermissionsView
 import io.element.android.libraries.designsystem.R as DrawableR
 import io.element.android.libraries.ui.strings.R as StringR
 
@@ -85,24 +81,14 @@ fun RoomListView(
     onVerifyClicked: () -> Unit = {},
     onCreateRoomClicked: () -> Unit = {},
 ) {
-    val activity = LocalContext.current as? Activity
+    RoomListContent(
-
+        state = state,
-    Box(modifier = modifier) {
+        modifier = modifier,
-        RoomListContent(
+        onRoomClicked = onRoomClicked,
-            state = state,
+        onOpenSettings = onOpenSettings,
-            modifier = Modifier,
+        onVerifyClicked = onVerifyClicked,
-            onRoomClicked = onRoomClicked,
+        onCreateRoomClicked = onCreateRoomClicked,
-            onOpenSettings = onOpenSettings,
+    )
-            onVerifyClicked = onVerifyClicked,
-            onCreateRoomClicked = onCreateRoomClicked,
-        )
-        PermissionsView(
-            state = state.permissionsState,
-            openSystemSettings = {
-                activity?.let { openAppSettingsPage(it, "") }
-            }
-        )
-    }
 }
 
 @OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)

features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTests.kt

@@ -37,7 +37,6 @@ import io.element.android.libraries.matrix.test.FakeMatrixClient
 import io.element.android.libraries.matrix.test.room.FakeRoomSummaryDataSource
 import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
-import io.element.android.libraries.permissions.noop.NoopPermissionsPresenterFactory
 import kotlinx.coroutines.test.runTest
 import org.junit.Test
 
@@ -51,7 +50,6 @@ class RoomListPresenterTests {
             FakeRoomLastMessageFormatter(),
             FakeSessionVerificationService(),
             SnackbarDispatcher(),
-            NoopPermissionsPresenterFactory(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -79,7 +77,6 @@ class RoomListPresenterTests {
             FakeRoomLastMessageFormatter(),
             FakeSessionVerificationService(),
             SnackbarDispatcher(),
-            NoopPermissionsPresenterFactory(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -101,7 +98,6 @@ class RoomListPresenterTests {
             FakeRoomLastMessageFormatter(),
             FakeSessionVerificationService(),
             SnackbarDispatcher(),
-            NoopPermissionsPresenterFactory(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -127,7 +123,6 @@ class RoomListPresenterTests {
             FakeRoomLastMessageFormatter(),
             FakeSessionVerificationService(),
             SnackbarDispatcher(),
-            NoopPermissionsPresenterFactory(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -158,7 +153,6 @@ class RoomListPresenterTests {
             FakeRoomLastMessageFormatter(),
             FakeSessionVerificationService(),
             SnackbarDispatcher(),
-            NoopPermissionsPresenterFactory(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -194,7 +188,6 @@ class RoomListPresenterTests {
             FakeRoomLastMessageFormatter(),
             FakeSessionVerificationService(),
             SnackbarDispatcher(),
-            NoopPermissionsPresenterFactory(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()
@@ -244,7 +237,6 @@ class RoomListPresenterTests {
                 givenVerifiedStatus(SessionVerifiedStatus.NotVerified)
             },
             SnackbarDispatcher(),
-            NoopPermissionsPresenterFactory(),
         )
         moleculeFlow(RecompositionClock.Immediate) {
             presenter.present()

samples/minimal/src/main/kotlin/io/element/android/samples/minimal/RoomListScreen.kt

@@ -29,7 +29,6 @@ import io.element.android.libraries.dateformatter.impl.LocalDateTimeProvider
 import io.element.android.libraries.designsystem.utils.SnackbarDispatcher
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
-import io.element.android.libraries.permissions.noop.NoopPermissionsPresenterFactory
 import kotlinx.coroutines.launch
 import kotlinx.datetime.Clock
 import kotlinx.datetime.TimeZone
@@ -45,14 +44,12 @@ class RoomListScreen(
     private val dateTimeProvider = LocalDateTimeProvider(clock, timeZone)
     private val dateFormatters = DateFormatters(locale, clock, timeZone)
     private val sessionVerificationService = matrixClient.sessionVerificationService()
-    private val permissionsPresenterFactory = NoopPermissionsPresenterFactory()
     private val presenter = RoomListPresenter(
         matrixClient,
         DefaultLastMessageTimestampFormatter(dateTimeProvider, dateFormatters),
         DefaultRoomLastMessageFormatter(context, matrixClient),
         sessionVerificationService,
         SnackbarDispatcher(),
-        permissionsPresenterFactory,
     )
 
     @Composable