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

Rename method.

Browse source
This commit is contained in:
Benoit Marty 2025-10-08 10:22:30 +02:00
parent a786f6a5e9
commit 908b359d51
7 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/AnnouncementPresenter.kt
View file

@ -24,7 +24,7 @@ class AnnouncementPresenter(
@Composable @Composable
override fun present(): AnnouncementState { override fun present(): AnnouncementState {
val showSpaceAnnouncement by remember { val showSpaceAnnouncement by remember {
announcementStore.announcementStateFlow(Announcement.Space).map { announcementStore.announcementStatusFlow(Announcement.Space).map {
it == AnnouncementStore.AnnouncementStatus.Show it == AnnouncementStore.AnnouncementStatus.Show
} }
}.collectAsState(false) }.collectAsState(false)

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

@ -49,8 +49,8 @@ class DefaultAnnouncementService(
override fun announcementsToShowFlow(): Flow<List<Announcement>> { override fun announcementsToShowFlow(): Flow<List<Announcement>> {
return combine( return combine(
announcementStore.announcementStateFlow(Announcement.Space), announcementStore.announcementStatusFlow(Announcement.Space),
announcementStore.announcementStateFlow(Announcement.NewNotificationSound), announcementStore.announcementStatusFlow(Announcement.NewNotificationSound),
) { spaceAnnouncementStatus, newNotificationSoundStatus -> ) { spaceAnnouncementStatus, newNotificationSoundStatus ->
buildList { buildList {
if (spaceAnnouncementStatus == AnnouncementStore.AnnouncementStatus.Show) { if (spaceAnnouncementStatus == AnnouncementStore.AnnouncementStatus.Show) {
@ -64,7 +64,7 @@ class DefaultAnnouncementService(
} }
private suspend fun showSpaceAnnouncement() { private suspend fun showSpaceAnnouncement() {
val currentValue = announcementStore.announcementStateFlow(Announcement.Space).first() val currentValue = announcementStore.announcementStatusFlow(Announcement.Space).first()
if (currentValue == AnnouncementStore.AnnouncementStatus.NeverShown) { if (currentValue == AnnouncementStore.AnnouncementStatus.NeverShown) {
announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStore.AnnouncementStatus.Show) announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStore.AnnouncementStatus.Show)
} }

2
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/AnnouncementStore.kt
View file

@ -16,7 +16,7 @@ interface AnnouncementStore {
status: AnnouncementStatus, status: AnnouncementStatus,
) )
fun announcementStateFlow( fun announcementStatusFlow(
announcement: Announcement, announcement: Announcement,
): Flow<AnnouncementStatus> ): Flow<AnnouncementStatus>

2
features/announcement/impl/src/main/kotlin/io/element/android/features/announcement/impl/store/DefaultAnnouncementStore.kt
View file

@ -34,7 +34,7 @@ class DefaultAnnouncementStore(
} }
} }
override fun announcementStateFlow(announcement: Announcement): Flow<AnnouncementStore.AnnouncementStatus> { override fun announcementStatusFlow(announcement: Announcement): Flow<AnnouncementStore.AnnouncementStatus> {
val key = announcement.toKey() val key = announcement.toKey()
// For NewNotificationSound, a migration will set it to Show on application upgrade (see AppMigration08) // For NewNotificationSound, a migration will set it to Show on application upgrade (see AppMigration08)
val defaultStatus = when (announcement) { val defaultStatus = when (announcement) {

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

@ -25,14 +25,14 @@ class DefaultAnnouncementServiceTest {
val sut = createDefaultAnnouncementService( val sut = createDefaultAnnouncementService(
announcementStore = announcementStore, announcementStore = announcementStore,
) )
assertThat(announcementStore.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.NeverShown) assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.NeverShown)
sut.showAnnouncement(Announcement.Space) sut.showAnnouncement(Announcement.Space)
assertThat(announcementStore.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Show) assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Show)
// Simulate user close the announcement // Simulate user close the announcement
sut.onAnnouncementDismissed(Announcement.Space) sut.onAnnouncementDismissed(Announcement.Space)
// Entering again the space tab should not change the value // Entering again the space tab should not change the value
sut.showAnnouncement(Announcement.Space) sut.showAnnouncement(Announcement.Space)
assertThat(announcementStore.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Shown) assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Shown)
} }
private fun createDefaultAnnouncementService( private fun createDefaultAnnouncementService(

4
features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/spaces/SpaceAnnouncementPresenterTest.kt
View file

@ -24,10 +24,10 @@ class SpaceAnnouncementPresenterTest {
announcementStore = store, announcementStore = store,
) )
presenter.test { presenter.test {
assertThat(store.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.NeverShown) assertThat(store.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.NeverShown)
val state = awaitItem() val state = awaitItem()
state.eventSink(SpaceAnnouncementEvents.Continue) state.eventSink(SpaceAnnouncementEvents.Continue)
assertThat(store.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Shown) assertThat(store.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Shown)
} }
} }
} }

2
features/announcement/impl/src/test/kotlin/io/element/android/features/announcement/impl/store/InMemoryAnnouncementStore.kt
View file

@ -26,7 +26,7 @@ class InMemoryAnnouncementStore(
} }
} }
override fun announcementStateFlow(announcement: Announcement): Flow<AnnouncementStore.AnnouncementStatus> { override fun announcementStatusFlow(announcement: Announcement): Flow<AnnouncementStore.AnnouncementStatus> {
return when (announcement) { return when (announcement) {
Announcement.Space -> spaceAnnouncement.asStateFlow() Announcement.Space -> spaceAnnouncement.asStateFlow()
Announcement.NewNotificationSound -> newNotificationSoundAnnouncement.asStateFlow() Announcement.NewNotificationSound -> newNotificationSoundAnnouncement.asStateFlow()