IQBall
/
Application-Android
6
0
Fork 0
Code Issues 28 Pull Requests Packages Projects 1 Releases Wiki Activity

start login

Browse Source
authentification
samuel 1 year ago
parent 51f7c046ce
commit a3fbe984b6
8 changed files with 106 additions and 27 deletions
Show Stats Download Patch File Download Diff File

34
app/src/main/java/com/iqball/app/MainActivity.kt
Unescape View File

@ -7,21 +7,23 @@ import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.runtime.MutableState
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
import com.google.gson.Gson
import com.google.gson.GsonBuilder
import com.iqball.app.api.EitherBodyConverter
import com.iqball.app.api.EitherCallAdapterFactory
import com.iqball.app.api.service.IQBallService
import com.iqball.app.page.RegisterPage
import com.iqball.app.page.HomePage
import com.iqball.app.page.LoginPage
import com.iqball.app.session.DataSession
import com.iqball.app.session.Session
import com.iqball.app.ui.theme.IQBallTheme
import okhttp3.OkHttpClient
import okhttp3.ResponseBody
import retrofit2.Converter
import retrofit2.Retrofit
import retrofit2.converter.gson.GsonConverterFactory
import retrofit2.create
import java.lang.reflect.Type
class MainActivity : ComponentActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
@ -46,8 +48,12 @@ class MainActivity : ComponentActivity() {
setContent {
IQBallTheme {
// A surface container using the 'background' color from the theme
Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) {
App(service)
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
) {
val sessionState = remember { mutableStateOf<Session>(DataSession()) }
App(service, sessionState)
}
}
}
@ -55,6 +61,16 @@ class MainActivity : ComponentActivity() {
}
@Composable
fun App(service: IQBallService) {
RegisterPage(service)
fun App(service: IQBallService, sessionState: MutableState<Session>) {
val loginPage: @Composable () -> Unit = {
LoginPage(service = service, onLoginSuccess = { auth ->
sessionState.value = DataSession(auth)
})
}
val homePage : @Composable () -> Unit = { HomePage(service, sessionState.value) }
val currentPage = remember(sessionState.value.auth) { if (sessionState.value.auth == null) loginPage else homePage }
currentPage()
}

10
app/src/main/java/com/iqball/app/page/HomePage.kt
Unescape View File

@ -0,0 +1,10 @@
package com.iqball.app.page
import androidx.compose.runtime.Composable
import com.iqball.app.api.service.IQBallService
import com.iqball.app.session.Session
@Composable
fun HomePage(service: IQBallService, session: Session) {
}

66
app/src/main/java/com/iqball/app/page/LoginPage.kt
Unescape View File

@ -2,8 +2,70 @@ package com.iqball.app.page
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.foundation.layout.*
import androidx.compose.material3.Button
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Surface
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import arrow.core.Either
import com.iqball.app.api.service.AuthService
import com.iqball.app.session.Authentication
import kotlinx.coroutines.runBlocking
import kotlinx.datetime.LocalDateTime
@Composable
fun LoginPage() {
Text(text = "Login Page")
fun LoginPage(service: AuthService, onLoginSuccess : (Authentication) -> Unit) {
var username by remember { mutableStateOf("") }
var password by remember { mutableStateOf("") }
Surface(
color = Color.White,
modifier = Modifier.fillMaxSize()
) {
Column(
modifier = Modifier
.padding(16.dp)
.fillMaxSize(),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
Text(
text = "Login",
fontSize = 28.sp,
color = Color.Black
)
Spacer(modifier = Modifier.height(16.dp))
OutlinedTextField(
value = username,
onValueChange = { username = it },
label = { Text("Username") },
modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(16.dp))
OutlinedTextField(
value = password,
onValueChange = { password = it },
label = { Text("Password") },
modifier = Modifier.fillMaxWidth()
)
Spacer(modifier = Modifier.height(16.dp))
Button(onClick = {
runBlocking {
when(val response = service.login(AuthService.LoginRequest(username, password))){
is Either.Left -> println(response.value)
is Either.Right -> onLoginSuccess(Authentication(response.value.token, LocalDateTime.parse(response.value.expirationDate)))
}
}
}) {
Text(text = "Se connecter")
}
}
}
}

11
app/src/main/java/com/iqball/app/page/RegisterPage.kt
Unescape View File

@ -3,21 +3,14 @@ package com.iqball.app.page
import android.util.Log
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import arrow.core.Either
import com.iqball.app.api.service.AuthService
import com.iqball.app.api.service.AuthService.RegisterRequest
import com.iqball.app.api.service.IQBallService
import com.iqball.app.session.Authentication
import com.iqball.app.session.MutableSession
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.coroutineScope
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
import kotlinx.coroutines.runBlocking
@Composable
fun RegisterPage(service: IQBallService) {
@ -25,7 +18,7 @@ fun RegisterPage(service: IQBallService) {
var text by remember { mutableStateOf("No message !") }
runBlocking {
LaunchedEffect(Unit) {
val result = service.login(AuthService.LoginRequest("maxime@mail.com", "123456"))
when (result) {

3
app/src/main/java/com/iqball/app/session/DataSession.kt
Unescape View File

@ -0,0 +1,3 @@
package com.iqball.app.session
data class DataSession(override val auth: Authentication? = null) : Session

5
app/src/main/java/com/iqball/app/session/MutableSession.kt
Unescape View File

@ -1,5 +0,0 @@
package com.iqball.app.session
interface MutableSession : Session {
override var auth: Authentication
}

2
app/src/main/java/com/iqball/app/session/Session.kt
Unescape View File

@ -1,5 +1,5 @@
package com.iqball.app.session
interface Session {
val auth: Authentication
val auth: Authentication?
}

2
gradle/libs.versions.toml
Unescape View File

@ -1,5 +1,5 @@
[versions]
agp = "8.3.0"
agp = "8.2.2"
arrowCore = "1.2.1"
converterGson = "2.9.0"
kotlin = "1.9.0"

Write Preview
Loading…
Cancel
Save