From 217ccb75ed2a34cb7df7967d5b5f24b162468df7 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Tue, 25 Aug 2026 10:32:34 +0200 Subject: [PATCH] `BatteryOptimizationEvents` -> `BatteryOptimizationEvent` --- .../home/impl/components/BatteryOptimizationBanner.kt | 6 +++--- ...yOptimizationEvents.kt => BatteryOptimizationEvent.kt} | 6 +++--- .../push/api/battery/BatteryOptimizationState.kt | 2 +- .../push/api/battery/BatteryOptimizationStateProvider.kt | 2 +- .../push/impl/battery/BatteryOptimizationPresenter.kt | 8 ++++---- .../push/impl/battery/BatteryOptimizationPresenterTest.kt | 8 ++++---- 6 files changed, 16 insertions(+), 16 deletions(-) rename libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/{BatteryOptimizationEvents.kt => BatteryOptimizationEvent.kt} (77%) diff --git a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt index c6a9480bc9..95826665fe 100644 --- a/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt +++ b/features/home/impl/src/main/kotlin/io/element/android/features/home/impl/components/BatteryOptimizationBanner.kt @@ -16,7 +16,7 @@ import io.element.android.libraries.designsystem.components.Announcement import io.element.android.libraries.designsystem.components.AnnouncementType import io.element.android.libraries.designsystem.preview.ElementPreview import io.element.android.libraries.designsystem.preview.PreviewsDayNight -import io.element.android.libraries.push.api.battery.BatteryOptimizationEvents +import io.element.android.libraries.push.api.battery.BatteryOptimizationEvent import io.element.android.libraries.push.api.battery.BatteryOptimizationState import io.element.android.libraries.push.api.battery.aBatteryOptimizationState @@ -31,8 +31,8 @@ internal fun BatteryOptimizationBanner( description = stringResource(R.string.banner_battery_optimization_content_android), type = AnnouncementType.Actionable( actionText = stringResource(R.string.banner_battery_optimization_submit_android), - onActionClick = { state.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations) }, - onDismissClick = { state.eventSink(BatteryOptimizationEvents.Dismiss) }, + onActionClick = { state.eventSink(BatteryOptimizationEvent.RequestDisableOptimizations) }, + onDismissClick = { state.eventSink(BatteryOptimizationEvent.Dismiss) }, ), ) } diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvent.kt similarity index 77% rename from libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt rename to libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvent.kt index b7a01cc61f..56e6a9caa7 100644 --- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvents.kt +++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationEvent.kt @@ -8,7 +8,7 @@ package io.element.android.libraries.push.api.battery -sealed interface BatteryOptimizationEvents { - data object Dismiss : BatteryOptimizationEvents - data object RequestDisableOptimizations : BatteryOptimizationEvents +sealed interface BatteryOptimizationEvent { + data object Dismiss : BatteryOptimizationEvent + data object RequestDisableOptimizations : BatteryOptimizationEvent } diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt index 6732f7c17d..6a938eaec1 100644 --- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt +++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationState.kt @@ -10,5 +10,5 @@ package io.element.android.libraries.push.api.battery data class BatteryOptimizationState( val shouldDisplayBanner: Boolean, - val eventSink: (BatteryOptimizationEvents) -> Unit, + val eventSink: (BatteryOptimizationEvent) -> Unit, ) diff --git a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt index 684185f40a..66531fb13b 100644 --- a/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt +++ b/libraries/push/api/src/main/kotlin/io/element/android/libraries/push/api/battery/BatteryOptimizationStateProvider.kt @@ -10,7 +10,7 @@ package io.element.android.libraries.push.api.battery fun aBatteryOptimizationState( shouldDisplayBanner: Boolean = false, - eventSink: (BatteryOptimizationEvents) -> Unit = {}, + eventSink: (BatteryOptimizationEvent) -> Unit = {}, ) = BatteryOptimizationState( shouldDisplayBanner = shouldDisplayBanner, eventSink = eventSink, diff --git a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt index e9af494686..d2f421775c 100644 --- a/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt +++ b/libraries/push/impl/src/main/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenter.kt @@ -18,7 +18,7 @@ import androidx.compose.runtime.setValue import androidx.lifecycle.compose.LifecycleResumeEffect import dev.zacsweers.metro.Inject import io.element.android.libraries.architecture.Presenter -import io.element.android.libraries.push.api.battery.BatteryOptimizationEvents +import io.element.android.libraries.push.api.battery.BatteryOptimizationEvent import io.element.android.libraries.push.api.battery.BatteryOptimizationState import io.element.android.libraries.push.impl.push.MutableBatteryOptimizationStore import io.element.android.libraries.push.impl.store.PushDataStore @@ -48,12 +48,12 @@ class BatteryOptimizationPresenter( onPauseOrDispose {} } - fun handleEvent(event: BatteryOptimizationEvents) { + fun handleEvent(event: BatteryOptimizationEvent) { when (event) { - BatteryOptimizationEvents.Dismiss -> coroutineScope.launch { + BatteryOptimizationEvent.Dismiss -> coroutineScope.launch { mutableBatteryOptimizationStore.onOptimizationBannerDismissed() } - BatteryOptimizationEvents.RequestDisableOptimizations -> { + BatteryOptimizationEvent.RequestDisableOptimizations -> { isRequestSent = true if (batteryOptimization.requestDisablingBatteryOptimization().not()) { // If not able to perform the request, ensure that we do not display the banner again diff --git a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt index d3b2c8da2b..65bc3cf155 100644 --- a/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt +++ b/libraries/push/impl/src/test/kotlin/io/element/android/libraries/push/impl/battery/BatteryOptimizationPresenterTest.kt @@ -10,7 +10,7 @@ package io.element.android.libraries.push.impl.battery import androidx.lifecycle.Lifecycle import com.google.common.truth.Truth.assertThat -import io.element.android.libraries.push.api.battery.BatteryOptimizationEvents +import io.element.android.libraries.push.api.battery.BatteryOptimizationEvent import io.element.android.libraries.push.impl.push.FakeMutableBatteryOptimizationStore import io.element.android.libraries.push.impl.push.MutableBatteryOptimizationStore import io.element.android.libraries.push.impl.store.InMemoryPushDataStore @@ -98,7 +98,7 @@ class BatteryOptimizationPresenterTest { assertThat(initialState.shouldDisplayBanner).isFalse() val displayedItem = awaitItem() assertThat(displayedItem.shouldDisplayBanner).isTrue() - displayedItem.eventSink(BatteryOptimizationEvents.Dismiss) + displayedItem.eventSink(BatteryOptimizationEvent.Dismiss) onOptimizationBannerDismissedResult.assertions().isCalledOnce() } } @@ -124,7 +124,7 @@ class BatteryOptimizationPresenterTest { assertThat(initialState.shouldDisplayBanner).isFalse() val displayedItem = awaitItem() assertThat(displayedItem.shouldDisplayBanner).isTrue() - displayedItem.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations) + displayedItem.eventSink(BatteryOptimizationEvent.RequestDisableOptimizations) requestDisablingBatteryOptimizationResult.assertions().isCalledOnce() onOptimizationBannerDismissedResult.assertions().isCalledOnce() } @@ -150,7 +150,7 @@ class BatteryOptimizationPresenterTest { assertThat(initialState.shouldDisplayBanner).isFalse() val displayedItem = awaitItem() assertThat(displayedItem.shouldDisplayBanner).isTrue() - displayedItem.eventSink(BatteryOptimizationEvents.RequestDisableOptimizations) + displayedItem.eventSink(BatteryOptimizationEvent.RequestDisableOptimizations) requestDisablingBatteryOptimizationResult.assertions().isCalledOnce() batteryOptimization.isIgnoringBatteryOptimizationsResult = true lifeCycleOwner.givenState(Lifecycle.State.RESUMED)