Add full screen intent permissions banner (#3024)

* Add full screen intent permissions banner, creating `:libraries:fullscreenintent` modules. * Add it to notification settings too: - Create `libraries:fullscreenintent` modules for the permission presenter and associated data. - Add the presenter and states to `NotificationSettingsPresenter` and `NotificationSettingsView`. * Use the right API to check for full screen intent permissions. - Use the right package name for `:libraries:permission` contents. * Fix broken tests (flaky?) * Ignore coverage verification for fake and small presenters --------- Co-authored-by: ElementBot <benoitm+elementbot@element.io>
2024-06-18 09:41:10 +02:00 · 2024-06-18 09:41:10 +02:00 · feef0f6976
commit feef0f6976
parent 7322c75a67
163 changed files with 867 additions and 48 deletions
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListContentStateProvider.kt
@ -18,6 +18,7 @@ package io.element.android.features.roomlist.impl

 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import kotlinx.collections.immutable.ImmutableList
 import kotlinx.collections.immutable.persistentListOf

@ -35,8 +36,10 @@ open class RoomListContentStateProvider : PreviewParameterProvider<RoomListConte
 internal fun aRoomsContentState(
    securityBannerState: SecurityBannerState = SecurityBannerState.None,
    summaries: ImmutableList<RoomListRoomSummary> = aRoomListRoomSummaryList(),
+    fullScreenIntentPermissionsState: FullScreenIntentPermissionsState = aFullScreenIntentPermissionsState(),
 ) = RoomListContentState.Rooms(
    securityBannerState = securityBannerState,
+    fullScreenIntentPermissionsState = fullScreenIntentPermissionsState,
    summaries = summaries,
 )

@ -45,3 +48,15 @@ internal fun aMigrationContentState() = RoomListContentState.Migration
 internal fun aSkeletonContentState() = RoomListContentState.Skeleton(16)

 internal fun anEmptyContentState() = RoomListContentState.Empty
+
+internal fun aFullScreenIntentPermissionsState(
+    permissionGranted: Boolean = true,
+    shouldDisplay: Boolean = false,
+    openFullScreenIntentSettings: () -> Unit = {},
+    dismissFullScreenIntentBanner: () -> Unit = {},
+) = FullScreenIntentPermissionsState(
+    permissionGranted = permissionGranted,
+    shouldDisplayBanner = shouldDisplay,
+    openFullScreenIntentSettings = openFullScreenIntentSettings,
+    dismissFullScreenIntentBanner = dismissFullScreenIntentBanner,
+)
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListPresenter.kt
@ -40,7 +40,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomEvent
 import io.element.android.features.leaveroom.api.LeaveRoomPresenter
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.api.NetworkStatus
-import io.element.android.features.preferences.api.store.SessionPreferencesStore
 import io.element.android.features.roomlist.impl.datasource.RoomListDataSource
 import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
 import io.element.android.features.roomlist.impl.migration.MigrationScreenState
@ -53,6 +52,7 @@ import io.element.android.libraries.designsystem.utils.snackbar.SnackbarDispatch
 import io.element.android.libraries.designsystem.utils.snackbar.collectSnackbarMessageAsState
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.api.FeatureFlags
+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsPresenter
 import io.element.android.libraries.indicator.api.IndicatorService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.core.RoomId
@ -62,6 +62,7 @@ import io.element.android.libraries.matrix.api.roomlist.RoomList
 import io.element.android.libraries.matrix.api.sync.SyncService
 import io.element.android.libraries.matrix.api.sync.SyncState
 import io.element.android.libraries.matrix.api.timeline.ReceiptType
+import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analyticsproviders.api.trackers.captureInteraction
 import kotlinx.collections.immutable.toPersistentList
@ -93,6 +94,7 @@ class RoomListPresenter @Inject constructor(
    private val sessionPreferencesStore: SessionPreferencesStore,
    private val analyticsService: AnalyticsService,
    private val acceptDeclineInvitePresenter: Presenter<AcceptDeclineInviteState>,
+    private val fullScreenIntentPermissionsPresenter: FullScreenIntentPermissionsPresenter,
 ) : Presenter<RoomListState> {
    private val encryptionService: EncryptionService = client.encryptionService()
    private val syncService: SyncService = client.syncService()
@ -214,6 +216,7 @@ class RoomListPresenter @Inject constructor(
                val securityBannerState by securityBannerState(securityBannerDismissed)
                RoomListContentState.Rooms(
                    securityBannerState = securityBannerState,
+                    fullScreenIntentPermissionsState = fullScreenIntentPermissionsPresenter.present(),
                    summaries = roomSummaries.dataOrNull().orEmpty().toPersistentList()
                )
            }
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/RoomListState.kt
@ -23,6 +23,7 @@ import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
 import io.element.android.features.roomlist.impl.model.RoomListRoomSummary
 import io.element.android.features.roomlist.impl.search.RoomListSearchState
 import io.element.android.libraries.designsystem.utils.snackbar.SnackbarMessage
+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
 import io.element.android.libraries.matrix.api.core.RoomId
 import io.element.android.libraries.matrix.api.user.MatrixUser
 import kotlinx.collections.immutable.ImmutableList
@ -75,6 +76,7 @@ sealed interface RoomListContentState {
    data object Empty : RoomListContentState
    data class Rooms(
        val securityBannerState: SecurityBannerState,
+        val fullScreenIntentPermissionsState: FullScreenIntentPermissionsState,
        val summaries: ImmutableList<RoomListRoomSummary>,
    ) : RoomListContentState
 }
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/FullScreenIntentPermissionBanner.kt
@ -0,0 +1,44 @@
+/*
+ * Copyright (c) 2024 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.features.roomlist.impl.components
+
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.res.stringResource
+import io.element.android.features.roomlist.impl.R
+import io.element.android.features.roomlist.impl.aFullScreenIntentPermissionsState
+import io.element.android.libraries.designsystem.atomic.molecules.DialogLikeBannerMolecule
+import io.element.android.libraries.designsystem.preview.ElementPreview
+import io.element.android.libraries.designsystem.preview.PreviewsDayNight
+import io.element.android.libraries.fullscreenintent.api.FullScreenIntentPermissionsState
+
+@Composable
+fun FullScreenIntentPermissionBanner(state: FullScreenIntentPermissionsState) {
+    DialogLikeBannerMolecule(
+        title = stringResource(R.string.full_screen_intent_banner_title),
+        content = stringResource(R.string.full_screen_intent_banner_message),
+        onDismissClick = state.dismissFullScreenIntentBanner,
+        onSubmitClick = state.openFullScreenIntentSettings,
+    )
+}
+
+@PreviewsDayNight
+@Composable
+internal fun FullScreenIntentPermissionBannerPreview() {
+    ElementPreview {
+        FullScreenIntentPermissionBanner(aFullScreenIntentPermissionsState())
+    }
+}
--- a/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
+++ b/features/roomlist/impl/src/main/kotlin/io/element/android/features/roomlist/impl/components/RoomListContentView.kt
@ -193,16 +193,22 @@ private fun RoomsViewList(
        // FAB height is 56dp, bottom padding is 16dp, we add 8dp as extra margin -> 56+16+8 = 80
        contentPadding = PaddingValues(bottom = 80.dp)
    ) {
-        when (state.securityBannerState) {
-            SecurityBannerState.RecoveryKeyConfirmation -> {
-                item {
-                    ConfirmRecoveryKeyBanner(
-                        onContinueClick = onConfirmRecoveryKeyClick,
-                        onDismissClick = { eventSink(RoomListEvents.DismissRecoveryKeyPrompt) }
-                    )
+        if (state.securityBannerState != SecurityBannerState.None) {
+            when (state.securityBannerState) {
+                SecurityBannerState.RecoveryKeyConfirmation -> {
+                    item {
+                        ConfirmRecoveryKeyBanner(
+                            onContinueClick = onConfirmRecoveryKeyClick,
+                            onDismissClick = { eventSink(RoomListEvents.DismissRecoveryKeyPrompt) }
+                        )
+                    }
                }
+                else -> Unit
+            }
+        } else if (state.fullScreenIntentPermissionsState.shouldDisplayBanner) {
+            item {
+                FullScreenIntentPermissionBanner(state = state.fullScreenIntentPermissionsState)
            }
-            else -> Unit
        }

        // Note: do not use a key for the LazyColumn, or the scroll will not behave as expected if a room
--- a/features/roomlist/impl/src/main/res/values/localazy.xml
+++ b/features/roomlist/impl/src/main/res/values/localazy.xml
@ -2,6 +2,8 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
  <string name="confirm_recovery_key_banner_message">"Your chat backup is currently out of sync. You need to enter your recovery key to maintain access to your chat backup."</string>
  <string name="confirm_recovery_key_banner_title">"Enter your recovery key"</string>
+  <string name="full_screen_intent_banner_message">"To ensure you never miss an important call, please change your settings to allow full-screen notifications when your phone is locked."</string>
+  <string name="full_screen_intent_banner_title">"Enhance your call experience"</string>
  <string name="screen_invites_decline_chat_message">"Are you sure you want to decline the invitation to join %1$s?"</string>
  <string name="screen_invites_decline_chat_title">"Decline invite"</string>
  <string name="screen_invites_decline_direct_chat_message">"Are you sure you want to decline this private chat with %1$s?"</string>
--- a/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
+++ b/features/roomlist/impl/src/test/kotlin/io/element/android/features/roomlist/impl/RoomListPresenterTest.kt
@ -29,7 +29,6 @@ import io.element.android.features.leaveroom.api.LeaveRoomPresenter
 import io.element.android.features.leaveroom.fake.FakeLeaveRoomPresenter
 import io.element.android.features.networkmonitor.api.NetworkMonitor
 import io.element.android.features.networkmonitor.test.FakeNetworkMonitor
-import io.element.android.features.preferences.api.store.SessionPreferencesStore
 import io.element.android.features.roomlist.impl.datasource.RoomListDataSource
 import io.element.android.features.roomlist.impl.datasource.RoomListRoomSummaryFactory
 import io.element.android.features.roomlist.impl.filters.RoomListFiltersState
@ -48,6 +47,7 @@ import io.element.android.libraries.eventformatter.api.RoomLastMessageFormatter
 import io.element.android.libraries.eventformatter.test.FakeRoomLastMessageFormatter
 import io.element.android.libraries.featureflag.api.FeatureFlagService
 import io.element.android.libraries.featureflag.test.FakeFeatureFlagService
+import io.element.android.libraries.fullscreenintent.test.FakeFullScreenIntentPermissionsPresenter
 import io.element.android.libraries.indicator.impl.DefaultIndicatorService
 import io.element.android.libraries.matrix.api.MatrixClient
 import io.element.android.libraries.matrix.api.encryption.BackupState
@ -72,6 +72,7 @@ import io.element.android.libraries.matrix.test.room.aRoomSummaryFilled
 import io.element.android.libraries.matrix.test.roomlist.FakeRoomListService
 import io.element.android.libraries.matrix.test.sync.FakeSyncService
 import io.element.android.libraries.matrix.test.verification.FakeSessionVerificationService
+import io.element.android.libraries.preferences.api.store.SessionPreferencesStore
 import io.element.android.libraries.preferences.test.InMemorySessionPreferencesStore
 import io.element.android.services.analytics.api.AnalyticsService
 import io.element.android.services.analytics.test.FakeAnalyticsService
@ -668,5 +669,6 @@ class RoomListPresenterTest {
        filtersPresenter = filtersPresenter,
        analyticsService = analyticsService,
        acceptDeclineInvitePresenter = acceptDeclineInvitePresenter,
+        fullScreenIntentPermissionsPresenter = FakeFullScreenIntentPermissionsPresenter(),
    )
 }