Skip to content
Snippets Groups Projects
Verified Commit b8c10b5f authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

chore: optimize imports

parent 640c8908
Branches main
No related tags found
No related merge requests found
Showing
with 8 additions and 26 deletions
...@@ -35,7 +35,6 @@ import androidx.navigation3.runtime.entryProvider ...@@ -35,7 +35,6 @@ import androidx.navigation3.runtime.entryProvider
import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator import androidx.navigation3.runtime.rememberSavedStateNavEntryDecorator
import androidx.navigation3.ui.NavDisplay import androidx.navigation3.ui.NavDisplay
import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator import androidx.navigation3.ui.rememberSceneSetupNavEntryDecorator
import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
import de.chaosdorf.meteroid.ui.SetupRoute import de.chaosdorf.meteroid.ui.SetupRoute
import de.chaosdorf.meteroid.ui.deposit.DepositRoute import de.chaosdorf.meteroid.ui.deposit.DepositRoute
import de.chaosdorf.meteroid.ui.history.HistoryRoute import de.chaosdorf.meteroid.ui.history.HistoryRoute
......
...@@ -28,19 +28,16 @@ import android.content.Context ...@@ -28,19 +28,16 @@ import android.content.Context
import androidx.datastore.core.DataStore import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.preferencesDataStore import androidx.datastore.preferences.preferencesDataStore
import dagger.Binds
import dagger.Module import dagger.Module
import dagger.Provides import dagger.Provides
import dagger.Reusable import dagger.Reusable
import dagger.hilt.InstallIn import dagger.hilt.InstallIn
import dagger.hilt.android.components.ActivityComponent
import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.android.qualifiers.ApplicationContext
import dagger.hilt.components.SingletonComponent import dagger.hilt.components.SingletonComponent
import de.chaosdorf.meteroid.storage.AccountPreferences import de.chaosdorf.meteroid.storage.AccountPreferences
import de.chaosdorf.meteroid.storage.AccountPreferencesImpl import de.chaosdorf.meteroid.storage.AccountPreferencesImpl
import de.chaosdorf.meteroid.storage.WrappedPreferences import de.chaosdorf.meteroid.storage.WrappedPreferences
import de.chaosdorf.meteroid.storage.WrappedPreferencesImpl import de.chaosdorf.meteroid.storage.WrappedPreferencesImpl
import javax.inject.Singleton
val Context.accountDataStore: DataStore<Preferences> by preferencesDataStore(name = "account") val Context.accountDataStore: DataStore<Preferences> by preferencesDataStore(name = "account")
val Context.wrappedDataStore: DataStore<Preferences> by preferencesDataStore(name = "wrapped") val Context.wrappedDataStore: DataStore<Preferences> by preferencesDataStore(name = "wrapped")
......
...@@ -29,9 +29,6 @@ import androidx.datastore.core.DataStore ...@@ -29,9 +29,6 @@ import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.booleanPreferencesKey import androidx.datastore.preferences.core.booleanPreferencesKey
import androidx.datastore.preferences.core.edit 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.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.mapLatest import kotlinx.coroutines.flow.mapLatest
......
...@@ -29,12 +29,7 @@ import androidx.compose.animation.* ...@@ -29,12 +29,7 @@ import androidx.compose.animation.*
import androidx.compose.animation.core.Transition import androidx.compose.animation.core.Transition
import androidx.compose.animation.core.animateDp import androidx.compose.animation.core.animateDp
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.*
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.material3.HorizontalDivider import androidx.compose.material3.HorizontalDivider
import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.Surface import androidx.compose.material3.Surface
......
...@@ -40,7 +40,6 @@ import androidx.compose.ui.graphics.Brush ...@@ -40,7 +40,6 @@ import androidx.compose.ui.graphics.Brush
import androidx.compose.ui.graphics.TileMode import androidx.compose.ui.graphics.TileMode
import androidx.compose.ui.graphics.graphicsLayer import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import de.chaosdorf.meteroid.sync.SyncManager
import de.chaosdorf.meteroid.sync.base.SyncHandler import de.chaosdorf.meteroid.sync.base.SyncHandler
import de.chaosdorf.meteroid.viewmodel.NavigationElement import de.chaosdorf.meteroid.viewmodel.NavigationElement
import de.chaosdorf.meteroid.viewmodel.NavigationViewModel import de.chaosdorf.meteroid.viewmodel.NavigationViewModel
......
...@@ -32,7 +32,10 @@ import androidx.compose.foundation.shape.CircleShape ...@@ -32,7 +32,10 @@ import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material3.MaterialTheme import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text 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.Alignment
import androidx.compose.ui.Modifier import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip import androidx.compose.ui.draw.clip
...@@ -46,7 +49,6 @@ import coil3.compose.rememberAsyncImagePainter ...@@ -46,7 +49,6 @@ import coil3.compose.rememberAsyncImagePainter
import de.chaosdorf.meteroid.model.Drink import de.chaosdorf.meteroid.model.Drink
import de.chaosdorf.meteroid.theme.secondaryGradient import de.chaosdorf.meteroid.theme.secondaryGradient
import de.chaosdorf.meteroid.ui.common.PriceBadge import de.chaosdorf.meteroid.ui.common.PriceBadge
import kotlinx.coroutines.delay
import java.math.BigDecimal import java.math.BigDecimal
import java.util.* import java.util.*
......
...@@ -24,11 +24,7 @@ ...@@ -24,11 +24,7 @@
package de.chaosdorf.meteroid.ui.purchase package de.chaosdorf.meteroid.ui.purchase
import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.*
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.slideInVertically
import androidx.compose.animation.slideOutVertically
import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Box
import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.padding
...@@ -37,7 +33,6 @@ import androidx.compose.foundation.lazy.grid.GridItemSpan ...@@ -37,7 +33,6 @@ import androidx.compose.foundation.lazy.grid.GridItemSpan
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
import androidx.compose.foundation.lazy.grid.items import androidx.compose.foundation.lazy.grid.items
import androidx.compose.material3.Snackbar import androidx.compose.material3.Snackbar
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.* import androidx.compose.runtime.*
import androidx.compose.ui.Alignment import androidx.compose.ui.Alignment
......
...@@ -32,8 +32,8 @@ import androidx.compose.material3.Button ...@@ -32,8 +32,8 @@ import androidx.compose.material3.Button
import androidx.compose.material3.Text import androidx.compose.material3.Text
import androidx.compose.runtime.* import androidx.compose.runtime.*
import de.chaosdorf.meteroid.model.Server import de.chaosdorf.meteroid.model.Server
import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
import de.chaosdorf.meteroid.util.humanReadableHost import de.chaosdorf.meteroid.util.humanReadableHost
import de.chaosdorf.meteroid.viewmodel.MeteroidRoute
import de.chaosdorf.meteroid.viewmodel.Navigator import de.chaosdorf.meteroid.viewmodel.Navigator
import de.chaosdorf.meteroid.viewmodel.ServerListViewModel import de.chaosdorf.meteroid.viewmodel.ServerListViewModel
import kotlinx.coroutines.flow.update import kotlinx.coroutines.flow.update
......
...@@ -40,7 +40,6 @@ import de.chaosdorf.meteroid.sync.AccountProvider ...@@ -40,7 +40,6 @@ import de.chaosdorf.meteroid.sync.AccountProvider
import de.chaosdorf.meteroid.sync.SyncManager import de.chaosdorf.meteroid.sync.SyncManager
import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.flow.* import kotlinx.coroutines.flow.*
import kotlinx.coroutines.launch
import java.math.BigDecimal import java.math.BigDecimal
import kotlin.time.Duration.Companion.minutes import kotlin.time.Duration.Companion.minutes
......
...@@ -65,7 +65,7 @@ class PurchaseViewModel @AssistedInject constructor( ...@@ -65,7 +65,7 @@ class PurchaseViewModel @AssistedInject constructor(
private val accountProvider: AccountProvider, private val accountProvider: AccountProvider,
private val syncManager: SyncManager, private val syncManager: SyncManager,
wrappedPreferences: WrappedPreferences, wrappedPreferences: WrappedPreferences,
private val accountPreferences: AccountPreferences, accountPreferences: AccountPreferences,
drinkRepository: DrinkRepository, drinkRepository: DrinkRepository,
) : ViewModel() { ) : ViewModel() {
val serverId: ServerId = ServerId(server) val serverId: ServerId = ServerId(server)
......
...@@ -39,7 +39,6 @@ import de.chaosdorf.meteroid.model.Transaction ...@@ -39,7 +39,6 @@ import de.chaosdorf.meteroid.model.Transaction
import de.chaosdorf.meteroid.model.TransactionRepository import de.chaosdorf.meteroid.model.TransactionRepository
import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.callbackFlow
import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.combine
import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.stateIn
import kotlinx.datetime.* import kotlinx.datetime.*
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment