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

Rename fun in Callback for clarity.

Browse source
This commit is contained in:
Benoit Marty 2025-10-29 10:30:30 +01:00 • committed by Benoit Marty
parent 353c00e032
commit 43972dba68
104 changed files with 658 additions and 664 deletions
Download patch file Download diff file Expand all files Collapse all files

56
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/PreferencesFlowNode.kt
View file

@ -120,59 +120,59 @@ class PreferencesFlowNode(
return when (navTarget) {
NavTarget.Root -> {
val callback = object : PreferencesRootNode.Callback {
override fun onAddAccount() {
plugins<PreferencesEntryPoint.Callback>().forEach { it.onAddAccount() }
override fun navigateToAddAccount() {
plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateToAddAccount() }
}
override fun onOpenBugReport() {
plugins<PreferencesEntryPoint.Callback>().forEach { it.onOpenBugReport() }
override fun navigateToBugReport() {
plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateToBugReport() }
}
override fun onSecureBackupClick() {
plugins<PreferencesEntryPoint.Callback>().forEach { it.onSecureBackupClick() }
override fun navigateToSecureBackup() {
plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateToSecureBackup() }
}
override fun onOpenAnalytics() {
override fun navigateToAnalyticsSettings() {
backstack.push(NavTarget.AnalyticsSettings)
}
override fun onOpenAbout() {
override fun navigateToAbout() {
backstack.push(NavTarget.About)
}
override fun onOpenDeveloperSettings() {
override fun navigateToDeveloperSettings() {
backstack.push(NavTarget.DeveloperSettings)
}
override fun onOpenNotificationSettings() {
override fun navigateToNotificationSettings() {
backstack.push(NavTarget.NotificationSettings)
}
override fun onOpenLockScreenSettings() {
override fun navigateToLockScreenSettings() {
backstack.push(NavTarget.LockScreenSettings)
}
override fun onOpenAdvancedSettings() {
override fun navigateToAdvancedSettings() {
backstack.push(NavTarget.AdvancedSettings)
}
override fun onOpenLabs() {
override fun navigateToLabs() {
backstack.push(NavTarget.Labs)
}
override fun onOpenUserProfile(matrixUser: MatrixUser) {
override fun navigateToUserProfile(matrixUser: MatrixUser) {
backstack.push(NavTarget.UserProfile(matrixUser))
}
override fun onOpenBlockedUsers() {
override fun navigateToBlockedUsers() {
backstack.push(NavTarget.BlockedUsers)
}
override fun onSignOutClick() {
override fun startSignOutFlow() {
backstack.push(NavTarget.SignOut)
}
override fun onOpenAccountDeactivation() {
override fun startAccountDeactivationFlow() {
backstack.push(NavTarget.AccountDeactivation)
}
}
@ -180,7 +180,7 @@ class PreferencesFlowNode(
}
NavTarget.DeveloperSettings -> {
val developerSettingsCallback = object : DeveloperSettingsNode.Callback {
override fun onPushHistoryClick() {
override fun navigateToPushHistory() {
backstack.push(NavTarget.PushHistory)
}
}
@ -191,7 +191,7 @@ class PreferencesFlowNode(
}
NavTarget.About -> {
val callback = object : AboutNode.Callback {
override fun openOssLicenses() {
override fun navigateToOssLicenses() {
backstack.push(NavTarget.OssLicenses)
}
}
@ -202,11 +202,11 @@ class PreferencesFlowNode(
}
NavTarget.NotificationSettings -> {
val notificationSettingsCallback = object : NotificationSettingsNode.Callback {
override fun editDefaultNotificationMode(isOneToOne: Boolean) {
override fun navigateToEditDefaultNotificationSetting(isOneToOne: Boolean) {
backstack.push(NavTarget.EditDefaultNotificationSetting(isOneToOne))
}
override fun onTroubleshootNotificationsClick() {
override fun navigateToTroubleshootNotifications() {
backstack.push(NavTarget.TroubleshootNotifications)
}
}
@ -223,7 +223,7 @@ class PreferencesFlowNode(
}
}
override fun openIgnoredUsers() {
override fun navigateToBlockedUsers() {
backstack.push(NavTarget.BlockedUsers)
}
})
@ -240,16 +240,16 @@ class PreferencesFlowNode(
}
}
override fun navigateTo(roomId: RoomId, eventId: EventId) {
plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateTo(roomId, eventId) }
override fun navigateToEvent(roomId: RoomId, eventId: EventId) {
plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateToEvent(roomId, eventId) }
}
})
.build()
}
is NavTarget.EditDefaultNotificationSetting -> {
val callback = object : EditDefaultNotificationSettingNode.Callback {
override fun openRoomNotificationSettings(roomId: RoomId) {
plugins<PreferencesEntryPoint.Callback>().forEach { it.onOpenRoomNotificationSettings(roomId) }
override fun navigateToRoomNotificationSettings(roomId: RoomId) {
plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateToRoomNotificationSettings(roomId) }
}
}
val input = EditDefaultNotificationSettingNode.Inputs(navTarget.isOneToOne)
@ -270,8 +270,8 @@ class PreferencesFlowNode(
}
NavTarget.SignOut -> {
val callBack: LogoutEntryPoint.Callback = object : LogoutEntryPoint.Callback {
override fun onChangeRecoveryKeyClick() {
plugins<PreferencesEntryPoint.Callback>().forEach { it.onSecureBackupClick() }
override fun navigateToSecureBackup() {
plugins<PreferencesEntryPoint.Callback>().forEach { it.navigateToSecureBackup() }
}
}
logoutEntryPoint.nodeBuilder(this, buildContext)

4
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/about/AboutNode.kt
View file

@ -29,7 +29,7 @@ class AboutNode(
private val presenter: AboutPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun openOssLicenses()
fun navigateToOssLicenses()
}
private fun onElementLegalClick(
@ -52,7 +52,7 @@ class AboutNode(
onElementLegalClick(activity, isDark, elementLegal)
},
onOpenSourceLicensesClick = {
plugins.filterIsInstance<Callback>().forEach { it.openOssLicenses() }
plugins.filterIsInstance<Callback>().forEach { it.navigateToOssLicenses() }
},
modifier = modifier
)

8
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/developer/DeveloperSettingsNode.kt
View file

@ -29,13 +29,13 @@ class DeveloperSettingsNode(
private val presenter: DeveloperSettingsPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onPushHistoryClick()
fun navigateToPushHistory()
}
private val callbacks = plugins<Callback>()
private fun onPushHistoryClick() {
callbacks.forEach { it.onPushHistoryClick() }
private fun navigateToPushHistory() {
callbacks.forEach { it.navigateToPushHistory() }
}
@Composable
@ -51,7 +51,7 @@ class DeveloperSettingsNode(
state = state,
modifier = modifier,
onOpenShowkase = ::openShowkase,
onPushHistoryClick = ::onPushHistoryClick,
onPushHistoryClick = ::navigateToPushHistory,
onBackClick = ::navigateUp
)
}

16
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/NotificationSettingsNode.kt
View file

@ -26,18 +26,18 @@ class NotificationSettingsNode(
private val presenter: NotificationSettingsPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun editDefaultNotificationMode(isOneToOne: Boolean)
fun onTroubleshootNotificationsClick()
fun navigateToEditDefaultNotificationSetting(isOneToOne: Boolean)
fun navigateToTroubleshootNotifications()
}
private val callbacks = plugins<Callback>()
private fun openEditDefault(isOneToOne: Boolean) {
callbacks.forEach { it.editDefaultNotificationMode(isOneToOne) }
private fun navigateToEditDefaultNotificationSetting(isOneToOne: Boolean) {
callbacks.forEach { it.navigateToEditDefaultNotificationSetting(isOneToOne) }
}
private fun onTroubleshootNotificationsClick() {
callbacks.forEach { it.onTroubleshootNotificationsClick() }
private fun navigateToTroubleshootNotifications() {
callbacks.forEach { it.navigateToTroubleshootNotifications() }
}
@Composable
@ -45,9 +45,9 @@ class NotificationSettingsNode(
val state = presenter.present()
NotificationSettingsView(
state = state,
onOpenEditDefault = { openEditDefault(isOneToOne = it) },
onOpenEditDefault = ::navigateToEditDefaultNotificationSetting,
onBackClick = ::navigateUp,
onTroubleshootNotificationsClick = ::onTroubleshootNotificationsClick,
onTroubleshootNotificationsClick = ::navigateToTroubleshootNotifications,
modifier = modifier,
)
}

8
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/notifications/edit/EditDefaultNotificationSettingNode.kt
View file

@ -29,7 +29,7 @@ class EditDefaultNotificationSettingNode(
presenterFactory: EditDefaultNotificationSettingPresenter.Factory
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun openRoomNotificationSettings(roomId: RoomId)
fun navigateToRoomNotificationSettings(roomId: RoomId)
}
data class Inputs(
@ -40,8 +40,8 @@ class EditDefaultNotificationSettingNode(
private val callbacks = plugins<Callback>()
private val presenter = presenterFactory.create(inputs.isOneToOne)
private fun openRoomNotificationSettings(roomId: RoomId) {
callbacks.forEach { it.openRoomNotificationSettings(roomId) }
private fun navigateToRoomNotificationSettings(roomId: RoomId) {
callbacks.forEach { it.navigateToRoomNotificationSettings(roomId) }
}
@Composable
@ -49,7 +49,7 @@ class EditDefaultNotificationSettingNode(
val state = presenter.present()
EditDefaultNotificationSettingView(
state = state,
openRoomNotificationSettings = { openRoomNotificationSettings(it) },
openRoomNotificationSettings = { navigateToRoomNotificationSettings(it) },
onBackClick = ::navigateUp,
modifier = modifier,
)

56
features/preferences/impl/src/main/kotlin/io/element/android/features/preferences/impl/root/PreferencesRootNode.kt
View file

@ -34,52 +34,52 @@ class PreferencesRootNode(
private val directLogoutView: DirectLogoutView,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onAddAccount()
fun onOpenBugReport()
fun onSecureBackupClick()
fun onOpenAnalytics()
fun onOpenAbout()
fun onOpenDeveloperSettings()
fun onOpenNotificationSettings()
fun onOpenLockScreenSettings()
fun onOpenAdvancedSettings()
fun onOpenLabs()
fun onOpenUserProfile(matrixUser: MatrixUser)
fun onOpenBlockedUsers()
fun onSignOutClick()
fun onOpenAccountDeactivation()
fun navigateToAddAccount()
fun navigateToBugReport()
fun navigateToSecureBackup()
fun navigateToAnalyticsSettings()
fun navigateToAbout()
fun navigateToDeveloperSettings()
fun navigateToNotificationSettings()
fun navigateToLockScreenSettings()
fun navigateToAdvancedSettings()
fun navigateToLabs()
fun navigateToUserProfile(matrixUser: MatrixUser)
fun navigateToBlockedUsers()
fun startSignOutFlow()
fun startAccountDeactivationFlow()
}
private fun onAddAccount() {
plugins<Callback>().forEach { it.onAddAccount() }
plugins<Callback>().forEach { it.navigateToAddAccount() }
}
private fun onOpenBugReport() {
plugins<Callback>().forEach { it.onOpenBugReport() }
plugins<Callback>().forEach { it.navigateToBugReport() }
}
private fun onSecureBackupClick() {
plugins<Callback>().forEach { it.onSecureBackupClick() }
plugins<Callback>().forEach { it.navigateToSecureBackup() }
}
private fun onOpenDeveloperSettings() {
plugins<Callback>().forEach { it.onOpenDeveloperSettings() }
plugins<Callback>().forEach { it.navigateToDeveloperSettings() }
}
private fun onOpenAdvancedSettings() {
plugins<Callback>().forEach { it.onOpenAdvancedSettings() }
plugins<Callback>().forEach { it.navigateToAdvancedSettings() }
}
private fun onOpenLabs() {
plugins<Callback>().forEach { it.onOpenLabs() }
plugins<Callback>().forEach { it.navigateToLabs() }
}
private fun onOpenAnalytics() {
plugins<Callback>().forEach { it.onOpenAnalytics() }
plugins<Callback>().forEach { it.navigateToAnalyticsSettings() }
}
private fun onOpenAbout() {
plugins<Callback>().forEach { it.onOpenAbout() }
plugins<Callback>().forEach { it.navigateToAbout() }
}
private fun onManageAccountClick(
@ -97,27 +97,27 @@ class PreferencesRootNode(
}
private fun onOpenNotificationSettings() {
plugins<Callback>().forEach { it.onOpenNotificationSettings() }
plugins<Callback>().forEach { it.navigateToNotificationSettings() }
}
private fun onOpenLockScreenSettings() {
plugins<Callback>().forEach { it.onOpenLockScreenSettings() }
plugins<Callback>().forEach { it.navigateToLockScreenSettings() }
}
private fun onOpenUserProfile(matrixUser: MatrixUser) {
plugins<Callback>().forEach { it.onOpenUserProfile(matrixUser) }
plugins<Callback>().forEach { it.navigateToUserProfile(matrixUser) }
}
private fun onOpenBlockedUsers() {
plugins<Callback>().forEach { it.onOpenBlockedUsers() }
plugins<Callback>().forEach { it.navigateToBlockedUsers() }
}
private fun onSignOutClick() {
plugins<Callback>().forEach { it.onSignOutClick() }
plugins<Callback>().forEach { it.startSignOutFlow() }
}
private fun onOpenAccountDeactivation() {
plugins<Callback>().forEach { it.onOpenAccountDeactivation() }
plugins<Callback>().forEach { it.startAccountDeactivationFlow() }
}
@Composable

10
features/preferences/impl/src/test/kotlin/io/element/android/features/preferences/impl/DefaultPreferencesEntryPointTest.kt
View file

@ -63,11 +63,11 @@ class DefaultPreferencesEntryPointTest {
)
}
val callback = object : PreferencesEntryPoint.Callback {
override fun onAddAccount() = lambdaError()
override fun onOpenBugReport() = lambdaError()
override fun onSecureBackupClick() = lambdaError()
override fun onOpenRoomNotificationSettings(roomId: RoomId) = lambdaError()
override fun navigateTo(roomId: RoomId, eventId: EventId) = lambdaError()
override fun navigateToAddAccount() = lambdaError()
override fun navigateToBugReport() = lambdaError()
override fun navigateToSecureBackup() = lambdaError()
override fun navigateToRoomNotificationSettings(roomId: RoomId) = lambdaError()
override fun navigateToEvent(roomId: RoomId, eventId: EventId) = lambdaError()
}
val params = PreferencesEntryPoint.Params(
initialElement = PreferencesEntryPoint.InitialTarget.NotificationSettings,