Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • main
1 result

Target

Select target project
  • justJanne/meteroid
1 result
Select Git revision
  • main
1 result
Show changes
Commits on Source (2)
Show whitespace changes
Inline Side-by-side
Showing
with 666 additions and 354 deletions
api/src/main/kotlin/de/chaosdorf/mete/AuditEntryId.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.mete
import kotlinx.serialization.Serializable
@Serializable
@JvmInline
value class AuditEntryId(val value: Long)
api/src/main/kotlin/de/chaosdorf/mete/v1/AuditEntryModelV1.kt
View file @ 21a9bafd
......@@ -24,13 +24,17 @@
package de.chaosdorf.mete.v1
import de.chaosdorf.mete.AuditEntryId
import de.chaosdorf.mete.DrinkId
import de.chaosdorf.mete.UserId
import kotlinx.datetime.Instant
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@Serializable
data class AuditEntryModelV1(
val id: AuditEntryId,
@SerialName("created_at")
val createdAt: Instant,
val difference: Double,
val drink: DrinkId,
val user: UserId,
val createdAt: Instant
val drink: DrinkId?
)
api/src/main/kotlin/de/chaosdorf/mete/v1/AuditResponseV1.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.mete.v1
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@Serializable
data class AuditResponseV1(
@SerialName("payments_sum")
val payments: Double,
@SerialName("deposits_sum")
val deposits: Double,
@SerialName("sum")
val total: Double,
@SerialName("audits")
val entries: List<AuditEntryModelV1>
)
api/src/main/kotlin/de/chaosdorf/mete/v1/MeteApiV1.kt
View file @ 21a9bafd
......@@ -29,13 +29,16 @@ import de.chaosdorf.mete.PwaManifest
import de.chaosdorf.mete.UserId
import retrofit2.http.GET
import retrofit2.http.Path
import retrofit2.http.Query
interface MeteApiV1 {
@GET("manifest.json")
suspend fun getManifest(): PwaManifest?
@GET("api/v1/audits.json")
suspend fun getAudits(): List<AuditEntryModelV1>
suspend fun getAudits(
@Query("user") user: Long? = null
): AuditResponseV1
@GET("api/v1/barcodes.json")
suspend fun listBarcodes(): List<BarcodeModelV1>
......
api/src/main/kotlin/de/chaosdorf/mete/v1/UserModelV1.kt
View file @ 21a9bafd
......@@ -26,6 +26,7 @@ package de.chaosdorf.mete.v1
import de.chaosdorf.mete.UserId
import kotlinx.datetime.Instant
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
@Serializable
......@@ -33,7 +34,9 @@ data class UserModelV1(
val id: UserId,
val name: String,
val email: String,
@SerialName("created_at")
val createdAt: Instant,
@SerialName("updated_at")
val updatedAt: Instant,
val balance: Double,
val active: Boolean,
......
app/build.gradle.kts
View file @ 21a9bafd
......@@ -56,6 +56,9 @@ android {
dependencies {
implementation(libs.kotlin.stdlib)
implementation(libs.kotlinx.datetime)
implementation(libs.kotlinx.serialization.json)
coreLibraryDesugaring(libs.desugar.jdk)
implementation(libs.kotlinx.coroutines.android)
testImplementation(libs.kotlinx.coroutines.test)
......@@ -86,14 +89,13 @@ dependencies {
implementation(libs.androidx.navigation.compose)
implementation(libs.okhttp)
implementation(libs.kotlinx.serialization.json)
implementation(libs.coil.compose)
implementation(libs.hilt.navigation)
implementation(libs.hilt.android)
ksp(libs.hilt.compiler)
implementation("androidx.datastore:datastore-preferences:1.0.0")
implementation(libs.androidx.datastore.preferences)
implementation(project(":api"))
implementation(project(":persistence"))
......
app/src/main/kotlin/de/chaosdorf/meteroid/MainActivity.kt
View file @ 21a9bafd
......@@ -27,99 +27,15 @@ package de.chaosdorf.meteroid
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.twotone.Money
import androidx.compose.material3.BottomAppBar
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.ListItem
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.material3.TopAppBar
import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.collectAsState
import androidx.compose.runtime.getValue
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.ViewModel
import androidx.lifecycle.lifecycleScope
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavDestination.Companion.hierarchy
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.currentBackStackEntryAsState
import androidx.navigation.compose.navigation
import androidx.navigation.compose.rememberNavController
import coil.compose.AsyncImage
import dagger.hilt.android.AndroidEntryPoint
import dagger.hilt.android.lifecycle.HiltViewModel
import de.chaosdorf.mete.v1.MeteApiV1Factory
import de.chaosdorf.meteroid.icons.MeteroidIcons
import de.chaosdorf.meteroid.icons.twotone.WaterFull
import de.chaosdorf.meteroid.model.Drink
import de.chaosdorf.meteroid.model.DrinkRepository
import de.chaosdorf.meteroid.model.Server
import de.chaosdorf.meteroid.model.ServerId
import de.chaosdorf.meteroid.model.ServerRepository
import de.chaosdorf.meteroid.ui.AppRouter
import de.chaosdorf.meteroid.ui.theme.MeteroidTheme
import de.chaosdorf.meteroid.util.findBestIcon
import de.chaosdorf.meteroid.util.resolve
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.debounce
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import javax.inject.Inject
import kotlin.time.Duration.Companion.milliseconds
@AndroidEntryPoint
class MainActivity : ComponentActivity() {
@Inject
lateinit var accountPreferences: AccountPreferences
@Inject
lateinit var serverRepository: ServerRepository
@Inject
lateinit var drinkSyncHandler: DrinkSyncHandler
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val server = accountPreferences.state
.mapLatest { it.server }
.flatMapLatest {
it?.let { serverRepository.getFlow(it) }
?: flowOf<Server?>(null)
}
lifecycleScope.launch {
server.collectLatest {
it?.let { server ->
drinkSyncHandler.sync(server)
}
}
}
setContent {
MeteroidTheme {
AppRouter()
......@@ -127,247 +43,3 @@ class MainActivity : ComponentActivity() {
}
}
}
@HiltViewModel
class AppViewModel @Inject constructor(
private val accountPreferences: AccountPreferences,
private val serverRepository: ServerRepository,
private val drinkSyncHandler: DrinkSyncHandler
) : ViewModel() {
val server: StateFlow<Server?> = accountPreferences.state
.mapLatest { it.server }
.flatMapLatest { serverId ->
serverRepository.getAllFlow()
.mapLatest { list ->
list.firstOrNull { server -> server.serverId == serverId }
}
}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
init {
viewModelScope.launch {
server.collectLatest {
it?.let { server ->
drinkSyncHandler.sync(server)
}
}
}
}
suspend fun selectServer(server: ServerId) {
accountPreferences.setServer(server)
}
}
@Composable
fun AppRouter(viewModel: AppViewModel = viewModel()) {
val scope = rememberCoroutineScope()
val server by viewModel.server.collectAsState()
val navController = rememberNavController()
LaunchedEffect(server) {
if (server == null) {
navController.navigate("accounts/list")
}
}
Scaffold(topBar = {
val navBackStackEntry by navController.currentBackStackEntryAsState()
val currentDestination = navBackStackEntry?.destination
if (currentDestination?.hierarchy?.any { it.route == "main" } == true) {
TopAppBar(title = { Text("Meteroid") }, navigationIcon = {
IconButton(onClick = { navController.navigate("accounts") }) {
Icon(Icons.AutoMirrored.Default.ArrowBack, contentDescription = null)
}
})
} else if (currentDestination?.hierarchy?.any { it.route == "accounts/list" } == true) {
TopAppBar(title = { Text("Meteroid") }, navigationIcon = {
IconButton(onClick = { navController.navigate("main") }) {
Icon(Icons.Default.Close, contentDescription = null)
}
})
}
}, bottomBar = {
val navBackStackEntry by navController.currentBackStackEntryAsState()
val currentDestination = navBackStackEntry?.destination
if (currentDestination?.hierarchy?.any { it.route == "main" } == true) {
BottomAppBar(actions = {
IconButton(onClick = { navController.navigate("main/purchase") }) {
Icon(MeteroidIcons.TwoTone.WaterFull, contentDescription = null)
}
IconButton(onClick = { navController.navigate("main/deposit") }) {
Icon(Icons.TwoTone.Money, contentDescription = null)
}
})
}
}) { padding ->
NavHost(navController, startDestination = "main", Modifier.padding(padding)) {
navigation(route = "accounts", startDestination = "accounts/list") {
composable("accounts/list") { backStackEntry ->
ServerListScreen(
hiltViewModel(),
onAddServer = { navController.navigate("accounts/addServer") },
onSelectServer = {
scope.launch {
viewModel.selectServer(it)
navController.navigate("main")
}
}
)
}
composable("accounts/addServer") { backStackEntry ->
AddServerScreen(
hiltViewModel(),
onAddServer = { navController.navigate("accounts/list") }
)
}
}
navigation(route = "main", startDestination = "main/purchase") {
/*
composable("users") { backStackEntry ->
val viewModel = hiltViewModel<UserListViewModel>()
UserListScreen(viewModel)
}
*/
composable("main/purchase") { backStackEntry ->
DrinkListScreen(hiltViewModel())
}
composable("main/deposit") { backStackEntry ->
}
}
}
}
}
@HiltViewModel
class AddServerViewModel @Inject constructor(
private val repository: ServerRepository
) : ViewModel() {
val url = MutableStateFlow("")
private suspend fun buildServer(
id: ServerId,
url: String
): Server? = try {
val api = MeteApiV1Factory.newInstance(url)
val manifest = api.getManifest()
val icon = manifest?.findBestIcon()
Server(
id,
manifest?.name,
url,
icon?.resolve(url)
)
} catch (_: Exception) {
null
}
val server: StateFlow<Server?> = url
.debounce(300.milliseconds)
.mapLatest { buildServer(ServerId(-1), it) }
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), null)
suspend fun addServer() {
val highestServerId = repository.getAll().maxOfOrNull { it.serverId.value } ?: 0
val serverId = ServerId(highestServerId + 1)
val server = buildServer(serverId, url.value)
if (server != null) {
repository.save(server)
}
}
}
@Composable
fun AddServerScreen(viewModel: AddServerViewModel, onAddServer: () -> Unit) {
val scope = rememberCoroutineScope()
val url by viewModel.url.collectAsState()
val server by viewModel.server.collectAsState()
Column {
TextField(
label = { Text("Server URL") },
value = url,
onValueChange = { viewModel.url.value = it }
)
Button(onClick = {
scope.launch {
viewModel.addServer()
onAddServer()
}
}) {
Text("Add Server")
}
server?.let { server ->
Text(server.url)
Text(server.name ?: "null1")
AsyncImage(model = server.logoUrl, contentDescription = null)
}
}
}
@Preview
@Composable
fun ServerListScreen(
viewModel: ServerListViewModel = viewModel(),
onAddServer: () -> Unit = {},
onSelectServer: (ServerId) -> Unit = {}
) {
val servers by viewModel.servers.collectAsState()
LazyColumn {
items(servers) { server ->
ListItem(
headlineContent = { Text(server.name ?: server.url) },
modifier = Modifier.clickable {
onSelectServer(server.serverId)
}
)
}
item {
ListItem(
headlineContent = { Text("Add Server") },
modifier = Modifier.clickable {
onAddServer()
}
)
}
}
}
@Preview
@Composable
fun DrinkListScreen(
viewModel: DrinkListViewModel = viewModel()
) {
val drinks by viewModel.drinks.collectAsState()
LazyColumn {
items(drinks) { drink ->
ListItem(headlineContent = { Text(drink.name) },
supportingContent = { Text("${drink.volume}l · ${drink.price}€") })
}
}
}
@HiltViewModel
class DrinkListViewModel @Inject constructor(
drinkRepository: DrinkRepository,
accountPreferences: AccountPreferences
) : ViewModel() {
private val serverId: Flow<ServerId?> = accountPreferences.state.mapLatest { it.server }
val drinks: StateFlow<List<Drink>> = serverId.flatMapLatest {
it?.let { serverId ->
drinkRepository.getAllFlow(serverId)
} ?: flowOf(emptyList())
}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptyList())
}
@HiltViewModel
class ServerListViewModel @Inject constructor(
serverRepository: ServerRepository
) : ViewModel() {
val servers: StateFlow<List<Server>> = serverRepository.getAllFlow()
.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), emptyList())
}
app/src/main/kotlin/de/chaosdorf/meteroid/di/DatabaseModule.kt
View file @ 21a9bafd
......@@ -33,6 +33,7 @@ import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import de.chaosdorf.meteroid.MeteroidDatabase
import de.chaosdorf.meteroid.model.DrinkRepository
import de.chaosdorf.meteroid.model.PurchaseRepository
import de.chaosdorf.meteroid.model.ServerRepository
import de.chaosdorf.meteroid.model.UserRepository
import javax.inject.Singleton
......@@ -59,6 +60,11 @@ object DatabaseModule {
database: MeteroidDatabase
): UserRepository = database.users()
@Provides
fun providePurchaseRepository(
database: MeteroidDatabase
): PurchaseRepository = database.purchases()
@Provides
fun provideServerRepository(
database: MeteroidDatabase
......
app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt
View file @ 21a9bafd
......@@ -34,8 +34,8 @@ import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import de.chaosdorf.meteroid.AccountPreferences
import de.chaosdorf.meteroid.AccountPreferencesImpl
import de.chaosdorf.meteroid.storage.AccountPreferences
import de.chaosdorf.meteroid.storage.AccountPreferencesImpl
import javax.inject.Singleton
val Context.accountDataStore: DataStore<Preferences> by preferencesDataStore(name = "account")
......
app/src/main/kotlin/de/chaosdorf/meteroid/sample/SampleDrinkProvider.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid.sample
import androidx.compose.ui.tooling.preview.PreviewParameterProvider
import de.chaosdorf.mete.DrinkId
import de.chaosdorf.meteroid.model.Drink
import de.chaosdorf.meteroid.model.ServerId
import kotlinx.datetime.Instant
class SampleDrinkProvider : PreviewParameterProvider<Drink> {
override val values = sequenceOf(
Drink(
serverId = ServerId(-1),
drinkId = DrinkId(27),
active = true,
name = "Club Mate",
volume = 0.5,
caffeine = null,
price = 1.5,
createdAt = Instant.fromEpochMilliseconds(1684598011800),
updatedAt = Instant.fromEpochMilliseconds(1684607122132),
logoUrl = "http://192.168.188.36:8080/system/drinks/logos/000/000/027/thumb/logo.png",
logoFileName = "logo.png",
logoContentType = "image/png",
logoFileSize = 183063,
logoUpdatedAt = Instant.fromEpochMilliseconds(1684607121995)
),
Drink(
serverId = ServerId(-1),
drinkId = DrinkId(15),
active = false,
name = "Paulaner Spezi",
volume = 0.5,
caffeine = null,
price = 1.5,
createdAt = Instant.fromEpochMilliseconds(1684597806099),
updatedAt = Instant.fromEpochMilliseconds(1684607346944),
logoUrl = "http://192.168.188.36:8080/system/drinks/logos/000/000/015/thumb/logo.png",
logoFileName = "logo.png",
logoContentType = "image/png",
logoFileSize = 173265,
logoUpdatedAt = Instant.fromEpochMilliseconds(1684607346835)
)
)
}
app/src/main/kotlin/de/chaosdorf/meteroid/AccountPreferences.kt → app/src/main/kotlin/de/chaosdorf/meteroid/storage/AccountPreferences.kt
View file @ 21a9bafd
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid
package de.chaosdorf.meteroid.storage
import de.chaosdorf.mete.UserId
import de.chaosdorf.meteroid.model.ServerId
......@@ -37,5 +37,5 @@ interface AccountPreferences {
val state: Flow<State>
suspend fun setServer(server: ServerId?)
suspend fun setUser(userId: UserId?)
suspend fun setUser(user: UserId?)
}
app/src/main/kotlin/de/chaosdorf/meteroid/AccountPreferencesImpl.kt → app/src/main/kotlin/de/chaosdorf/meteroid/storage/AccountPreferencesImpl.kt
View file @ 21a9bafd
......@@ -22,7 +22,7 @@
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid
package de.chaosdorf.meteroid.storage
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
......@@ -55,9 +55,9 @@ class AccountPreferencesImpl @Inject constructor(
}
}
override suspend fun setUser(userId: UserId?) {
override suspend fun setUser(user: UserId?) {
dataStore.edit {
it[SERVER_KEY] = userId?.value ?: -1L
it[USER_KEY] = user?.value ?: -1L
}
}
......
app/src/main/kotlin/de/chaosdorf/meteroid/sync/AccountProvider.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid.sync
import de.chaosdorf.meteroid.model.Server
import de.chaosdorf.meteroid.model.ServerRepository
import de.chaosdorf.meteroid.model.User
import de.chaosdorf.meteroid.model.UserRepository
import de.chaosdorf.meteroid.storage.AccountPreferences
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.flowOf
import kotlinx.coroutines.flow.mapLatest
import javax.inject.Inject
class AccountProvider @Inject constructor(
accountPreferences: AccountPreferences,
serverRepository: ServerRepository,
userRepository: UserRepository,
) {
val account: Flow<Pair<Server, User?>?> =
accountPreferences.state.flatMapLatest { preferences ->
if (preferences.server == null) {
flowOf(null)
} else {
serverRepository.getFlow(preferences.server).flatMapLatest { server ->
if (server == null) {
flowOf(null)
} else if (preferences.user == null) {
flowOf(Pair(server, null))
} else {
userRepository.getFlow(server.serverId, preferences.user)
.mapLatest { user -> Pair(server, user) }
}
}
}
}
}
app/src/main/kotlin/de/chaosdorf/meteroid/DrinkSyncHandler.kt → app/src/main/kotlin/de/chaosdorf/meteroid/sync/DrinkSyncHandler.kt
View file @ 21a9bafd
......@@ -22,11 +22,12 @@
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid
package de.chaosdorf.meteroid.sync
import androidx.room.withTransaction
import de.chaosdorf.mete.DrinkId
import de.chaosdorf.mete.v1.MeteApiV1Factory
import de.chaosdorf.meteroid.MeteroidDatabase
import de.chaosdorf.meteroid.model.Drink
import de.chaosdorf.meteroid.model.DrinkRepository
import de.chaosdorf.meteroid.model.Server
......@@ -58,6 +59,6 @@ class DrinkSyncHandler @Inject constructor(
override suspend fun loadCurrent(context: Server): List<Drink> {
val api = MeteApiV1Factory.newInstance(context.url)
val loadedEntries = api.listDrinks()
return loadedEntries.map { Drink.fromModelV1(context.serverId, it) }
return loadedEntries.map { Drink.fromModelV1(context, it) }
}
}
app/src/main/kotlin/de/chaosdorf/meteroid/sync/PurchaseSyncHandler.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid.sync
import androidx.room.withTransaction
import de.chaosdorf.mete.AuditEntryId
import de.chaosdorf.mete.UserId
import de.chaosdorf.mete.v1.MeteApiV1Factory
import de.chaosdorf.meteroid.MeteroidDatabase
import de.chaosdorf.meteroid.model.Purchase
import de.chaosdorf.meteroid.model.PurchaseRepository
import de.chaosdorf.meteroid.model.Server
import de.chaosdorf.meteroid.model.ServerId
import javax.inject.Inject
class PurchaseSyncHandler @Inject constructor(
private val db: MeteroidDatabase,
private val repository: PurchaseRepository
) : SyncHandler<Pair<Server, UserId>, Purchase, PurchaseSyncHandler.Key>() {
data class Key(
val server: ServerId, val purchase: AuditEntryId
)
override suspend fun withTransaction(block: suspend () -> Unit) =
db.withTransaction(block)
override suspend fun store(entry: Purchase) =
repository.save(entry)
override suspend fun delete(key: Key) =
repository.delete(key.server, key.purchase)
override fun entryToKey(entry: Purchase) = Key(entry.serverId, entry.purchaseId)
override suspend fun loadStored(context: Pair<Server, UserId>): List<Purchase> =
repository.getAll(context.first.serverId, context.second)
override suspend fun loadCurrent(context: Pair<Server, UserId>): List<Purchase> {
val (server, userId) = context
val api = MeteApiV1Factory.newInstance(server.url)
val loadedEntries = api.getAudits(user = userId.value).entries
return loadedEntries.map { Purchase.fromModelV1(server, userId, it) }
}
}
app/src/main/kotlin/de/chaosdorf/meteroid/SyncHandler.kt → app/src/main/kotlin/de/chaosdorf/meteroid/sync/SyncHandler.kt
View file @ 21a9bafd
......@@ -22,8 +22,9 @@
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid
package de.chaosdorf.meteroid.sync
import android.util.Log
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
......@@ -31,7 +32,17 @@ abstract class SyncHandler<Context, Entry, Key> {
sealed class State {
data object Idle : State()
data object Loading : State()
data class Error(val message: String) : State()
data class Error(val message: String = "") : State() {
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
return true
}
override fun hashCode(): Int {
return javaClass.hashCode()
}
}
}
abstract suspend fun withTransaction(block: suspend () -> Unit)
......@@ -48,7 +59,12 @@ abstract class SyncHandler<Context, Entry, Key> {
val state: StateFlow<State> = _state
suspend fun sync(context: Context) {
if (_state.compareAndSet(State.Idle, State.Loading)) {
if (_state.compareAndSet(State.Idle, State.Loading) || _state.compareAndSet(
State.Error(),
State.Loading
)
) {
Log.w(this::class.simpleName, "Started sync")
try {
val loadedEntries = loadCurrent(context)
withTransaction {
......@@ -64,9 +80,13 @@ abstract class SyncHandler<Context, Entry, Key> {
}
}
_state.value = State.Idle
Log.w(this::class.simpleName, "Finished sync")
} catch (e: Exception) {
Log.e(this::class.simpleName, "Error while syncing data", e)
_state.value = State.Error("Error while syncing data: $e")
}
} else {
Log.w(this::class.simpleName, "Already syncing, disregarding sync request")
}
}
}
app/src/main/kotlin/de/chaosdorf/meteroid/sync/SyncViewModel.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid.sync
import androidx.lifecycle.ViewModel
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
@HiltViewModel
class SyncViewModel @Inject constructor(
) : ViewModel() {
}
app/src/main/kotlin/de/chaosdorf/meteroid/sync/UserSyncHandler.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid.sync
import androidx.room.withTransaction
import de.chaosdorf.mete.UserId
import de.chaosdorf.mete.v1.MeteApiV1Factory
import de.chaosdorf.meteroid.MeteroidDatabase
import de.chaosdorf.meteroid.model.Server
import de.chaosdorf.meteroid.model.ServerId
import de.chaosdorf.meteroid.model.User
import de.chaosdorf.meteroid.model.UserRepository
import javax.inject.Inject
class UserSyncHandler @Inject constructor(
private val db: MeteroidDatabase,
private val repository: UserRepository
) : SyncHandler<Server, User, UserSyncHandler.Key>() {
data class Key(
val server: ServerId, val user: UserId
)
override suspend fun withTransaction(block: suspend () -> Unit) =
db.withTransaction(block)
override suspend fun store(entry: User) =
repository.save(entry)
override suspend fun delete(key: Key) =
repository.delete(key.server, key.user)
override fun entryToKey(entry: User) = Key(entry.serverId, entry.userId)
override suspend fun loadStored(context: Server): List<User> =
repository.getAll(context.serverId)
override suspend fun loadCurrent(context: Server): List<User> {
val api = MeteApiV1Factory.newInstance(context.url)
val loadedEntries = api.listUsers()
return loadedEntries.map { User.fromModelV1(context, it) }
}
}
app/src/main/kotlin/de/chaosdorf/meteroid/ui/AppRouter.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid.ui
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.material3.CircularProgressIndicator
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.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.navigation
import androidx.navigation.compose.rememberNavController
import de.chaosdorf.meteroid.ui.drinks.DrinkListScreen
import de.chaosdorf.meteroid.ui.drinks.DrinkListViewModel
import de.chaosdorf.meteroid.ui.money.MoneyListScreen
import de.chaosdorf.meteroid.ui.money.MoneyListViewModel
import de.chaosdorf.meteroid.ui.navigation.Routes
import de.chaosdorf.meteroid.ui.purchases.PurchaseListScreen
import de.chaosdorf.meteroid.ui.purchases.PurchaseViewModel
import de.chaosdorf.meteroid.ui.servers.AddServerScreen
import de.chaosdorf.meteroid.ui.servers.ServerListScreen
import de.chaosdorf.meteroid.ui.users.UserListScreen
import kotlinx.coroutines.launch
@Composable
fun AppRouter(viewModel: AppViewModel = viewModel()) {
val scope = rememberCoroutineScope()
val navController = rememberNavController()
val initState by viewModel.initState.collectAsState()
LaunchedEffect(initState) {
when (initState) {
AppViewModel.InitState.LOADING -> navController.navigate(Routes.Init)
AppViewModel.InitState.CREATE_SERVER -> navController.navigate(Routes.Servers.Add)
AppViewModel.InitState.SELECT_SERVER -> navController.navigate(Routes.Servers.List)
AppViewModel.InitState.SELECT_USER -> navController.navigate(Routes.Users.List)
AppViewModel.InitState.HOME -> navController.navigate(Routes.Home.Root)
}
}
NavHost(navController, startDestination = Routes.Init) {
composable(route = Routes.Init) { _ ->
Box(contentAlignment = Alignment.Center) {
Column {
CircularProgressIndicator()
Text("Loading")
}
}
}
navigation(route = Routes.Servers.Root, startDestination = Routes.Servers.List) {
composable(Routes.Servers.List) { _ ->
ServerListScreen(
hiltViewModel(),
onAdd = { navController.navigate(Routes.Servers.Add) },
onSelect = {
scope.launch {
viewModel.selectServer(it)
navController.navigate(Routes.Users.List)
}
}
)
}
composable(Routes.Servers.Add) { _ ->
AddServerScreen(
hiltViewModel(),
onAdd = { navController.navigate(Routes.Servers.List) }
)
}
}
navigation(route = Routes.Users.Root, startDestination = Routes.Users.List) {
composable(Routes.Users.List) { _ ->
UserListScreen(
hiltViewModel(),
onAdd = { TODO() },
onSelect = {
scope.launch {
viewModel.selectUser(it)
navController.navigate(Routes.Home.Root)
}
},
onBack = { navController.navigate(Routes.Servers.Root) },
)
}
/*
composable(Routes.Users.Add) { _ ->
AddUserScreen(
hiltViewModel(),
onAdd = { navController.navigate(Routes.Users.List) }
)
}
*/
}
navigation(route = Routes.Home.Root, startDestination = Routes.Home.Purchase) {
composable(Routes.Home.Purchase) { _ ->
val drinkListViewModel = hiltViewModel<DrinkListViewModel>()
DrinkListScreen(drinkListViewModel, navController::navigate)
}
composable(Routes.Home.Deposit) { _ ->
val moneyListViewModel = hiltViewModel<MoneyListViewModel>()
MoneyListScreen(moneyListViewModel, navController::navigate)
}
composable(Routes.Home.History) { _ ->
val purchaseViewModel = hiltViewModel<PurchaseViewModel>()
PurchaseListScreen(purchaseViewModel, navController::navigate)
}
}
}
}
app/src/main/kotlin/de/chaosdorf/meteroid/ui/AppViewModel.kt 0 → 100644
View file @ 21a9bafd
/*
* The MIT License (MIT)
*
* Copyright (c) 2013-2023 Chaosdorf e.V.
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/
package de.chaosdorf.meteroid.ui
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import dagger.hilt.android.lifecycle.HiltViewModel
import de.chaosdorf.mete.UserId
import de.chaosdorf.meteroid.model.Server
import de.chaosdorf.meteroid.model.ServerId
import de.chaosdorf.meteroid.model.ServerRepository
import de.chaosdorf.meteroid.storage.AccountPreferences
import de.chaosdorf.meteroid.sync.AccountProvider
import de.chaosdorf.meteroid.sync.DrinkSyncHandler
import de.chaosdorf.meteroid.sync.PurchaseSyncHandler
import de.chaosdorf.meteroid.sync.UserSyncHandler
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.launchIn
import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.onEach
import kotlinx.coroutines.flow.stateIn
import javax.inject.Inject
@HiltViewModel
class AppViewModel @Inject constructor(
accountProvider: AccountProvider,
private val accountPreferences: AccountPreferences,
private val serverRepository: ServerRepository,
private val userSyncHandler: UserSyncHandler,
private val drinkSyncHandler: DrinkSyncHandler,
private val purchaseSyncHandler: PurchaseSyncHandler
) : ViewModel() {
val initState: StateFlow<InitState> = accountPreferences.state
.flatMapLatest { preferences ->
serverRepository.getAllFlow()
.mapLatest { it.map(Server::serverId) }
.mapLatest { servers ->
if (servers.isEmpty()) InitState.CREATE_SERVER
else if (!servers.contains(preferences.server)) InitState.SELECT_SERVER
else if (preferences.user == null) InitState.SELECT_USER
else InitState.HOME
}
}.stateIn(viewModelScope, SharingStarted.WhileSubscribed(), InitState.LOADING)
init {
accountProvider.account.distinctUntilChanged().onEach { account ->
account?.let { (server, user) ->
userSyncHandler.sync(server)
drinkSyncHandler.sync(server)
user?.let { user ->
purchaseSyncHandler.sync(Pair(server, user.userId))
}
}
}.launchIn(viewModelScope)
}
suspend fun selectServer(server: ServerId) {
accountPreferences.setServer(server)
accountPreferences.setUser(null)
}
suspend fun selectUser(user: UserId) {
accountPreferences.setUser(user)
}
enum class InitState {
LOADING,
CREATE_SERVER,
SELECT_SERVER,
SELECT_USER,
HOME
}
}