OAuth - request the token via REST API #19
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -10,5 +10,6 @@ val appModule = module { | |
| homeUiModule, | ||
| loginUiModule, | ||
| analyticsModule, | ||
| dispatcherModule, | ||
| ) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| package com.gravatar.app.di | ||
|
|
||
| import com.gravatar.app.foundations.DispatcherProvider | ||
| import kotlinx.coroutines.CoroutineDispatcher | ||
| import kotlinx.coroutines.Dispatchers | ||
| import org.koin.dsl.module | ||
|
|
||
| val dispatcherModule = module { | ||
| single<DispatcherProvider> { | ||
| AppDispatcherProvider( | ||
| main = Dispatchers.Main, | ||
| io = Dispatchers.IO, | ||
| default = Dispatchers.Default | ||
| ) | ||
| } | ||
| } | ||
|
|
||
| data class AppDispatcherProvider( | ||
| override val main: CoroutineDispatcher, | ||
| override val io: CoroutineDispatcher, | ||
| override val default: CoroutineDispatcher | ||
| ) : DispatcherProvider |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <network-security-config> | ||
| <debug-overrides> | ||
| <trust-anchors> | ||
| <!-- Trust user added CAs while debuggable only --> | ||
| <certificates src="user" /> | ||
| </trust-anchors> | ||
| </debug-overrides> | ||
| </network-security-config> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| /build |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,17 @@ | ||
| plugins { | ||
| id("java-library") | ||
| alias(libs.plugins.kotlin.jvm) | ||
| } | ||
| java { | ||
| sourceCompatibility = JavaVersion.VERSION_17 | ||
| targetCompatibility = JavaVersion.VERSION_17 | ||
|
|
||
| dependencies { | ||
| implementation(libs.kotlinx.coroutines) | ||
| } | ||
| } | ||
| kotlin { | ||
| compilerOptions { | ||
| jvmTarget = org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_17 | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| package com.gravatar.app.foundations | ||
|
|
||
| import kotlinx.coroutines.CoroutineDispatcher | ||
|
|
||
| interface DispatcherProvider { | ||
| val main: CoroutineDispatcher | ||
| val io: CoroutineDispatcher | ||
| val default: CoroutineDispatcher | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,12 @@ | ||
| package com.gravatar.app.loginUi.di | ||
|
|
||
| import com.gravatar.app.loginUi.presentation.login.LoginViewModel | ||
| import com.gravatar.app.usercomponent.di.userComponentModule | ||
| import org.koin.core.module.dsl.viewModelOf | ||
| import org.koin.dsl.module | ||
|
|
||
| val loginUiModule = module { | ||
| includes(buildConfigModule, userComponentModule) | ||
|
|
||
| viewModelOf(::LoginViewModel) | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,38 +7,79 @@ import androidx.compose.foundation.layout.Column | |
| import androidx.compose.foundation.layout.fillMaxSize | ||
| import androidx.compose.foundation.layout.padding | ||
| import androidx.compose.material3.Button | ||
| import androidx.compose.material3.CircularProgressIndicator | ||
| import androidx.compose.material3.Scaffold | ||
| import androidx.compose.material3.Surface | ||
| import androidx.compose.material3.Text | ||
| import androidx.compose.runtime.Composable | ||
| import androidx.compose.runtime.LaunchedEffect | ||
| import androidx.compose.runtime.collectAsState | ||
| import androidx.compose.runtime.getValue | ||
| import androidx.compose.ui.Alignment | ||
| import androidx.compose.ui.Modifier | ||
| import androidx.compose.ui.platform.LocalContext | ||
| import androidx.compose.ui.tooling.preview.Preview | ||
| import androidx.lifecycle.Lifecycle | ||
| import androidx.lifecycle.compose.LocalLifecycleOwner | ||
| import androidx.lifecycle.repeatOnLifecycle | ||
| import com.gravatar.app.loginUi.presentation.oauth.OAuthResultContract | ||
| import kotlinx.coroutines.Dispatchers | ||
| import kotlinx.coroutines.withContext | ||
| import org.koin.androidx.compose.koinViewModel | ||
|
|
||
| @Composable | ||
| fun LoginScreen( | ||
| onLoggedIn: () -> Unit, | ||
| ) { | ||
| LoginScreen( | ||
| onLoggedIn = onLoggedIn, | ||
| viewModel = koinViewModel(), | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| internal fun LoginScreen( | ||
|
There was a problem hiding this comment. Preview in this class no longer works, as Koin won't be initialized. We could use KoinAppApplicationPreview: @Preview
@Composable
private fun LoginScreenPreview() {
KoinApplicationPreview(application = { modules(loginUiModule) }) {
LoginScreen(
onLoggedIn = { },
)
}
}However, if you try that code, it will fail because it doesn't know how to resolve
I wonder if Something like this: There was a problem hiding this comment. This should be fixed now. I didn't update the test to use the proper composable that doesn't rely on ViewModel, but rather on a ui state class. |
||
| onLoggedIn: () -> Unit, | ||
| viewModel: LoginViewModel, | ||
| ) { | ||
| val uiState by viewModel.uiState.collectAsState() | ||
| val context = LocalContext.current | ||
| val lifecycle = LocalLifecycleOwner.current.lifecycle | ||
|
|
||
| LaunchedEffect(Unit) { | ||
| withContext(Dispatchers.Main.immediate) { | ||
| lifecycle.repeatOnLifecycle(Lifecycle.State.STARTED) { | ||
| viewModel.actions.collect { action -> | ||
| when (action) { | ||
| LoginAction.UserLoggedIn -> { | ||
| onLoggedIn() | ||
| } | ||
|
|
||
| LoginAction.ShowError -> { | ||
| Toast.makeText(context, "Login error", Toast.LENGTH_SHORT) | ||
| .show() | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| LoginScreen( | ||
| uiState = uiState, | ||
| onEvent = viewModel::onEvent | ||
| ) | ||
| } | ||
|
|
||
| @Composable | ||
| internal fun LoginScreen( | ||
| uiState: LoginUiState, | ||
| onEvent: (LoginEvent) -> Unit, | ||
| ) { | ||
| val oAuthLauncher = rememberLauncherForActivityResult(OAuthResultContract()) { result -> | ||
| onEvent(LoginEvent.OAuthResultReceived(result)) | ||
| } | ||
|
|
||
| Scaffold { innerPadding -> | ||
| Surface( | ||
| modifier = Modifier.padding(innerPadding) | ||
|
|
@@ -47,14 +88,22 @@ fun LoginScreen( | |
| modifier = Modifier.fillMaxSize(), | ||
| contentAlignment = Alignment.Center | ||
| ) { | ||
| when { | ||
| uiState.isLoading -> { | ||
| CircularProgressIndicator() | ||
| } | ||
|
|
||
| else -> { | ||
| Column { | ||
| Text("Login Screen") | ||
| Button( | ||
| onClick = { | ||
| oAuthLauncher.launch(Unit) | ||
| } | ||
| ) { | ||
| Text("Log In") | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Remember to add this to your
local.properties