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

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 45b5783b23
commit 09a18ad7ca
104 changed files with 658 additions and 664 deletions
Download patch file Download diff file Expand all files Collapse all files

32
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/LoginFlowNode.kt
View file

@ -126,13 +126,13 @@ class LoginFlowNode(
return when (navTarget) {
NavTarget.OnBoarding -> {
val callback = object : OnBoardingNode.Callback {
override fun onSignUp() {
override fun navigateToSignUpFlow() {
backstack.push(
NavTarget.ConfirmAccountProvider(isAccountCreation = true)
)
}
override fun onSignIn(mustChooseAccountProvider: Boolean) {
override fun navigateToSignInFlow(mustChooseAccountProvider: Boolean) {
backstack.push(
if (mustChooseAccountProvider) {
NavTarget.ChooseAccountProvider
@ -142,23 +142,23 @@ class LoginFlowNode(
)
}
override fun onSignInWithQrCode() {
override fun navigateToQrCode() {
backstack.push(NavTarget.QrCode)
}
override fun onReportProblem() {
plugins<LoginEntryPoint.Callback>().forEach { it.onReportProblem() }
override fun navigateToBugReport() {
plugins<LoginEntryPoint.Callback>().forEach { it.navigateToBugReport() }
}
override fun onOidcDetails(oidcDetails: OidcDetails) {
override fun navigateToOidc(oidcDetails: OidcDetails) {
navigateToMas(oidcDetails)
}
override fun onCreateAccountContinue(url: String) {
override fun navigateToCreateAccount(url: String) {
backstack.push(NavTarget.CreateAccount(url))
}
override fun onLoginPasswordNeeded() {
override fun navigateToLoginPassword() {
backstack.push(NavTarget.LoginPassword)
}
}
@ -171,15 +171,15 @@ class LoginFlowNode(
}
NavTarget.ChooseAccountProvider -> {
val callback = object : ChooseAccountProviderNode.Callback {
override fun onOidcDetails(oidcDetails: OidcDetails) {
override fun navigateToOidc(oidcDetails: OidcDetails) {
navigateToMas(oidcDetails)
}
override fun onCreateAccountContinue(url: String) {
override fun navigateToCreateAccount(url: String) {
backstack.push(NavTarget.CreateAccount(url))
}
override fun onLoginPasswordNeeded() {
override fun navigateToLoginPassword() {
backstack.push(NavTarget.LoginPassword)
}
}
@ -193,19 +193,19 @@ class LoginFlowNode(
isAccountCreation = navTarget.isAccountCreation,
)
val callback = object : ConfirmAccountProviderNode.Callback {
override fun onOidcDetails(oidcDetails: OidcDetails) {
override fun navigateToOidc(oidcDetails: OidcDetails) {
navigateToMas(oidcDetails)
}
override fun onCreateAccountContinue(url: String) {
override fun navigateToCreateAccount(url: String) {
backstack.push(NavTarget.CreateAccount(url))
}
override fun onLoginPasswordNeeded() {
override fun navigateToLoginPassword() {
backstack.push(NavTarget.LoginPassword)
}
override fun onChangeAccountProvider() {
override fun navigateToChangeAccountProvider() {
backstack.push(NavTarget.ChangeAccountProvider)
}
}
@ -221,7 +221,7 @@ class LoginFlowNode(
backstack.singleTop(confirmAccountProvider)
}
override fun onOtherClick() {
override fun navigateToSearchAccountProvider() {
backstack.push(NavTarget.SearchAccountProvider)
}
}

8
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/qrcode/QrCodeLoginFlowNode.kt
View file

@ -147,11 +147,11 @@ class QrCodeLoginFlowNode(
return when (navTarget) {
is NavTarget.Initial -> {
val callback = object : QrCodeIntroNode.Callback {
override fun onCancelClicked() {
override fun cancel() {
navigateUp()
}
override fun onContinue() {
override fun navigateToQrCodeScan() {
backstack.push(NavTarget.QrCodeScan)
}
}
@ -159,11 +159,11 @@ class QrCodeLoginFlowNode(
}
is NavTarget.QrCodeScan -> {
val callback = object : QrCodeScanNode.Callback {
override fun onScannedCode(qrCodeLoginData: MatrixQrCodeLoginData) {
override fun handleScannedCode(qrCodeLoginData: MatrixQrCodeLoginData) {
lifecycleScope.startAuthentication(qrCodeLoginData)
}
override fun onCancelClicked() {
override fun cancel() {
backstack.pop()
}
}

4
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/changeaccountprovider/ChangeAccountProviderNode.kt
View file

@ -29,7 +29,7 @@ class ChangeAccountProviderNode(
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onDone()
fun onOtherClick()
fun navigateToSearchAccountProvider()
}
private fun onDone() {
@ -37,7 +37,7 @@ class ChangeAccountProviderNode(
}
private fun onOtherClick() {
plugins<Callback>().forEach { it.onOtherClick() }
plugins<Callback>().forEach { it.navigateToSearchAccountProvider() }
}
@Composable

12
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/chooseaccountprovider/ChooseAccountProviderNode.kt
View file

@ -29,21 +29,21 @@ class ChooseAccountProviderNode(
private val presenter: ChooseAccountProviderPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onLoginPasswordNeeded()
fun onOidcDetails(oidcDetails: OidcDetails)
fun onCreateAccountContinue(url: String)
fun navigateToLoginPassword()
fun navigateToOidc(oidcDetails: OidcDetails)
fun navigateToCreateAccount(url: String)
}
private fun onOidcDetails(oidcDetails: OidcDetails) {
plugins<Callback>().forEach { it.onOidcDetails(oidcDetails) }
plugins<Callback>().forEach { it.navigateToOidc(oidcDetails) }
}
private fun onLoginPasswordNeeded() {
plugins<Callback>().forEach { it.onLoginPasswordNeeded() }
plugins<Callback>().forEach { it.navigateToLoginPassword() }
}
private fun onCreateAccountContinue(url: String) {
plugins<Callback>().forEach { it.onCreateAccountContinue(url) }
plugins<Callback>().forEach { it.navigateToCreateAccount(url) }
}
@Composable

16
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/confirmaccountprovider/ConfirmAccountProviderNode.kt
View file

@ -42,26 +42,26 @@ class ConfirmAccountProviderNode(
)
interface Callback : Plugin {
fun onLoginPasswordNeeded()
fun onOidcDetails(oidcDetails: OidcDetails)
fun onCreateAccountContinue(url: String)
fun onChangeAccountProvider()
fun navigateToLoginPassword()
fun navigateToOidc(oidcDetails: OidcDetails)
fun navigateToCreateAccount(url: String)
fun navigateToChangeAccountProvider()
}
private fun onOidcDetails(data: OidcDetails) {
plugins<Callback>().forEach { it.onOidcDetails(data) }
plugins<Callback>().forEach { it.navigateToOidc(data) }
}
private fun onLoginPasswordNeeded() {
plugins<Callback>().forEach { it.onLoginPasswordNeeded() }
plugins<Callback>().forEach { it.navigateToLoginPassword() }
}
private fun onCreateAccountContinue(url: String) {
plugins<Callback>().forEach { it.onCreateAccountContinue(url) }
plugins<Callback>().forEach { it.navigateToCreateAccount(url) }
}
private fun onChangeAccountProvider() {
plugins<Callback>().forEach { it.onChangeAccountProvider() }
plugins<Callback>().forEach { it.navigateToChangeAccountProvider() }
}
@Composable

28
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/onboarding/OnBoardingNode.kt
View file

@ -34,13 +34,13 @@ class OnBoardingNode(
plugins = plugins
) {
interface Callback : Plugin {
fun onSignUp()
fun onSignIn(mustChooseAccountProvider: Boolean)
fun onSignInWithQrCode()
fun onReportProblem()
fun onLoginPasswordNeeded()
fun onOidcDetails(oidcDetails: OidcDetails)
fun onCreateAccountContinue(url: String)
fun navigateToSignUpFlow()
fun navigateToSignInFlow(mustChooseAccountProvider: Boolean)
fun navigateToQrCode()
fun navigateToBugReport()
fun navigateToLoginPassword()
fun navigateToOidc(oidcDetails: OidcDetails)
fun navigateToCreateAccount(url: String)
}
data class Params(
@ -55,31 +55,31 @@ class OnBoardingNode(
)
private fun onSignIn(mustChooseAccountProvider: Boolean) {
plugins<Callback>().forEach { it.onSignIn(mustChooseAccountProvider) }
plugins<Callback>().forEach { it.navigateToSignInFlow(mustChooseAccountProvider) }
}
private fun onSignUp() {
plugins<Callback>().forEach { it.onSignUp() }
plugins<Callback>().forEach { it.navigateToSignUpFlow() }
}
private fun onSignInWithQrCode() {
plugins<Callback>().forEach { it.onSignInWithQrCode() }
plugins<Callback>().forEach { it.navigateToQrCode() }
}
private fun onReportProblem() {
plugins<Callback>().forEach { it.onReportProblem() }
plugins<Callback>().forEach { it.navigateToBugReport() }
}
private fun onOidcDetails(data: OidcDetails) {
plugins<Callback>().forEach { it.onOidcDetails(data) }
plugins<Callback>().forEach { it.navigateToOidc(data) }
}
private fun onLoginPasswordNeeded() {
plugins<Callback>().forEach { it.onLoginPasswordNeeded() }
plugins<Callback>().forEach { it.navigateToLoginPassword() }
}
private fun onCreateAccountContinue(url: String) {
plugins<Callback>().forEach { it.onCreateAccountContinue(url) }
plugins<Callback>().forEach { it.navigateToCreateAccount(url) }
}
@Composable

8
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/intro/QrCodeIntroNode.kt
View file

@ -26,16 +26,16 @@ class QrCodeIntroNode(
private val presenter: QrCodeIntroPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onCancelClicked()
fun onContinue()
fun cancel()
fun navigateToQrCodeScan()
}
private fun onCancelClicked() {
plugins<Callback>().forEach { it.onCancelClicked() }
plugins<Callback>().forEach { it.cancel() }
}
private fun onContinue() {
plugins<Callback>().forEach { it.onContinue() }
plugins<Callback>().forEach { it.navigateToQrCodeScan() }
}
@Composable

8
features/login/impl/src/main/kotlin/io/element/android/features/login/impl/screens/qrcode/scan/QrCodeScanNode.kt
View file

@ -27,16 +27,16 @@ class QrCodeScanNode(
private val presenter: QrCodeScanPresenter,
) : Node(buildContext, plugins = plugins) {
interface Callback : Plugin {
fun onScannedCode(qrCodeLoginData: MatrixQrCodeLoginData)
fun onCancelClicked()
fun handleScannedCode(qrCodeLoginData: MatrixQrCodeLoginData)
fun cancel()
}
private fun onQrCodeDataReady(qrCodeLoginData: MatrixQrCodeLoginData) {
plugins<Callback>().forEach { it.onScannedCode(qrCodeLoginData) }
plugins<Callback>().forEach { it.handleScannedCode(qrCodeLoginData) }
}
private fun onCancelClicked() {
plugins<Callback>().forEach { it.onCancelClicked() }
plugins<Callback>().forEach { it.cancel() }
}
@Composable

2
features/login/impl/src/test/kotlin/io/element/android/features/login/impl/DefaultLoginEntryPointTest.kt
View file

@ -39,7 +39,7 @@ class DefaultLoginEntryPointTest {
)
}
val callback = object : LoginEntryPoint.Callback {
override fun onReportProblem() = lambdaError()
override fun navigateToBugReport() = lambdaError()
}
val params = LoginEntryPoint.Params(
accountProvider = "ac",