Skip to content

Commit

Permalink
Login driver app (#166)
Browse files Browse the repository at this point in the history 
* basic andriod app setup

* remove .gradle from VC

* update .gitignore

* login and basic navigation

* prevent back navigation from login screen
  • Loading branch information
@steffenheger
steffenheger authored Nov 1, 2024
1 parent 14d31f0 commit 04369a7
Show file tree
Hide file tree
Showing 15 changed files with 739 additions and 8 deletions.
1 change: 1 addition & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@ booking-generator/data/stops.txt
booking-generator/test
.vscode
/driver-app/.gradle/
/driver-app/.idea
13 changes: 11 additions & 2 deletions driver-app/app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,18 +20,20 @@ android {

buildTypes {
debug {
buildConfigField("String", "BASE_URL", "\"http://130.83.165.211:8080\"")
buildConfigField("String", "BASE_URL", "\"http://130.83.165.211:7777\"")
}
release {
isMinifyEnabled = false
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
buildConfigField("String", "BASE_URL", "\"https://prima.motis-project.de\"")
}
}
buildFeatures {
buildConfig = true
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.0"
Expand All @@ -49,7 +51,14 @@ dependencies {
implementation(libs.androidx.core.ktx)
implementation(libs.androidx.appcompat)
implementation(libs.material)
implementation(libs.androidx.runtime.android)
implementation(libs.androidx.navigation.compose)
implementation("com.squareup.okhttp3:okhttp:4.12.0")
implementation("com.squareup.retrofit2:retrofit:2.11.0")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("androidx.constraintlayout:constraintlayout-compose:1.0.1")
implementation(libs.androidx.material3.android)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
}
}
6 changes: 5 additions & 1 deletion driver-app/app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,11 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.INTERNET" />

<application
android:name=".app.DriversApp"
android:usesCleartextTraffic="true"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
Expand All @@ -23,4 +27,4 @@
</activity>
</application>

</manifest>
</manifest>
126 changes: 126 additions & 0 deletions driver-app/app/src/main/java/de/motis/prima/Home.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,126 @@
package de.motis.prima

import android.util.Log
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.outlined.ExitToApp
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.navigation.NavController
import de.motis.prima.app.DriversApp
import de.motis.prima.services.CookieStore
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.launch

class HomeViewModel : ViewModel() {
private val cookieStore: CookieStore = CookieStore(DriversApp.instance)

private val _logoutEvent = MutableSharedFlow<Unit>()
val logoutEvent = _logoutEvent.asSharedFlow()

fun logout() {
viewModelScope.launch {
try {
cookieStore.clearCookies()
_logoutEvent.emit(Unit)
} catch (e: Exception) {
Log.d("Logout", "Error while logout.")
}
}
}
}

@Composable
fun Home(
navController: NavController,
viewModel: HomeViewModel = androidx.lifecycle.viewmodel.compose.viewModel()
) {
LaunchedEffect(key1 = viewModel) {
launch {
viewModel.logoutEvent.collect {
Log.d("Logout", "Logout event triggered.")
navController.navigate("login") {
launchSingleTop = true
}
}
}
}

Scaffold(
modifier = Modifier
.fillMaxSize()
) { contentPadding ->
Column(
modifier = Modifier
.fillMaxSize()
.padding(contentPadding)
) {
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.End
) {
TextButton(onClick = { viewModel.logout() }) {
Icon(
Icons.AutoMirrored.Outlined.ExitToApp, contentDescription = null
)
}
}
Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center
) {
Button(
modifier = Modifier.width(300.dp),
onClick = {
navController.navigate("vehicles") {}
}
) {
Text(
text = "Fahrzeug auswählen", fontSize = 24.sp
)
}
}

Spacer(modifier = Modifier.height(20.dp))

Row(
modifier = Modifier.fillMaxWidth(),
verticalAlignment = Alignment.CenterVertically,
horizontalArrangement = Arrangement.Center
) {
Button(
modifier = Modifier.width(300.dp),
onClick = {
navController.navigate("tours") {}
}
) {
Text(
text = "Aufträge", fontSize = 24.sp
)
}
}
}
}
}
203 changes: 203 additions & 0 deletions driver-app/app/src/main/java/de/motis/prima/Login.kt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
package de.motis.prima

import android.app.Activity
import android.util.Log
import androidx.activity.compose.BackHandler
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.BoxWithConstraints
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentHeight
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material3.Text
import androidx.compose.material3.Button
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
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 androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.text.input.PasswordVisualTransformation
import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.navigation.NavController
import de.motis.prima.services.Api
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.launch

class LoginViewModel : ViewModel() {
// Event which will be omitted to the Login component, indicating success of the login operation
private val _navigationEvent = MutableSharedFlow<Boolean>()
val navigationEvent = _navigationEvent.asSharedFlow()

private val _loginErrorEvent = MutableSharedFlow<Boolean>()
val loginErrorEvent = _loginErrorEvent.asSharedFlow()

private val _networkErrorEvent = MutableSharedFlow<Unit>()
val networkErrorEvent = _networkErrorEvent.asSharedFlow()

fun login(email: String, password: String) {
viewModelScope.launch {
try {
val response = Api.apiService.login(email, password)
Log.d("Login Response", response.toString())
if (response.status == 302) {
// successful login
_navigationEvent.emit(true)
} else {
_loginErrorEvent.emit(true)
}
} catch (e: Exception) {
Log.d("Login Response Network Error", e.message!!)
_networkErrorEvent.emit(Unit)
}
}
}
}

@Composable
fun Login(
navController: NavController,
viewModel: LoginViewModel = androidx.lifecycle.viewmodel.compose.viewModel()
) {
val snackbarHostState = remember { SnackbarHostState() }

var isLoginFailed by remember { mutableStateOf(false) }

val networkErrorMessage = stringResource(id = R.string.network_error_message)

val activity = (LocalContext.current as? Activity)
BackHandler {
activity?.finish()
}

LaunchedEffect(key1 = viewModel) {
// Catching successful login event and navigation to the next screen
launch {
viewModel.navigationEvent.collect { shouldNavigate ->
Log.d("Navigation event", "Navigation triggered.")
if (shouldNavigate) {
Log.d("Navigation event", "Navigating to vehicle selection.")
navController.navigate("home") {
popUpTo("login") {
inclusive = true
}
}
}
}
}

// Catching event when login failed due to incorrect login data
launch {
viewModel.loginErrorEvent.collect { error ->
isLoginFailed = error
}
}

// Catching event when a network error occurs and displaying of error message
launch {
viewModel.networkErrorEvent.collect {
snackbarHostState.showSnackbar(message = networkErrorMessage)
}
}
}

Scaffold(
modifier = Modifier.fillMaxSize(),
snackbarHost = {
BoxWithConstraints(modifier = Modifier.fillMaxSize()) {
SnackbarHost(
hostState = snackbarHostState,
modifier = Modifier
.fillMaxSize()
.wrapContentHeight(Alignment.Top)
.padding(top = maxHeight * 0.25f)
)
}
}
) { contentPadding ->
ConstraintLayout(
modifier = Modifier
.fillMaxSize()
.padding(contentPadding)
) {
var email by remember {
mutableStateOf("")
}

var password by remember {
mutableStateOf("")
}

Column(
modifier = Modifier.fillMaxSize(),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
when {
isLoginFailed ->
Text(
text = stringResource(id = R.string.wrong_login_data),
color = Color.Red,
fontWeight = FontWeight.Bold,
modifier = Modifier.padding(bottom = 8.dp)
)
}
OutlinedTextField(
value = email,
onValueChange = {
email = it
isLoginFailed = false
},
label = { Text(stringResource(id = R.string.email_label)) },
maxLines = 1,
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email),
isError = isLoginFailed
)
Spacer(modifier = Modifier.height(12.dp))
OutlinedTextField(
value = password,
onValueChange = {
password = it
isLoginFailed = false
},
label = { Text(stringResource(id = R.string.password_label)) },
maxLines = 1,
visualTransformation = PasswordVisualTransformation(),
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
isError = isLoginFailed
)
Spacer(modifier = Modifier.height(20.dp))
Button(
onClick = {
isLoginFailed = false
Log.d("Login", "E-Mail: ${email}, Password: $password")
viewModel.login(email, password)
}
) {
Text(
text = stringResource(id = R.string.login_button_text), fontSize = 18.sp
)
}
}
}
}
}
Loading

0 comments on commit 04369a7

Please sign in to comment.