From d845ba97b3da6eb5af28fd468836b90baec6cb3d Mon Sep 17 00:00:00 2001
From: JojoIV <jonas.broeckmann@gmx.de>
Date: Thu, 30 May 2024 01:03:26 +0200
Subject: [PATCH] Refactor references to common_utils packages
---
.../java/net/novagamestudios/kaffeekasse/App.kt | 10 +++++-----
.../novagamestudios/kaffeekasse/MainActivity.kt | 2 +-
.../kaffeekasse/UpdateReciever.kt | 4 ++--
.../api/hiwi_tracker/HiwiTrackerAPI.kt | 2 +-
.../api/kaffeekasse/KaffeekasseAPI.kt | 6 +++---
.../api/kaffeekasse/KaffeekasseScraper.kt | 2 +-
.../api/kaffeekasse/model/BasicUserInfo.kt | 2 +-
.../api/kaffeekasse/model/ItemListResponse.kt | 2 +-
.../kaffeekasse/api/portal/PortalClient.kt | 12 ++++++------
.../kaffeekasse/model/app/AppVersion.kt | 2 +-
.../kaffeekasse/model/hiwi_tracker/MonthKey.kt | 2 +-
.../kaffeekasse/model/hiwi_tracker/WorkEntry.kt | 2 +-
.../kaffeekasse/repositories/Credentials.kt | 12 ++++++------
.../kaffeekasse/repositories/LoginRepository.kt | 16 ++++++++--------
.../kaffeekasse/repositories/Settings.kt | 2 +-
.../repositories/SettingsRepository.kt | 2 +-
.../kaffeekasse/repositories/UpdateController.kt | 8 ++++----
.../repositories/i11/HiwiTrackerRepository.kt | 4 ++--
.../repositories/i11/KaffeekasseRepository.kt | 2 +-
.../repositories/i11/PortalRepository.kt | 8 ++++----
.../releases/GitLabPackageReleases.kt | 6 +++---
.../repositories/releases/GitLabReleases.kt | 6 +++---
.../net/novagamestudios/kaffeekasse/ui/App.kt | 8 ++++----
.../novagamestudios/kaffeekasse/ui/Updates.kt | 6 +++---
.../ui/hiwi_tracker/EnterWorkingHours.kt | 6 +++---
.../ui/hiwi_tracker/HiwiTrackerModule.kt | 2 +-
.../kaffeekasse/ui/hiwi_tracker/Overview.kt | 6 +++---
.../kaffeekasse/ui/kaffeekasse/Account.kt | 4 ++--
.../ui/kaffeekasse/KaffeekasseModule.kt | 2 +-
.../kaffeekasse/ui/kaffeekasse/ManualBill.kt | 2 +-
.../kaffeekasse/ui/kaffeekasse/Transactions.kt | 2 +-
.../ui/kaffeekasse/TransactionsCharts.kt | 5 +++--
.../kaffeekasse/components/CategorizedItems.kt | 2 +-
.../ui/kaffeekasse/components/Checkout.kt | 4 ++--
.../ui/kaffeekasse/components/CustomItems.kt | 4 ++--
.../ui/kaffeekasse/components/cards/Item.kt | 6 +++---
.../kaffeekasse/ui/login/Login.kt | 4 ++--
.../kaffeekasse/ui/login/LoginForm.kt | 2 +-
.../kaffeekasse/ui/login/UserSelection.kt | 6 +++---
.../kaffeekasse/ui/navigation/AppScaffold.kt | 4 ++--
.../kaffeekasse/ui/navigation/AppScreens.kt | 2 +-
.../kaffeekasse/ui/util/Helpers.kt | 6 +++---
.../kaffeekasse/util/richdata/RichDataFlow.kt | 2 +-
.../kaffeekasse/util/richdata/RichDataSource.kt | 2 +-
gradle/libs.versions.toml | 2 +-
45 files changed, 102 insertions(+), 101 deletions(-)
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/App.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/App.kt
index 4f2918c..19f70cb 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/App.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/App.kt
@@ -11,12 +11,12 @@ import kotlinx.coroutines.MainScope
import kotlinx.coroutines.launch
import kotlinx.coroutines.plus
import kotlinx.coroutines.runBlocking
-import net.novagamestudios.common_utils.android.toastShort
import net.novagamestudios.common_utils.compose.application
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.error
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.warn
+import net.novagamestudios.common_utils.core.toastShort
import net.novagamestudios.kaffeekasse.api.hiwi_tracker.HiwiTrackerAPI
import net.novagamestudios.kaffeekasse.api.hiwi_tracker.HiwiTrackerScraper
import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseAPI
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/MainActivity.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/MainActivity.kt
index cf3fc51..6b8dea1 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/MainActivity.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/MainActivity.kt
@@ -14,7 +14,7 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.flow.distinctUntilChanged
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch
-import net.novagamestudios.common_utils.logging.LocalLogger
+import net.novagamestudios.common_utils.compose.logging.LocalLogger
import net.novagamestudios.kaffeekasse.repositories.SettingsRepository
import net.novagamestudios.kaffeekasse.ui.App
import net.novagamestudios.kaffeekasse.ui.util.removeScrollableTabRowMinimumTabWidth
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/UpdateReciever.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/UpdateReciever.kt
index a671abe..aa986ab 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/UpdateReciever.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/UpdateReciever.kt
@@ -3,8 +3,8 @@ package net.novagamestudios.kaffeekasse
import android.content.BroadcastReceiver
import android.content.Context
import android.content.Intent
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.info
class UpdateReceiver : BroadcastReceiver(), Logger {
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/hiwi_tracker/HiwiTrackerAPI.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/hiwi_tracker/HiwiTrackerAPI.kt
index e9b9fc0..851dee7 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/hiwi_tracker/HiwiTrackerAPI.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/hiwi_tracker/HiwiTrackerAPI.kt
@@ -2,7 +2,7 @@ package net.novagamestudios.kaffeekasse.api.hiwi_tracker
import io.ktor.http.parameters
import kotlinx.datetime.format
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.kaffeekasse.api.hiwi_tracker.model.MonthDataResponse
import net.novagamestudios.kaffeekasse.api.portal.PortalClient
import net.novagamestudios.kaffeekasse.model.hiwi_tracker.MonthKey
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseAPI.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseAPI.kt
index 67c37a6..c56c392 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseAPI.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseAPI.kt
@@ -3,9 +3,9 @@ package net.novagamestudios.kaffeekasse.api.kaffeekasse
import io.ktor.http.Parameters
import io.ktor.http.parameters
import io.ktor.util.sha1
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.error
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.error
import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.ItemListResponse
import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.KaffeekasseAPIResponse
import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.LoggedInUserResponse
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseScraper.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseScraper.kt
index 75cdb85..7f89497 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseScraper.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/KaffeekasseScraper.kt
@@ -12,7 +12,7 @@ import it.skrape.selects.html5.select
import it.skrape.selects.html5.table
import it.skrape.selects.html5.td
import it.skrape.selects.html5.tr
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.info
import net.novagamestudios.kaffeekasse.api.portal.PortalClient
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Cart
import net.novagamestudios.kaffeekasse.model.kaffeekasse.KnownItem
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/BasicUserInfo.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/BasicUserInfo.kt
index fee012c..e53f53f 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/BasicUserInfo.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/BasicUserInfo.kt
@@ -2,7 +2,7 @@ package net.novagamestudios.kaffeekasse.api.kaffeekasse.model
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
-import net.novagamestudios.common_utils.serialization.BooleanAsIntSerializer
+import net.novagamestudios.common_utils.core.serialization.BooleanAsIntSerializer
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Name
@Serializable
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/ItemListResponse.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/ItemListResponse.kt
index 3bcb65e..a7e6201 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/ItemListResponse.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/kaffeekasse/model/ItemListResponse.kt
@@ -3,7 +3,7 @@ package net.novagamestudios.kaffeekasse.api.kaffeekasse.model
import kotlinx.serialization.SerialName
import kotlinx.serialization.Serializable
import kotlinx.serialization.json.JsonElement
-import net.novagamestudios.common_utils.serialization.BooleanAsIntSerializer
+import net.novagamestudios.common_utils.core.serialization.BooleanAsIntSerializer
@Serializable
data class ItemListResponse(
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/api/portal/PortalClient.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/api/portal/PortalClient.kt
index 722892d..16c9408 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/api/portal/PortalClient.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/api/portal/PortalClient.kt
@@ -33,12 +33,12 @@ import kotlinx.serialization.json.Json
import kotlinx.serialization.json.JsonElement
import kotlinx.serialization.json.JsonObject
import kotlinx.serialization.json.decodeFromJsonElement
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.error
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.verbose
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.verbose
+import net.novagamestudios.common_utils.core.logging.warn
import net.novagamestudios.kaffeekasse.api.portal.model.PortalAPIResponse
import net.novagamestudios.kaffeekasse.model.credentials.Login
import net.novagamestudios.kaffeekasse.model.credentials.isValid
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/model/app/AppVersion.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/model/app/AppVersion.kt
index aaa951c..76a55c3 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/model/app/AppVersion.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/model/app/AppVersion.kt
@@ -8,7 +8,7 @@ import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
import kotlinx.serialization.descriptors.SerialDescriptor
import kotlinx.serialization.encoding.Decoder
import kotlinx.serialization.encoding.Encoder
-import net.novagamestudios.common_utils.format
+import net.novagamestudios.common_utils.core.format
import net.novagamestudios.kaffeekasse.BuildConfig
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/MonthKey.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/MonthKey.kt
index 9c41025..2c57b07 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/MonthKey.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/MonthKey.kt
@@ -6,7 +6,7 @@ import kotlinx.datetime.LocalDate
import kotlinx.datetime.Month
import kotlinx.datetime.number
import kotlinx.serialization.Serializable
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
@Serializable
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/WorkEntry.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/WorkEntry.kt
index 75612dd..6765ead 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/WorkEntry.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/model/hiwi_tracker/WorkEntry.kt
@@ -2,7 +2,7 @@ package net.novagamestudios.kaffeekasse.model.hiwi_tracker
import kotlinx.datetime.LocalDate
import kotlinx.datetime.LocalTime
-import net.novagamestudios.common_utils.minus
+import net.novagamestudios.common_utils.core.minus
import kotlin.time.Duration
import kotlin.time.Duration.Companion.hours
import kotlin.time.Duration.Companion.minutes
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Credentials.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Credentials.kt
index 4e28f13..d629473 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Credentials.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Credentials.kt
@@ -11,12 +11,12 @@ import androidx.credentials.exceptions.CreateCredentialException
import androidx.credentials.exceptions.CreateCredentialUnsupportedException
import androidx.credentials.exceptions.GetCredentialCancellationException
import androidx.credentials.exceptions.GetCredentialException
-import net.novagamestudios.common_utils.android.toastShort
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.error
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.verbose
+import net.novagamestudios.common_utils.core.toastShort
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.verbose
import net.novagamestudios.kaffeekasse.BuildConfig
import net.novagamestudios.kaffeekasse.model.credentials.DeviceCredentials
import net.novagamestudios.kaffeekasse.model.credentials.Login
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/LoginRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/LoginRepository.kt
index 61fd147..b71165b 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/LoginRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/LoginRepository.kt
@@ -4,14 +4,14 @@ import android.content.Context
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import kotlinx.coroutines.sync.Mutex
-import net.novagamestudios.common_utils.android.toastShort
-import net.novagamestudios.common_utils.collection.mapState
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.verbose
-import net.novagamestudios.common_utils.logging.warn
-import net.novagamestudios.common_utils.withReentrantLock
+import net.novagamestudios.common_utils.core.toastShort
+import net.novagamestudios.common_utils.core.collection.mapState
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.verbose
+import net.novagamestudios.common_utils.core.logging.warn
+import net.novagamestudios.common_utils.core.withReentrantLock
import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseAPI
import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.BasicUserInfo
import net.novagamestudios.kaffeekasse.model.credentials.DeviceCredentials
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Settings.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Settings.kt
index 940db21..944427c 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Settings.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/Settings.kt
@@ -14,7 +14,7 @@ import kotlinx.serialization.serializer
import net.novagamestudios.common_utils.compose.state.DataStoreState
import net.novagamestudios.common_utils.compose.state.MutableDataStoreState
import net.novagamestudios.common_utils.compose.state.stateIn
-import net.novagamestudios.common_utils.serialization.JsonToDataStore
+import net.novagamestudios.common_utils.compose.JsonToDataStore
import net.novagamestudios.kaffeekasse.model.credentials.DeviceCredentials
import net.novagamestudios.kaffeekasse.ui.util.derived
import java.io.File
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/SettingsRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/SettingsRepository.kt
index 3ebfeb3..88c87f0 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/SettingsRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/SettingsRepository.kt
@@ -1,7 +1,7 @@
package net.novagamestudios.kaffeekasse.repositories
import kotlinx.coroutines.flow.StateFlow
-import net.novagamestudios.common_utils.collection.mapState
+import net.novagamestudios.common_utils.core.collection.mapState
import net.novagamestudios.common_utils.compose.state.MutableDataStoreState
import net.novagamestudios.kaffeekasse.model.session.realUserOrNull
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/UpdateController.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/UpdateController.kt
index ffcc855..392d5a3 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/UpdateController.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/UpdateController.kt
@@ -11,11 +11,11 @@ import io.ktor.http.contentLength
import io.ktor.utils.io.ByteReadChannel
import io.ktor.utils.io.jvm.javaio.copyTo
import kotlinx.coroutines.flow.MutableStateFlow
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.compose.components.Progress
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.error
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.logging.info
import net.novagamestudios.kaffeekasse.MainActivity
import net.novagamestudios.kaffeekasse.UpdateReceiver
import net.novagamestudios.kaffeekasse.model.app.AppRelease
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/HiwiTrackerRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/HiwiTrackerRepository.kt
index 8dc5bab..fdbb13a 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/HiwiTrackerRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/HiwiTrackerRepository.kt
@@ -1,8 +1,8 @@
package net.novagamestudios.kaffeekasse.repositories.i11
import kotlinx.coroutines.CoroutineScope
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
import net.novagamestudios.kaffeekasse.api.hiwi_tracker.HiwiTrackerAPI
import net.novagamestudios.kaffeekasse.api.hiwi_tracker.HiwiTrackerScraper
import net.novagamestudios.kaffeekasse.api.hiwi_tracker.model.MonthDataResponse
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/KaffeekasseRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/KaffeekasseRepository.kt
index 3a1e29b..80e4923 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/KaffeekasseRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/KaffeekasseRepository.kt
@@ -3,7 +3,7 @@ package net.novagamestudios.kaffeekasse.repositories.i11
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseAPI
import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseScraper
import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.APIPurchaseAccount
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/PortalRepository.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/PortalRepository.kt
index 99a376d..e2437e3 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/PortalRepository.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/i11/PortalRepository.kt
@@ -4,10 +4,10 @@ import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.stateIn
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.warn
import net.novagamestudios.kaffeekasse.api.kaffeekasse.KaffeekasseAPI
import net.novagamestudios.kaffeekasse.api.portal.PortalClient
import net.novagamestudios.kaffeekasse.model.credentials.Login
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabPackageReleases.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabPackageReleases.kt
index ca0aae2..40a7be7 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabPackageReleases.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabPackageReleases.kt
@@ -1,9 +1,9 @@
package net.novagamestudios.kaffeekasse.repositories.releases
import kotlinx.coroutines.flow.MutableStateFlow
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.info
import net.novagamestudios.kaffeekasse.gitlab.GitLab
import net.novagamestudios.kaffeekasse.gitlab.GitLabPackage
import net.novagamestudios.kaffeekasse.gitlab.GitLabPackageFile
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabReleases.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabReleases.kt
index 52cdbc8..135d957 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabReleases.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/repositories/releases/GitLabReleases.kt
@@ -1,9 +1,9 @@
package net.novagamestudios.kaffeekasse.repositories.releases
import kotlinx.coroutines.flow.MutableStateFlow
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.info
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.info
import net.novagamestudios.kaffeekasse.gitlab.GitLab
import net.novagamestudios.kaffeekasse.model.app.AppRelease
import net.novagamestudios.kaffeekasse.model.app.AppVersion
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/App.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/App.kt
index 9ff0445..89145a5 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/App.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/App.kt
@@ -17,10 +17,10 @@ import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.navigator.Navigator
import net.novagamestudios.common_utils.compose.components.BoxCenter
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.LoggerForFun
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.verbose
+import net.novagamestudios.common_utils.compose.logging.verbose
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.LoggerForFun
+import net.novagamestudios.common_utils.core.logging.debug
import net.novagamestudios.common_utils.voyager.model.GlobalScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.common_utils.voyager.model.collectAsStateHere
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/Updates.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/Updates.kt
index 1c8dad9..a48c0dc 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/Updates.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/Updates.kt
@@ -46,7 +46,7 @@ import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.core.model.screenModelScope
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch
-import net.novagamestudios.common_utils.android.toastLong
+import net.novagamestudios.common_utils.core.toastLong
import net.novagamestudios.common_utils.compose.DashedShape
import net.novagamestudios.common_utils.compose.Toasts
import net.novagamestudios.common_utils.compose.ToastsState
@@ -57,8 +57,8 @@ import net.novagamestudios.common_utils.compose.components.RowCenter
import net.novagamestudios.common_utils.compose.components.TransparentListItem
import net.novagamestudios.common_utils.compose.state.ReentrantActionState
import net.novagamestudios.common_utils.compose.state.collectAsStateIn
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.error
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.error
import net.novagamestudios.common_utils.voyager.model.GlobalScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.common_utils.voyager.model.getValue
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/EnterWorkingHours.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/EnterWorkingHours.kt
index 9c20b6f..ea64958 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/EnterWorkingHours.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/EnterWorkingHours.kt
@@ -82,9 +82,9 @@ import net.novagamestudios.common_utils.compose.components.ColumnCenter
import net.novagamestudios.common_utils.compose.components.RowCenter
import net.novagamestudios.common_utils.compose.state.ReentrantActionState
import net.novagamestudios.common_utils.compose.thenIf
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.warn
-import net.novagamestudios.common_utils.minus
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.warn
+import net.novagamestudios.common_utils.core.minus
import net.novagamestudios.kaffeekasse.R
import net.novagamestudios.kaffeekasse.model.hiwi_tracker.WorkEntry
import net.novagamestudios.kaffeekasse.model.hiwi_tracker.WorkEntry.Companion.MaxWorkWithoutLargeBreak
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/HiwiTrackerModule.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/HiwiTrackerModule.kt
index e236ab5..b7b6251 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/HiwiTrackerModule.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/HiwiTrackerModule.kt
@@ -1,7 +1,7 @@
package net.novagamestudios.kaffeekasse.ui.hiwi_tracker
import cafe.adriel.voyager.core.model.ScreenModel
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.kaffeekasse.model.session.Session
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
index 3917787..3c436cc 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/hiwi_tracker/Overview.kt
@@ -85,9 +85,9 @@ import net.novagamestudios.common_utils.compose.DashedShape
import net.novagamestudios.common_utils.compose.components.BoxCenter
import net.novagamestudios.common_utils.compose.components.CircularProgressIndicator
import net.novagamestudios.common_utils.compose.components.RowCenter
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
-import net.novagamestudios.common_utils.logging.verbose
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
+import net.novagamestudios.common_utils.core.logging.verbose
import net.novagamestudios.common_utils.voyager.BackNavigationHandler
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Account.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Account.kt
index 4934d91..62990ef 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Account.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Account.kt
@@ -28,8 +28,8 @@ import cafe.adriel.voyager.navigator.Navigator
import net.novagamestudios.common_utils.compose.components.BoxCenter
import net.novagamestudios.common_utils.compose.components.CircularProgressIndicator
import net.novagamestudios.common_utils.compose.components.ColumnCenter
-import net.novagamestudios.common_utils.format
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.format
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Account
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt
index 1271439..8addd61 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/KaffeekasseModule.kt
@@ -10,7 +10,7 @@ import androidx.compose.material3.IconButton
import androidx.compose.runtime.Composable
import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.navigator.Navigator
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.voyager.BackNavigationHandler
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
index bbdd975..82f628e 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/ManualBill.kt
@@ -39,7 +39,7 @@ import cafe.adriel.voyager.navigator.Navigator
import net.novagamestudios.common_utils.compose.components.CircularProgressIndicator
import net.novagamestudios.common_utils.compose.components.RowCenter
import net.novagamestudios.common_utils.compose.tabIndicatorOffset
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.kaffeekasse.KaffeekasseModule.Companion.kaffeekasseCartProvider
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Transactions.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Transactions.kt
index 7edd7f2..2802104 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Transactions.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/Transactions.kt
@@ -39,7 +39,7 @@ import androidx.compose.ui.unit.dp
import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.core.model.screenModelScope
import cafe.adriel.voyager.navigator.Navigator
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.kaffeekasse.App
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/TransactionsCharts.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/TransactionsCharts.kt
index ade4aa7..324bebc 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/TransactionsCharts.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/TransactionsCharts.kt
@@ -76,8 +76,9 @@ import kotlinx.coroutines.flow.mapLatest
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.launch
import kotlinx.coroutines.supervisorScope
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.debug
+import net.novagamestudios.common_utils.compose.logging.debug
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.debug
import net.novagamestudios.kaffeekasse.model.kaffeekasse.ItemCategory
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Transaction
import net.novagamestudios.kaffeekasse.ui.kaffeekasse.TransactionsChartsState.ChartSettings.TimeFilter
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CategorizedItems.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CategorizedItems.kt
index e91a08b..86f16fe 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CategorizedItems.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CategorizedItems.kt
@@ -20,7 +20,7 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.platform.LocalContext
import kotlinx.coroutines.launch
-import net.novagamestudios.common_utils.android.toastShort
+import net.novagamestudios.common_utils.core.toastShort
import net.novagamestudios.common_utils.compose.state.MutableDataStoreState
import net.novagamestudios.kaffeekasse.App.Companion.settings
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Cart
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt
index b809438..4ee7261 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/Checkout.kt
@@ -55,8 +55,8 @@ import net.novagamestudios.common_utils.compose.components.CircularLoadingBox
import net.novagamestudios.common_utils.compose.components.TransparentListItem
import net.novagamestudios.common_utils.compose.maskedCircleIcon
import net.novagamestudios.common_utils.compose.state.ReentrantActionState
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.core.logging.warn
import net.novagamestudios.kaffeekasse.KaffeekasseModule.Companion.kaffeekasseCartProvider
import net.novagamestudios.kaffeekasse.api.kaffeekasse.model.APIPurchaseAccount
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Cart
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CustomItems.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CustomItems.kt
index 6b65b4b..6cdd090 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CustomItems.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/CustomItems.kt
@@ -31,11 +31,11 @@ import kotlinx.coroutines.flow.flatMapLatest
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.compose.DashedShape
import net.novagamestudios.common_utils.compose.components.ColumnCenter
import net.novagamestudios.common_utils.compose.state.ReentrantActionState
-import net.novagamestudios.common_utils.logging.verbose
+import net.novagamestudios.common_utils.core.logging.verbose
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Item
import net.novagamestudios.kaffeekasse.model.kaffeekasse.MutableCart
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Transaction
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
index 509a4f4..37864ed 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/kaffeekasse/components/cards/Item.kt
@@ -54,9 +54,9 @@ import io.ktor.http.URLBuilder
import io.ktor.http.URLProtocol
import net.novagamestudios.common_utils.compose.components.BoxCenter
import net.novagamestudios.common_utils.compose.maskedCircleIcon
-import net.novagamestudios.common_utils.logging.LocalLogger
-import net.novagamestudios.common_utils.logging.info
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.compose.logging.LocalLogger
+import net.novagamestudios.common_utils.core.logging.info
+import net.novagamestudios.common_utils.core.logging.warn
import net.novagamestudios.kaffeekasse.App
import net.novagamestudios.kaffeekasse.app
import net.novagamestudios.kaffeekasse.model.kaffeekasse.Item
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/Login.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/Login.kt
index e88727d..2af11fe 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/Login.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/Login.kt
@@ -13,12 +13,12 @@ import cafe.adriel.voyager.core.model.screenModelScope
import cafe.adriel.voyager.navigator.Navigator
import kotlinx.coroutines.launch
import net.novagamestudios.common_utils.compose.components.CircularLoadingBox
-import net.novagamestudios.common_utils.compose.components.scaffold.currentScaffoldContent
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.voyager.BackNavigationHandler
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.common_utils.voyager.model.collectAsStateHere
+import net.novagamestudios.common_utils.voyager.scaffold.currentScaffoldContent
import net.novagamestudios.kaffeekasse.app
import net.novagamestudios.kaffeekasse.model.session.Session
import net.novagamestudios.kaffeekasse.repositories.LoginRepository
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/LoginForm.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/LoginForm.kt
index ade5e1c..ab20f8e 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/LoginForm.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/LoginForm.kt
@@ -50,7 +50,7 @@ import cafe.adriel.voyager.core.model.screenModelScope
import cafe.adriel.voyager.navigator.Navigator
import kotlinx.coroutines.launch
import net.novagamestudios.common_utils.compose.components.BoxCenter
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.common_utils.voyager.model.collectAsStateHere
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt
index 14275b2..7f8839e 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/login/UserSelection.kt
@@ -71,9 +71,10 @@ import net.novagamestudios.common_utils.compose.Toasts
import net.novagamestudios.common_utils.compose.ToastsState
import net.novagamestudios.common_utils.compose.components.LinearProgressIndicator
import net.novagamestudios.common_utils.compose.components.RowCenter
+import net.novagamestudios.common_utils.compose.logging.warn
import net.novagamestudios.common_utils.compose.state.rememberDerivedStateOf
-import net.novagamestudios.common_utils.logging.Logger
-import net.novagamestudios.common_utils.logging.warn
+import net.novagamestudios.common_utils.core.logging.Logger
+import net.novagamestudios.common_utils.voyager.BackNavigationHandler
import net.novagamestudios.common_utils.voyager.model.ScreenModelFactory
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.kaffeekasse.App
@@ -99,7 +100,6 @@ import net.novagamestudios.kaffeekasse.ui.util.TopBarSearchAction
import net.novagamestudios.kaffeekasse.ui.util.TopBarSearchField
import net.novagamestudios.kaffeekasse.ui.util.TopBarSearchFieldState
import net.novagamestudios.kaffeekasse.ui.util.VerticalSelectionBar
-import net.novagamestudios.common_utils.voyager.BackNavigationHandler
import net.novagamestudios.kaffeekasse.ui.util.pullToRefresh
import net.novagamestudios.kaffeekasse.util.richdata.asRichDataFlow
import net.novagamestudios.kaffeekasse.util.richdata.combineRich
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScaffold.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScaffold.kt
index 0b18171..b08968d 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScaffold.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScaffold.kt
@@ -16,12 +16,12 @@ import androidx.compose.ui.unit.dp
import cafe.adriel.voyager.core.model.ScreenModel
import cafe.adriel.voyager.core.screen.Screen
import cafe.adriel.voyager.navigator.Navigator
-import net.novagamestudios.common_utils.compose.components.scaffold.TopAppBar
-import net.novagamestudios.common_utils.compose.components.scaffold.TopAppBarContent
import net.novagamestudios.common_utils.compose.nestedScroll
import net.novagamestudios.common_utils.voyager.AnimatedBackNavigationIcon
import net.novagamestudios.common_utils.voyager.debugNavigation
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
+import net.novagamestudios.common_utils.voyager.scaffold.TopAppBar
+import net.novagamestudios.common_utils.voyager.scaffold.TopAppBarContent
import net.novagamestudios.kaffeekasse.CrashHandling
import net.novagamestudios.kaffeekasse.ui.theme.LocalAnimationSwitch
import net.novagamestudios.kaffeekasse.ui.theme.ifAnimationsEnabled
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScreens.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScreens.kt
index a3da37d..82e8640 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScreens.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/navigation/AppScreens.kt
@@ -13,9 +13,9 @@ import cafe.adriel.voyager.navigator.tab.Tab
import cafe.adriel.voyager.navigator.tab.TabNavigator
import cafe.adriel.voyager.navigator.tab.TabOptions
import net.novagamestudios.common_utils.compose.components.BoxCenter
-import net.novagamestudios.common_utils.compose.components.scaffold.ScaffoldContentProvider
import net.novagamestudios.common_utils.voyager.model.ScreenModelProvider
import net.novagamestudios.common_utils.voyager.model.getValue
+import net.novagamestudios.common_utils.voyager.scaffold.ScaffoldContentProvider
import net.novagamestudios.common_utils.voyager.screen.ScreenWithModel
import net.novagamestudios.kaffeekasse.model.session.Device
import net.novagamestudios.kaffeekasse.model.session.Session
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/util/Helpers.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/util/Helpers.kt
index 0b98aa8..6eb7466 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/ui/util/Helpers.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/ui/util/Helpers.kt
@@ -21,9 +21,9 @@ import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.TextUnit
import io.ktor.http.Url
-import net.novagamestudios.common_utils.android.toastShort
-import net.novagamestudios.common_utils.logging.LoggerForFun
-import net.novagamestudios.common_utils.logging.error
+import net.novagamestudios.common_utils.core.logging.LoggerForFun
+import net.novagamestudios.common_utils.core.logging.error
+import net.novagamestudios.common_utils.core.toastShort
@Composable
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataFlow.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataFlow.kt
index e66a320..fe9cd91 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataFlow.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataFlow.kt
@@ -13,7 +13,7 @@ import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.stateIn
import kotlinx.coroutines.flow.transform
import kotlinx.coroutines.flow.transformLatest
-import net.novagamestudios.common_utils.collection.mapState
+import net.novagamestudios.common_utils.core.collection.mapState
import net.novagamestudios.common_utils.compose.components.Progress
diff --git a/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataSource.kt b/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataSource.kt
index 0edfe02..f868bb3 100644
--- a/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataSource.kt
+++ b/app/src/main/java/net/novagamestudios/kaffeekasse/util/richdata/RichDataSource.kt
@@ -8,7 +8,7 @@ import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.channelFlow
import kotlinx.coroutines.flow.launchIn
import net.novagamestudios.common_utils.compose.components.Progress
-import net.novagamestudios.common_utils.logging.Logger
+import net.novagamestudios.common_utils.core.logging.Logger
import kotlin.coroutines.suspendCoroutine
typealias RichDataCollector<T> = FlowCollector<RichData<T>>
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 11fda3d..b103130 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,7 +10,7 @@ vico = "2.0.0-alpha.8"
voyager = "1.0.0"
coil = "2.6.0"
acra = "5.11.3"
-commonutils = "2b6273ca33"
+commonutils = "faae744c0d"
junit4 = "4.13.2"
[plugins]
--
GitLab