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

Introduce Announcement enum.

Browse source
This commit is contained in:
Benoit Marty 2025-10-03 12:03:06 +02:00
parent 717932a111
commit 8eaf355301
7 changed files with 38 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

12
features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/Announcement.kt Normal file
View file

@ -0,0 +1,12 @@
/*
* Copyright 2025 New Vector Ltd.
*
* SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-Element-Commercial
* Please see LICENSE files in the repository root for full details.
*/
package io.element.android.features.announcement.api
enum class Announcement {
Space,
}

2
features/announcement/api/src/main/kotlin/io/element/android/features/announcement/api/AnnouncementService.kt
View file

@ -11,7 +11,7 @@ import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
interface AnnouncementService {
suspend fun onEnteringSpaceTab()
suspend fun showAnnouncement(announcement: Announcement)
@Composable
fun Render(

9
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementService.kt
View file

@ -17,6 +17,7 @@ import androidx.compose.ui.Modifier
import dev.zacsweers.metro.AppScope
import dev.zacsweers.metro.ContributesBinding
import dev.zacsweers.metro.Inject
import io.element.android.features.announcement.api.Announcement
import io.element.android.features.announcement.api.AnnouncementService
import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementState
import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementView
@ -31,7 +32,13 @@ class DefaultAnnouncementService(
private val announcementPresenter: Presenter<AnnouncementState>,
private val spaceAnnouncementPresenter: Presenter<SpaceAnnouncementState>,
) : AnnouncementService {
override suspend fun onEnteringSpaceTab() {
override suspend fun showAnnouncement(announcement: Announcement) {
when (announcement) {
Announcement.Space -> showSpaceAnnouncement()
}
}
private suspend fun showSpaceAnnouncement() {
val currentValue = announcementStore.spaceAnnouncementFlow().first()
if (currentValue == AnnouncementStore.SpaceAnnouncement.NeverShown) {
announcementStore.setSpaceAnnouncementValue(AnnouncementStore.SpaceAnnouncement.Show)

7
features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/DefaultAnnouncementServiceTest.kt
View file

@ -8,6 +8,7 @@
package io.element.android.features.announcement.impl
import com.google.common.truth.Truth.assertThat
import io.element.android.features.announcement.api.Announcement
import io.element.android.features.announcement.impl.spaces.SpaceAnnouncementState
import io.element.android.features.announcement.impl.spaces.aSpaceAnnouncementState
import io.element.android.features.announcement.impl.store.AnnouncementStore
@ -19,18 +20,18 @@ import org.junit.Test
class DefaultAnnouncementServiceTest {
@Test
fun `when entering space tab, space announcement is set to show only if it was never shown`() = runTest {
fun `when showing Space announcement, space announcement is set to show only if it was never shown`() = runTest {
val announcementStore = InMemoryAnnouncementStore()
val sut = createDefaultAnnouncementService(
announcementStore = announcementStore,
)
assertThat(announcementStore.spaceAnnouncementFlow().first()).isEqualTo(AnnouncementStore.SpaceAnnouncement.NeverShown)
sut.onEnteringSpaceTab()
sut.showAnnouncement(Announcement.Space)
assertThat(announcementStore.spaceAnnouncementFlow().first()).isEqualTo(AnnouncementStore.SpaceAnnouncement.Show)
// Simulate user close the announcement
announcementStore.setSpaceAnnouncementValue(AnnouncementStore.SpaceAnnouncement.Shown)
// Entering again the space tab should not change the value
sut.onEnteringSpaceTab()
sut.showAnnouncement(Announcement.Space)
assertThat(announcementStore.spaceAnnouncementFlow().first()).isEqualTo(AnnouncementStore.SpaceAnnouncement.Shown)
}

7
features/announcement/test/src/main/kotlin/io/element/android/features/rageshake/test/logs/FakeAnnouncementService.kt
View file

@ -9,15 +9,16 @@ package io.element.android.features.rageshake.test.logs
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import io.element.android.features.announcement.api.Announcement
import io.element.android.features.announcement.api.AnnouncementService
import io.element.android.tests.testutils.lambda.lambdaError
class FakeAnnouncementService(
val onEnteringSpaceTabResult: () -> Unit = { lambdaError() },
val showAnnouncementResult: (Announcement) -> Unit = { lambdaError() },
val renderResult: (Modifier) -> Unit = { lambdaError() },
) : AnnouncementService {
override suspend fun onEnteringSpaceTab() {
onEnteringSpaceTabResult()
override suspend fun showAnnouncement(announcement: Announcement) {
showAnnouncementResult(announcement)
}
@Composable