letro/letro-android
1
0
Fork 0
Code Issues Pull Requests Actions 7 Packages Projects Releases Wiki Activity

Rename Event for clarity

Browse Source
This commit is contained in:
Benoit Marty
2023-09-21 11:29:29 +02:00
parent a43e82e2ff
commit 676b2cc66b
9 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/createroom/impl/src/main/kotlin/io/element/android/features/createroom/impl/configureroom/ConfigureRoomPresenter.kt
View File

@@ -102,7 +102,7 @@ class ConfigureRoomPresenter @Inject constructor(
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
cameraPhotoPicker.launch()
} else {
cameraPermissionState.eventSink(PermissionsEvents.OpenSystemDialog)
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser)
}
AvatarAction.Remove -> dataStore.setAvatarUri(uri = null)
}

2
features/ftue/impl/src/main/kotlin/io/element/android/features/ftue/impl/notifications/NotificationsOptInPresenter.kt
View File

@@ -65,7 +65,7 @@ class NotificationsOptInPresenter @AssistedInject constructor(
if (notificationsPermissionsState.permissionGranted) {
callback.onNotificationsOptInFinished()
} else {
notificationsPermissionsState.eventSink(PermissionsEvents.OpenSystemDialog)
notificationsPermissionsState.eventSink(PermissionsEvents.AskPermissionToUser)
}
}
NotificationsOptInEvents.NotNowClicked -> {

2
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/user/editprofile/EditUserProfilePresenter.kt
View File

@@ -94,7 +94,7 @@ class EditUserProfilePresenter @AssistedInject constructor(
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
cameraPhotoPicker.launch()
} else {
cameraPermissionState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
cameraPermissionState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
}
AvatarAction.Remove -> userAvatarUri = null
}

2
features/roomdetails/impl/src/main/kotlin/io/element/android/features/roomdetails/impl/edit/RoomDetailsEditPresenter.kt
View File

@@ -119,7 +119,7 @@ class RoomDetailsEditPresenter @Inject constructor(
AvatarAction.TakePhoto -> if (cameraPermissionState.permissionGranted) {
cameraPhotoPicker.launch()
} else {
cameraPermissionState.eventSink(PermissionsEvents.OpenSystemDialog)
cameraPermissionState.eventSink(PermissionsEvents.AskPermissionToUser)
}
AvatarAction.Remove -> roomAvatarUri = null
}

2
libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsEvents.kt
View File

@@ -17,6 +17,6 @@
package io.element.android.libraries.permissions.api
sealed interface PermissionsEvents {
data object OpenSystemDialog : PermissionsEvents
data object AskPermissionToUser : PermissionsEvents
data object CloseDialog : PermissionsEvents
}

2
libraries/permissions/api/src/main/kotlin/io/element/android/libraries/permissions/api/PermissionsView.kt
View File

@@ -69,7 +69,7 @@ fun PermissionsView(
content = textToShow,
submitText = "Request permission",
onSubmitClicked = {
state.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
state.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
},
onCancelClicked = {
state.eventSink.invoke(PermissionsEvents.CloseDialog)

2
libraries/permissions/impl/src/main/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenter.kt
View File

@@ -110,7 +110,7 @@ class DefaultPermissionsPresenter @AssistedInject constructor(
PermissionsEvents.CloseDialog -> {
showDialog.value = false
}
PermissionsEvents.OpenSystemDialog -> {
PermissionsEvents.AskPermissionToUser -> {
if (permissionState.status !is PermissionStatus.Granted && isAlreadyDenied) {
showDialog.value = true
} else {

10
libraries/permissions/impl/src/test/kotlin/io/element/android/libraries/permissions/impl/DefaultPermissionsPresenterTest.kt
View File

@@ -91,7 +91,7 @@ class DefaultPermissionsPresenterTest {
}.test {
skipItems(1)
val initialState = awaitItem()
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
val withDialogState = awaitItem()
assertThat(withDialogState.showDialog).isTrue()
withDialogState.eventSink.invoke(PermissionsEvents.CloseDialog)
@@ -120,7 +120,7 @@ class DefaultPermissionsPresenterTest {
}.test {
val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
assertThat(permissionState.launchPermissionRequestCalled).isTrue()
// User does not grant permission
permissionStateProvider.userGiveAnswer(answer = false, firstTime = true)
@@ -154,7 +154,7 @@ class DefaultPermissionsPresenterTest {
}.test {
val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
assertThat(permissionState.launchPermissionRequestCalled).isTrue()
// User does not grant permission
permissionStateProvider.userGiveAnswer(answer = false, firstTime = false)
@@ -192,7 +192,7 @@ class DefaultPermissionsPresenterTest {
}.test {
skipItems(1)
val initialState = awaitItem()
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
val withDialogState = awaitItem()
assertThat(withDialogState.showDialog).isTrue()
assertThat(withDialogState.permissionGranted).isFalse()
@@ -222,7 +222,7 @@ class DefaultPermissionsPresenterTest {
}.test {
val initialState = awaitItem()
assertThat(initialState.showDialog).isFalse()
initialState.eventSink.invoke(PermissionsEvents.OpenSystemDialog)
initialState.eventSink.invoke(PermissionsEvents.AskPermissionToUser)
assertThat(permissionState.launchPermissionRequestCalled).isTrue()
// User grants permission
permissionStateProvider.userGiveAnswer(answer = true, firstTime = true)

2
libraries/permissions/test/src/main/kotlin/io/element/android/libraries/permissions/test/FakePermissionsPresenter.kt
View File

@@ -29,7 +29,7 @@ class FakePermissionsPresenter(
private fun eventSink(events: PermissionsEvents) {
when (events) {
PermissionsEvents.OpenSystemDialog -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true)
PermissionsEvents.AskPermissionToUser -> state.value = state.value.copy(showDialog = true, permissionAlreadyAsked = true)
PermissionsEvents.CloseDialog -> state.value = state.value.copy(showDialog = false)
}
}