Network and storage layer, handle login, auto refresh token

This commit is contained in:
2026-05-15 00:12:01 +07:00
parent 5c4c9804ee
commit 04bb4bf1cd
43 changed files with 857 additions and 79 deletions
@@ -1,18 +1,25 @@
package com.digitoolsolutions.app.torquevaultkmp
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.tooling.preview.Preview
import com.digitoolsolutions.android.torquevault.ui.theme.TorqueVaultTheme
import com.digitoolsolutions.app.torquevaultkmp.screens.MainScreen
import com.digitoolsolutions.app.torquevaultkmp.theme.TorqueVaultTheme
import org.koin.compose.viewmodel.koinViewModel
@Composable
@Preview
fun App() {
TorqueVaultTheme {
val viewModel = koinViewModel<AppViewModel>()
val savedTheme = viewModel.isDarkTheme.value
val isDarkTheme = savedTheme ?: isSystemInDarkTheme()
val isLoggedIn = viewModel.isLoggedIn()
TorqueVaultTheme(darkTheme = isDarkTheme) {
MainScreen(
isLoggedIn = false,
isDarkTheme = true,
onThemeToggle = {}
isDarkTheme = isDarkTheme,
onThemeToggle = { viewModel.toggleTheme(it) },
isLoggedIn = isLoggedIn
)
}
}
}
@@ -0,0 +1,27 @@
package com.digitoolsolutions.app.torquevaultkmp
import androidx.compose.runtime.State
import androidx.compose.runtime.mutableStateOf
import androidx.lifecycle.ViewModel
import com.digitoolsolutions.app.torquevaultkmp.data.storage.AppStorage
import com.digitoolsolutions.app.torquevaultkmp.data.storage.ReferKeys
import com.digitoolsolutions.app.torquevaultkmp.data.storage.TokenManager
import com.digitoolsolutions.app.torquevaultkmp.data.storage.load
class AppViewModel(
private val tokenManager: TokenManager,
private val storage: AppStorage
) : ViewModel() {
private val _isDarkTheme = mutableStateOf<Boolean?>(storage.load(ReferKeys.THEME))
val isDarkTheme: State<Boolean?> = _isDarkTheme
fun isLoggedIn(): Boolean {
return tokenManager.getRefreshToken() != null
}
fun toggleTheme(isDark: Boolean) {
_isDarkTheme.value = isDark
storage.save(ReferKeys.THEME, isDark)
}
}
@@ -0,0 +1,7 @@
package com.digitoolsolutions.app.torquevaultkmp
import com.digitoolsolutions.app.torquevaultkmp.data.network.api.AuthApi
import com.digitoolsolutions.app.torquevaultkmp.data.storage.TokenManager
import io.ktor.client.HttpClient
expect fun createPlatformHttpClient(tokenManager: TokenManager, authApi: AuthApi?): HttpClient
@@ -2,11 +2,6 @@ package com.digitoolsolutions.app.torquevaultkmp.components
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.WindowInsets
import androidx.compose.foundation.layout.WindowInsetsSides
import androidx.compose.foundation.layout.displayCutout
import androidx.compose.foundation.layout.navigationBars
import androidx.compose.foundation.layout.only
import androidx.compose.foundation.layout.union
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
@@ -30,7 +25,6 @@ import torquevaultkmp.composeapp.generated.resources.baseline_menu_24
import torquevaultkmp.composeapp.generated.resources.menu_item_accessibility
import torquevaultkmp.composeapp.generated.resources.navigation_item_accessibility
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun AppBar(
@@ -0,0 +1,50 @@
package com.digitoolsolutions.app.torquevaultkmp.data.network.api
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.LoginRequestDto
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.LoginResponseDto
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.RefreshRequestDto
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.RefreshResponseDto
import com.digitoolsolutions.app.torquevaultkmp.data.storage.TokenManager
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.post
import io.ktor.client.request.setBody
import io.ktor.http.ContentType
import io.ktor.http.contentType
class AuthApi(
private val client: HttpClient,
private val baseUrl: String,
private val tokenManager: TokenManager
) {
suspend fun login(username: String, password: String): Boolean {
return try {
println(">>>>> Check LOGIN Api")
val res: LoginResponseDto = client.post("$baseUrl${Endpoints.AUTH_TOKEN}") {
contentType(ContentType.Application.Json)
setBody(LoginRequestDto(username, password))
}.body()
println(res)
tokenManager.saveTokens(res.access, res.refresh)
true
} catch (e: Exception) {
println(">>>>> [AuthApi] Exception: $e")
false
}
}
suspend fun refreshToken(): String? {
val refreshToken = tokenManager.getRefreshToken() ?: return null
return try {
val res: RefreshResponseDto = client.post("$baseUrl${Endpoints.AUTH_REFRESH}") {
contentType(ContentType.Application.Json)
setBody(RefreshRequestDto(refreshToken))
}.body()
tokenManager.saveTokens(res.access, refreshToken)
res.access
} catch (e: Exception) {
tokenManager.clearTokens()
null // refresh token invalid
}
}
}
@@ -0,0 +1,8 @@
package com.digitoolsolutions.app.torquevaultkmp.data.network.api
object Endpoints {
const val AUTH_TOKEN = "/token/"
const val AUTH_REFRESH = "/token/refresh/"
const val WORK_ORDERS = "/work-orders/able-v2/"
const val CONFIRM = "/confirm"
}
@@ -0,0 +1,27 @@
package com.digitoolsolutions.app.torquevaultkmp.data.network.api
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.ConfirmRequestDto
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.WorkOrderDto
import io.ktor.client.HttpClient
import io.ktor.client.call.body
import io.ktor.client.request.get
import io.ktor.client.request.parameter
import io.ktor.client.request.post
import io.ktor.client.request.setBody
class WorkOrderApi(
private val client: HttpClient,
private val baseUrl: String
) {
suspend fun fetchAbleWorkOrders(page: Int): List<WorkOrderDto> {
return client.get("$baseUrl${Endpoints.WORK_ORDERS}") {
parameter("page", page)
}.body()
}
suspend fun confirm(mac: String, type: Int) {
client.post("$baseUrl${Endpoints.CONFIRM}") {
setBody(ConfirmRequestDto(mac, type))
}
}
}
@@ -0,0 +1,12 @@
package com.digitoolsolutions.app.torquevaultkmp.data.network.dto
import kotlinx.serialization.Serializable
@Serializable
data class LoginRequestDto(val username: String, val password: String)
@Serializable
data class RefreshRequestDto(val refresh: String)
@Serializable
data class LoginResponseDto(val access: String, val refresh: String)
@Serializable
data class RefreshResponseDto(val access: String)
@@ -0,0 +1,34 @@
package com.digitoolsolutions.app.torquevaultkmp.data.network.dto
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonElement
@Serializable
data class WorkOrderDto(
@SerialName("wo_id") val id: String,
val status: String,
val car: String? = null,
val make: String?,
@SerialName("license_plate") val licensePlate: String,
val services: Map<String, ServiceDto>?,
@SerialName("meas_result") val measResult: Map<String, JsonElement>?,
@SerialName("meas_history") val measHistory: Map<String, JsonElement>?,
@SerialName("finished_at") val finishedAt: String?,
@SerialName("created_at") val createdAt: String,
@SerialName("updated_at") val updatedAt: String? = null,
)
@Serializable
data class ServiceDto(
val nut: Int?,
val status: Int,
val wheels: List<String>?,
val wrench: String?,
@SerialName("torque_required") val torqueRequired: Double
)
@Serializable
data class ConfirmRequestDto(
@SerialName("wrench_mac_addr") val mac: String,
val type: Int
)
@@ -0,0 +1,24 @@
package com.digitoolsolutions.app.torquevaultkmp.data.network.mapper
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.LoginRequestDto
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.LoginResponseDto
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.RefreshRequestDto
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.RefreshResponseDto
import com.digitoolsolutions.app.torquevaultkmp.domain.model.LoginRequest
import com.digitoolsolutions.app.torquevaultkmp.domain.model.LoginResponse
import com.digitoolsolutions.app.torquevaultkmp.domain.model.RefreshRequest
import com.digitoolsolutions.app.torquevaultkmp.domain.model.RefreshResponse
fun LoginRequestDto.toDomain(): LoginRequest {
return LoginRequest(username,password)
}
fun LoginResponseDto.toDomain(): LoginResponse {
return LoginResponse(access, refresh)
}
fun RefreshRequestDto.toDomain(): RefreshRequest {
return RefreshRequest(refresh)
}
fun RefreshResponseDto.toDomain(): RefreshResponse {
return RefreshResponse(access)
}
@@ -0,0 +1,35 @@
package com.digitoolsolutions.app.torquevaultkmp.data.network.mapper
import com.digitoolsolutions.app.torquevaultkmp.data.network.dto.WorkOrderDto
import com.digitoolsolutions.app.torquevaultkmp.domain.model.Service
import com.digitoolsolutions.app.torquevaultkmp.domain.model.WorkOrder
import kotlinx.serialization.json.doubleOrNull
import kotlinx.serialization.json.jsonPrimitive
fun WorkOrderDto.toDomain(): WorkOrder {
return WorkOrder(
id = id,
status = status,
car = car,
make = make,
licensePlate = licensePlate,
services = services?.mapValues { (_, dto) ->
Service(
nut = dto.nut,
status = dto.status,
wheels = dto.wheels,
wrench = dto.wrench,
torqueRequired = dto.torqueRequired
)
},
measResult = measResult?.mapValues { (_, value) ->
value.jsonPrimitive.doubleOrNull ?: Double.NaN
},
measHistory = measHistory?.mapValues { (_, value) ->
value.jsonPrimitive.doubleOrNull ?: Double.NaN
},
finishedAt = finishedAt,
createdAt = createdAt,
updatedAt = updatedAt
)
}
@@ -0,0 +1,8 @@
package com.digitoolsolutions.app.torquevaultkmp.data.repository
import com.digitoolsolutions.app.torquevaultkmp.domain.model.WorkOrder
interface WorkOrderRepository {
suspend fun fetchAbleWorkOrders(page: Int): List<WorkOrder>
suspend fun confirm(mac: String, type: Int)
}
@@ -0,0 +1,15 @@
package com.digitoolsolutions.app.torquevaultkmp.data.repository
import com.digitoolsolutions.app.torquevaultkmp.data.network.api.WorkOrderApi
import com.digitoolsolutions.app.torquevaultkmp.data.network.mapper.toDomain
import com.digitoolsolutions.app.torquevaultkmp.domain.model.WorkOrder
class WorkOrderRepositoryImpl(private val api: WorkOrderApi) : WorkOrderRepository {
override suspend fun fetchAbleWorkOrders(page: Int): List<WorkOrder> {
val dto = api.fetchAbleWorkOrders(page)
return dto.map { it.toDomain() }
}
override suspend fun confirm(mac: String, type: Int) {
api.confirm(mac, type)
}
}
@@ -0,0 +1,13 @@
package com.digitoolsolutions.app.torquevaultkmp.data.storage
import kotlin.reflect.KClass
interface AppStorage {
fun <T : Any> save(key: String, value: T)
fun <T : Any> load(key: String, type: KClass<T>): T?
fun remove(key: String)
}
inline fun <reified T : Any> AppStorage.load(key: String): T? {
return load(key, T::class)
}
@@ -0,0 +1,7 @@
package com.digitoolsolutions.app.torquevaultkmp.data.storage
object ReferKeys {
const val ACCESS_TOKEN = "access_token"
const val REFRESH_TOKEN = "refresh_token"
const val THEME = "theme"
}
@@ -0,0 +1,29 @@
package com.digitoolsolutions.app.torquevaultkmp.data.storage
class TokenManager(private val storage: AppStorage) {
private var accessToken: String? = null
private var refreshToken: String? = null
fun getAccessToken(): String? {
if (accessToken == null) accessToken = storage.load(ReferKeys.ACCESS_TOKEN)
return accessToken
}
fun getRefreshToken(): String? {
if (refreshToken == null) refreshToken = storage.load(ReferKeys.REFRESH_TOKEN)
return refreshToken
}
fun saveTokens(access: String, refresh: String) {
accessToken = access
refreshToken = refresh
storage.save(ReferKeys.ACCESS_TOKEN, access)
storage.save(ReferKeys.REFRESH_TOKEN, refresh)
}
fun clearTokens() {
accessToken = null
refreshToken = null
storage.remove(ReferKeys.ACCESS_TOKEN)
storage.remove(ReferKeys.REFRESH_TOKEN)
}
}
@@ -1,4 +1,16 @@
package com.digitoolsolutions.app.torquevaultkmp.di
class Koin {
import org.koin.core.context.startKoin
import org.koin.dsl.KoinAppDeclaration
fun initKoin(config: KoinAppDeclaration? = null) {
startKoin {
config?.invoke(this)
modules(
appModule,
networkModule,
viewModelModule,
platformModule
)
}
}
@@ -1,5 +1,46 @@
package com.digitoolsolutions.app.torquevaultkmp.di
import com.digitoolsolutions.app.torquevaultkmp.AppViewModel
import com.digitoolsolutions.app.torquevaultkmp.createPlatformHttpClient
import com.digitoolsolutions.app.torquevaultkmp.data.network.api.AuthApi
import com.digitoolsolutions.app.torquevaultkmp.data.network.api.WorkOrderApi
import com.digitoolsolutions.app.torquevaultkmp.data.repository.WorkOrderRepository
import com.digitoolsolutions.app.torquevaultkmp.data.repository.WorkOrderRepositoryImpl
import com.digitoolsolutions.app.torquevaultkmp.data.storage.TokenManager
import com.digitoolsolutions.app.torquevaultkmp.domain.usecase.FetchWorkOrdersUseCase
import com.digitoolsolutions.app.torquevaultkmp.screens.auth.AuthViewModel
import com.digitoolsolutions.app.torquevaultkmp.screens.home.HomeViewModel
import org.koin.core.module.Module
import org.koin.core.module.dsl.factoryOf
import org.koin.core.qualifier.named
import org.koin.dsl.module
val homeModule = module { }
expect val platformModule: Module
val appModule = module {
// TokenManager use AppStorage
single { TokenManager(get()) }
}
val networkModule = module {
single { "http://digitoolsolutions.synology.me:3000/api/v1" } // base URL
// Auth client (no interceptor to avoid circular dependency and recursion)
single(named("authClient")) { createPlatformHttpClient(get(), null) }
// AuthApi uses the auth client
single<AuthApi> { AuthApi(get(named("authClient")), get(), get()) }
// Main client uses AuthApi for its interceptor
single { createPlatformHttpClient(get(), get()) }
single<WorkOrderApi> { WorkOrderApi(get(), get()) }
single<WorkOrderRepository> { WorkOrderRepositoryImpl(get()) }
factory { FetchWorkOrdersUseCase(get()) }
}
val viewModelModule = module {
factoryOf(::HomeViewModel)
factoryOf(::AuthViewModel)
factoryOf(::AppViewModel)
}
@@ -0,0 +1,6 @@
package com.digitoolsolutions.app.torquevaultkmp.domain.model
data class LoginRequest(val username: String, val password: String)
data class RefreshRequest(val refresh: String)
data class LoginResponse(val access: String, val refresh: String)
data class RefreshResponse(val access: String)
@@ -0,0 +1,44 @@
package com.digitoolsolutions.app.torquevaultkmp.domain.model
val wheelsCode = mapOf(
"DF" to 0b0001,
"PF" to 0b0010,
"DR" to 0b0100,
"PR" to 0b1000,
"DRO" to 0b00010000,
"PRO" to 0b100000
)
fun WorkOrder.computeWheelsNuts(): Int {
var wNut = 0
var nutCount = 0
val wheelSer = services?.get("0")
wheelSer?.wheels?.forEach { wheelStr ->
if (wheelStr.isNotBlank()) {
wNut = wNut or (wheelsCode[wheelStr] ?: 0)
nutCount++
}
}
return (wNut shl 8) or nutCount
}
data class WorkOrder(
val id: String,
val status: String,
val car: String?,
val make: String?,
val licensePlate: String,
val services: Map<String, Service>?,
val measResult: Map<String, Double>?,
val measHistory: Map<String, Double>?,
val finishedAt: String?,
val createdAt: String,
val updatedAt: String?
)
data class Service(
val nut: Int?,
val status: Int,
val wheels: List<String>?,
val wrench: String?,
val torqueRequired: Double
)
@@ -0,0 +1,10 @@
package com.digitoolsolutions.app.torquevaultkmp.domain.usecase
import com.digitoolsolutions.app.torquevaultkmp.data.repository.WorkOrderRepository
import com.digitoolsolutions.app.torquevaultkmp.domain.model.WorkOrder
class FetchWorkOrdersUseCase(private val repository: WorkOrderRepository) {
suspend operator fun invoke(page: Int): List<WorkOrder> {
return repository.fetchAbleWorkOrders(page)
}
}
@@ -28,9 +28,9 @@ import org.jetbrains.compose.resources.painterResource
import org.koin.compose.viewmodel.koinViewModel
@Composable
fun MainScreen(
isLoggedIn: Boolean,
isDarkTheme: Boolean,
onThemeToggle: (Boolean) -> Unit,
isLoggedIn: Boolean,
) {
val destinations = listOf(
HomeDestination,
@@ -77,7 +77,7 @@ fun MainScreen(
) { innerPadding ->
NavHost(
navController = navController,
startDestination = HomeDestination.route,
startDestination = if (isLoggedIn) HomeDestination.route else AuthDestination.route,
modifier = Modifier.padding(innerPadding).fillMaxSize()
) {
composable(AuthDestination.route) { LoginScreen(navController) }
@@ -0,0 +1,43 @@
package com.digitoolsolutions.app.torquevaultkmp.screens.auth
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.digitoolsolutions.app.torquevaultkmp.data.network.api.AuthApi
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
sealed class LoginUiState {
object Idle : LoginUiState()
object Loading : LoginUiState()
object Success : LoginUiState()
data class Error(val message: String) : LoginUiState()
}
class AuthViewModel(
private val authApi: AuthApi
) : ViewModel() {
private val _loginState = MutableStateFlow<LoginUiState>(LoginUiState.Idle)
val loginState = _loginState.asStateFlow()
fun login(username: String, password: String) {
viewModelScope.launch {
_loginState.value = LoginUiState.Loading
try {
val success = authApi.login(username, password)
if (success) {
_loginState.value = LoginUiState.Success
} else {
_loginState.value = LoginUiState.Error("Login failed: Invalid credentials")
}
} catch (e: Exception) {
_loginState.value = LoginUiState.Error("Error: ${e.message}")
}
}
}
fun resetState() {
_loginState.value = LoginUiState.Idle
}
}
@@ -54,6 +54,7 @@ import com.digitoolsolutions.app.torquevaultkmp.screens.home.HomeDestination
import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.painterResource
import org.jetbrains.compose.resources.stringResource
import org.koin.compose.viewmodel.koinViewModel
import torquevaultkmp.composeapp.generated.resources.Res
import torquevaultkmp.composeapp.generated.resources.btn_login
import torquevaultkmp.composeapp.generated.resources.dts_text
@@ -64,17 +65,17 @@ import torquevaultkmp.composeapp.generated.resources.server_url_placeholder
@Composable
fun LoginScreen(
navController: NavController,
// viewModel: AuthViewModel = hiltViewModel()
navController: NavController
) {
// val loginState by viewModel.loginState.collectAsState()
val viewModel = koinViewModel<AuthViewModel>()
val loginState by viewModel.loginState.collectAsState()
LoginScreenContent(
// viewModel = viewModel,
// loginState = loginState,
viewModel = viewModel,
loginState = loginState,
onLogin = { serverUrl, username, password ->
// viewModel.updateServerUrl(serverUrl)
// viewModel.login(username, password)
viewModel.login(username, password)
},
onLoginSuccess = {
navController.navigate(HomeDestination.route)
@@ -85,8 +86,8 @@ fun LoginScreen(
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun LoginScreenContent(
// viewModel: AuthViewModel,
// loginState: LoginUiState,
viewModel: AuthViewModel,
loginState: LoginUiState,
onLogin: (String, String, String) -> Unit,
onLoginSuccess: () -> Unit
) {
@@ -99,14 +100,14 @@ fun LoginScreenContent(
val snackbarHostState = remember { SnackbarHostState() }
val scope = rememberCoroutineScope()
// LaunchedEffect(loginState) {
// if (loginState is LoginUiState.Error) {
// snackbarHostState.showSnackbar(loginState.message)
// }
// if (loginState is LoginUiState.Success) {
// onLoginSuccess()
// }
// }
LaunchedEffect(loginState) {
if (loginState is LoginUiState.Error) {
snackbarHostState.showSnackbar(loginState.message)
}
if (loginState is LoginUiState.Success) {
onLoginSuccess()
}
}
Scaffold(
modifier = Modifier.imePadding(),
snackbarHost = { SnackbarHost(snackbarHostState) })
@@ -203,18 +204,18 @@ fun LoginScreenContent(
else
onLogin(serverUrl.trim(), username.trim(), password.trim())
},
// enabled = loginState !is LoginUiState.Loading
enabled = loginState !is LoginUiState.Loading
) {
Text(stringResource(Res.string.btn_login))
// if (loginState is LoginUiState.Loading) {
// Spacer(modifier = Modifier.width(16.dp))
// CircularProgressIndicator(
// modifier = Modifier.size(20.dp),
// color = Color.Blue,
// strokeWidth = 2.dp
// )
//
// }
if (loginState is LoginUiState.Loading) {
Spacer(modifier = Modifier.width(16.dp))
CircularProgressIndicator(
modifier = Modifier.size(20.dp),
color = Color.Blue,
strokeWidth = 2.dp
)
}
}
}
}
@@ -224,8 +225,8 @@ fun LoginScreenContent(
@Composable
private fun LoginScreenPreview() {
LoginScreenContent(
// viewModel = viewModel(),
// loginState = LoginUiState.Idle,
viewModel = viewModel(),
loginState = LoginUiState.Idle,
onLogin = { _, _, _ -> },
onLoginSuccess = {}
)
@@ -27,6 +27,7 @@ import androidx.compose.material3.SwipeToDismissBoxValue
import androidx.compose.material3.Text
import androidx.compose.material3.rememberSwipeToDismissBoxState
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
@@ -41,9 +42,14 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.navigation.NavController
import com.digitoolsolutions.app.torquevaultkmp.components.AppBar
import com.digitoolsolutions.app.torquevaultkmp.screens.auth.AuthDestination
import com.digitoolsolutions.app.torquevaultkmp.screens.home.views.HomeEmpty
import com.digitoolsolutions.app.torquevaultkmp.screens.home.views.HomeItem
import com.digitoolsolutions.app.torquevaultkmp.utils.ForceLogoutException
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.stringResource
import org.koin.compose.viewmodel.koinViewModel
import torquevaultkmp.composeapp.generated.resources.Res
import torquevaultkmp.composeapp.generated.resources.home_title
//import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
@@ -65,31 +71,49 @@ fun HomeScreen(
) {
val snackbarHostState = remember { SnackbarHostState() }
// val connectedDevice by bleScannerViewModel.connectedDevices.collectAsState(initial = emptyList())
val viewModel = koinViewModel<HomeViewModel>()
val workOrders by viewModel.workOrders.collectAsState()
Scaffold (
LaunchedEffect(Unit) {
viewModel.loadWorkOrders()
}
LaunchedEffect(viewModel) {
viewModel.error.collectLatest { error ->
if (error is ForceLogoutException) {
navController.navigate(AuthDestination.route) {
popUpTo(0) { inclusive = true }
}
} else {
snackbarHostState.showSnackbar(error.message ?: "Unknown error")
}
}
}
Scaffold(
modifier = Modifier.imePadding(),
topBar = {
AppBar(
title = {Text(stringResource(Res.string.home_title))},
title = { Text(stringResource(Res.string.home_title)) },
)
},
snackbarHost = { SnackbarHost(snackbarHostState) })
{ padding ->
Column (
Column(
modifier = Modifier
.fillMaxSize()
.imePadding()
.padding(padding)
.padding(horizontal = 16.dp, vertical = 12.dp),
) {
// if(connectedDevice.isEmpty())
// HomeEmpty()
// else
// LazyColumn {
// items(connectedDevice) { device ->
// HomeItem(device)
// }
// }
if (workOrders.isEmpty())
HomeEmpty()
else
LazyColumn {
items(workOrders) { workOrder ->
HomeItem(workOrder)
}
}
}
}
}
@@ -0,0 +1,33 @@
package com.digitoolsolutions.app.torquevaultkmp.screens.home
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.digitoolsolutions.app.torquevaultkmp.domain.model.WorkOrder
import com.digitoolsolutions.app.torquevaultkmp.domain.usecase.FetchWorkOrdersUseCase
import com.digitoolsolutions.app.torquevaultkmp.utils.ForceLogoutException
import kotlinx.coroutines.flow.MutableSharedFlow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asSharedFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.launch
class HomeViewModel(
private val fetchWorkOrdersUseCase: FetchWorkOrdersUseCase
): ViewModel() {
private val _workOrders = MutableStateFlow<List<WorkOrder>>(emptyList())
val workOrders = _workOrders.asStateFlow()
private val _error = MutableSharedFlow<Throwable>()
val error = _error.asSharedFlow()
fun loadWorkOrders() {
viewModelScope.launch {
try {
val result = fetchWorkOrdersUseCase(page = 1)
_workOrders.value = result
} catch (e: Exception) {
_error.emit(e)
}
}
}
}
@@ -1,4 +1,4 @@
//package com.digitoolsolutions.app.torquevaultkmp.screens.logs
package com.digitoolsolutions.app.torquevaultkmp.screens.logs//package com.digitoolsolutions.app.torquevaultkmp.screens.logs
//
//import androidx.compose.runtime.Composable
//import androidx.compose.runtime.Stable
@@ -1,4 +1,4 @@
package com.digitoolsolutions.android.torquevault.ui.theme
package com.digitoolsolutions.app.torquevaultkmp.theme
//import android.os.Build
import androidx.compose.foundation.isSystemInDarkTheme
@@ -0,0 +1,11 @@
package com.digitoolsolutions.app.torquevaultkmp.utils
import io.ktor.http.HttpStatusCode
class ApiException(val status: HttpStatusCode, val body: String) : Exception(
"API error ${status.value}: $body"
)
class RetryWithNewTokenException : Exception(">>>>> Access token expired, retry with new token")
class ForceLogoutException : Exception(">>>>> Refresh token expired, force logout")