Skip to content

Commit 184bfeb

Browse files
committed
Rename method.
1 parent 752e846 commit 184bfeb

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ class AnnouncementPresenter(
2424
@Composable
2525
override fun present(): AnnouncementState {
2626
val showSpaceAnnouncement by remember {
27-
announcementStore.announcementStateFlow(Announcement.Space).map {
27+
announcementStore.announcementStatusFlow(Announcement.Space).map {
2828
it == AnnouncementStore.AnnouncementStatus.Show
2929
}
3030
}.collectAsState(false)

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ class DefaultAnnouncementService(
4949

5050
override fun announcementsToShowFlow(): Flow<List<Announcement>> {
5151
return combine(
52-
announcementStore.announcementStateFlow(Announcement.Space),
53-
announcementStore.announcementStateFlow(Announcement.NewNotificationSound),
52+
announcementStore.announcementStatusFlow(Announcement.Space),
53+
announcementStore.announcementStatusFlow(Announcement.NewNotificationSound),
5454
) { spaceAnnouncementStatus, newNotificationSoundStatus ->
5555
buildList {
5656
if (spaceAnnouncementStatus == AnnouncementStore.AnnouncementStatus.Show) {
@@ -64,7 +64,7 @@ class DefaultAnnouncementService(
6464
}
6565

6666
private suspend fun showSpaceAnnouncement() {
67-
val currentValue = announcementStore.announcementStateFlow(Announcement.Space).first()
67+
val currentValue = announcementStore.announcementStatusFlow(Announcement.Space).first()
6868
if (currentValue == AnnouncementStore.AnnouncementStatus.NeverShown) {
6969
announcementStore.setAnnouncementStatus(Announcement.Space, AnnouncementStore.AnnouncementStatus.Show)
7070
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ interface AnnouncementStore {
1616
status: AnnouncementStatus,
1717
)
1818

19-
fun announcementStateFlow(
19+
fun announcementStatusFlow(
2020
announcement: Announcement,
2121
): Flow<AnnouncementStatus>
2222

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class DefaultAnnouncementStore(
3434
}
3535
}
3636

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class DefaultAnnouncementServiceTest {
2525
val sut = createDefaultAnnouncementService(
2626
announcementStore = announcementStore,
2727
)
28-
assertThat(announcementStore.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.NeverShown)
28+
assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.NeverShown)
2929
sut.showAnnouncement(Announcement.Space)
30-
assertThat(announcementStore.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Show)
30+
assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Show)
3131
// Simulate user close the announcement
3232
sut.onAnnouncementDismissed(Announcement.Space)
3333
// Entering again the space tab should not change the value
3434
sut.showAnnouncement(Announcement.Space)
35-
assertThat(announcementStore.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Shown)
35+
assertThat(announcementStore.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Shown)
3636
}
3737

3838
private fun createDefaultAnnouncementService(

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ class SpaceAnnouncementPresenterTest {
2424
announcementStore = store,
2525
)
2626
presenter.test {
27-
assertThat(store.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.NeverShown)
27+
assertThat(store.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.NeverShown)
2828
val state = awaitItem()
2929
state.eventSink(SpaceAnnouncementEvents.Continue)
30-
assertThat(store.announcementStateFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Shown)
30+
assertThat(store.announcementStatusFlow(Announcement.Space).first()).isEqualTo(AnnouncementStore.AnnouncementStatus.Shown)
3131
}
3232
}
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class InMemoryAnnouncementStore(
2626
}
2727
}
2828

29-
override fun announcementStateFlow(announcement: Announcement): Flow<AnnouncementStore.AnnouncementStatus> {
29+
override fun announcementStatusFlow(announcement: Announcement): Flow<AnnouncementStore.AnnouncementStatus> {
3030
return when (announcement) {
3131
Announcement.Space -> spaceAnnouncement.asStateFlow()
3232
Announcement.NewNotificationSound -> newNotificationSoundAnnouncement.asStateFlow()

0 commit comments

Comments
 (0)