From b8c10b5f6c8324638e634c37d7515f7d7e374013 Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sat, 28 Jun 2025 02:34:20 +0200
Subject: [PATCH] chore: optimize imports
---
.../main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt | 1 -
.../kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt | 3 ---
.../chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt | 3 ---
.../chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt | 7 +------
.../meteroid/ui/navigation/PersistentNavigation.kt | 1 -
.../de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt | 6 ++++--
.../de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt | 7 +------
.../de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt | 2 +-
.../de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt | 1 -
.../de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt | 2 +-
.../de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt | 1 -
11 files changed, 8 insertions(+), 26 deletions(-)
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt
index 91e9879..867b98c 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/MeteroidRouter.kt
@@ -35,7 +35,6 @@ import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
import androidx.navigation3.ui.NavDisplay
import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
-import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
import de.chaosdorf.meteroid.ui.SetupRoute
import de.chaosdorf.meteroid.ui.deposit.DepositRoute
import de.chaosdorf.meteroid.ui.history.HistoryRoute
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt
index a562a73..0b33029 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/di/PreferenceModule.kt
@@ -28,19 +28,16 @@ import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.preferencesDataStore
-import dagger.Binds
import dagger.Module
import dagger.Provides
import dagger.Reusable
import dagger.hilt.InstallIn
-import dagger.hilt.android.components.ActivityComponent
import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent
import de.chaosdorf.meteroid.storage.AccountPreferences
import de.chaosdorf.meteroid.storage.AccountPreferencesImpl
import de.chaosdorf.meteroid.storage.WrappedPreferences
import de.chaosdorf.meteroid.storage.WrappedPreferencesImpl
-import javax.inject.Singleton
val Context.accountDataStore: DataStore<Preferences> by preferencesDataStore(name = "account")
val Context.wrappedDataStore: DataStore<Preferences> by preferencesDataStore(name = "wrapped")
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt
index c673016..9212de7 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/storage/WrappedPreferencesImpl.kt
@@ -29,9 +29,6 @@ import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.booleanPreferencesKey
import androidx.datastore.preferences.core.edit
-import androidx.datastore.preferences.core.longPreferencesKey
-import de.chaosdorf.mete.model.ServerId
-import de.chaosdorf.mete.model.UserId
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.mapLatest
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt
index df17f59..b618343 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/OverlayNavigation.kt
@@ -29,12 +29,7 @@ import androidx.compose.animation.*
import androidx.compose.animation.core.Transition
import androidx.compose.animation.core.animateDp
import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
-import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.*
import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.Surface
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/PersistentNavigation.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/PersistentNavigation.kt
index a0f96aa..6595c91 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/PersistentNavigation.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/navigation/PersistentNavigation.kt
@@ -40,7 +40,6 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.TileMode
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.unit.dp
-import de.chaosdorf.meteroid.sync.SyncManager
import de.chaosdorf.meteroid.sync.base.SyncHandler
import de.chaosdorf.meteroid.viewmodel.NavigationElement
import de.chaosdorf.meteroid.viewmodel.NavigationViewModel
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt
index 871e10d..5b080bd 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseDrinkTile.kt
@@ -32,7 +32,10 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
-import androidx.compose.runtime.*
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.State
+import androidx.compose.runtime.derivedStateOf
+import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
@@ -46,7 +49,6 @@ import coil3.compose.rememberAsyncImagePainter
import de.chaosdorf.meteroid.model.Drink
import de.chaosdorf.meteroid.theme.secondaryGradient
import de.chaosdorf.meteroid.ui.common.PriceBadge
-import kotlinx.coroutines.delay
import java.math.BigDecimal
import java.util.*
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt
index 73af9cc..9b872e6 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/purchase/PurchaseRoute.kt
@@ -24,11 +24,7 @@
package de.chaosdorf.meteroid.ui.purchase
-import androidx.compose.animation.AnimatedVisibility
-import androidx.compose.animation.fadeIn
-import androidx.compose.animation.fadeOut
-import androidx.compose.animation.slideInVertically
-import androidx.compose.animation.slideOutVertically
+import androidx.compose.animation.*
import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding
@@ -37,7 +33,6 @@ import androidx.compose.foundation.lazy.grid.GridItemSpan
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items
import androidx.compose.material3.Snackbar
-import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt
index 88c5236..e8737c5 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/ui/serverlist/ServerListRoute.kt
@@ -32,8 +32,8 @@ import androidx.compose.material3.Button
import androidx.compose.material3.Text
import androidx.compose.runtime.*
import de.chaosdorf.meteroid.model.Server
-import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
import de.chaosdorf.meteroid.util.humanReadableHost
+import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
import de.chaosdorf.meteroid.viewmodel.Navigator
import de.chaosdorf.meteroid.viewmodel.ServerListViewModel
import kotlinx.coroutines.flow.update
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt
index a8bee77..12171e2 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/HistoryViewModel.kt
@@ -40,7 +40,6 @@ import de.chaosdorf.meteroid.sync.AccountProvider
import de.chaosdorf.meteroid.sync.SyncManager
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.*
-import kotlinx.coroutines.launch
import java.math.BigDecimal
import kotlin.time.Duration.Companion.minutes
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt
index a06ece6..2a92560 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/PurchaseViewModel.kt
@@ -65,7 +65,7 @@ class PurchaseViewModel @AssistedInject constructor(
private val accountProvider: AccountProvider,
private val syncManager: SyncManager,
wrappedPreferences: WrappedPreferences,
- private val accountPreferences: AccountPreferences,
+ accountPreferences: AccountPreferences,
drinkRepository: DrinkRepository,
) : ViewModel() {
val serverId: ServerId = ServerId(server)
diff --git a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt
index 6a8fa74..113dd58 100644
--- a/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt
+++ b/app/src/main/kotlin/de/chaosdorf/meteroid/viewmodel/WrappedViewModel.kt
@@ -39,7 +39,6 @@ import de.chaosdorf.meteroid.model.Transaction
import de.chaosdorf.meteroid.model.TransactionRepository
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.stateIn
import kotlinx.datetime.*
--
GitLab