Fix settings and search ui package (#1574)

* Fix settings and search ui package

This commit fixes the settings and search components to the `ui` package.
It also removes the unused `SettingsViewModel` and updates the relevant imports.

* cleanup imports

Author: yschimke

shared/src/androidMain/kotlin/dev/johnoreilly/confetti/analytics/FirebaseAnalyticsLogger.kt

@@ -1,9 +1,9 @@
 package dev.johnoreilly.confetti.analytics
 
+import com.google.firebase.Firebase
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.analytics
 import com.google.firebase.analytics.logEvent
-import com.google.firebase.Firebase
 
 object FirebaseAnalyticsLogger : AnalyticsLogger {
     val analytics by lazy { Firebase.analytics }

shared/src/androidMain/kotlin/dev/johnoreilly/confetti/di/KoinAndroid.kt

@@ -14,13 +14,13 @@ import androidx.work.WorkManager
 import coil.ImageLoader
 import coil.decode.SvgDecoder
 import com.apollographql.apollo.ApolloClient
-import com.apollographql.cache.normalized.FetchPolicy
-import com.apollographql.cache.normalized.memory.MemoryCacheFactory
-import com.apollographql.cache.normalized.api.NormalizedCacheFactory
-import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
 import com.apollographql.apollo.network.http.ApolloClientAwarenessInterceptor
 import com.apollographql.apollo.network.http.DefaultHttpEngine
 import com.apollographql.apollo.network.ws.DefaultWebSocketEngine
+import com.apollographql.cache.normalized.FetchPolicy
+import com.apollographql.cache.normalized.api.NormalizedCacheFactory
+import com.apollographql.cache.normalized.memory.MemoryCacheFactory
+import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.data.WearDataLayerRegistry
 import com.russhwolf.settings.ExperimentalSettingsApi

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ApolloClientCache.kt

@@ -6,16 +6,15 @@ import com.apollographql.apollo.api.ApolloRequest
 import com.apollographql.apollo.api.ApolloResponse
 import com.apollographql.apollo.api.ExecutionContext
 import com.apollographql.apollo.api.Operation
-import com.apollographql.cache.normalized.apolloStore
-import com.apollographql.cache.normalized.normalizedCache
 import com.apollographql.apollo.exception.ApolloException
 import com.apollographql.apollo.exception.ApolloHttpException
 import com.apollographql.apollo.interceptor.ApolloInterceptor
 import com.apollographql.apollo.interceptor.ApolloInterceptorChain
-import com.apollographql.apollo.network.NetworkMonitor
 import com.apollographql.cache.normalized.api.CacheControlCacheResolver
 import com.apollographql.cache.normalized.api.SchemaCoordinatesMaxAgeProvider
+import com.apollographql.cache.normalized.apolloStore
 import com.apollographql.cache.normalized.maxStale
+import com.apollographql.cache.normalized.normalizedCache
 import com.apollographql.cache.normalized.storeReceivedDate
 import dev.johnoreilly.confetti.cache.Cache
 import dev.johnoreilly.confetti.di.getNormalizedCacheFactory

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ConfettiRepository.kt

@@ -4,11 +4,11 @@ import com.apollographql.apollo.ApolloCall
 import com.apollographql.apollo.api.ApolloResponse
 import com.apollographql.apollo.api.Mutation
 import com.apollographql.apollo.api.Operation
+import com.apollographql.apollo.exception.DefaultApolloException
 import com.apollographql.cache.normalized.FetchPolicy
 import com.apollographql.cache.normalized.apolloStore
 import com.apollographql.cache.normalized.optimisticUpdates
 import com.apollographql.cache.normalized.watch
-import com.apollographql.apollo.exception.DefaultApolloException
 import com.benasher44.uuid.uuid4
 import dev.johnoreilly.confetti.type.buildBookmarks
 import kotlinx.coroutines.flow.Flow

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/AppComponent.kt

@@ -13,8 +13,6 @@ import dev.johnoreilly.confetti.auth.Authentication
 import dev.johnoreilly.confetti.auth.User
 import dev.johnoreilly.confetti.decompose.AppComponent.Child
 import dev.johnoreilly.confetti.work.NotificationSender
-import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.map
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import org.koin.core.component.KoinComponent

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/ConferenceComponent.kt

@@ -10,8 +10,8 @@ import com.arkivanov.decompose.router.stack.pop
 import com.arkivanov.decompose.router.stack.push
 import com.arkivanov.decompose.value.Value
 import com.arkivanov.essenty.backhandler.BackHandlerOwner
-import dev.johnoreilly.confetti.decompose.ConferenceComponent.Child
 import dev.johnoreilly.confetti.auth.User
+import dev.johnoreilly.confetti.decompose.ConferenceComponent.Child
 import kotlinx.serialization.Serializable
 import org.koin.core.component.KoinComponent
 

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/HomeComponent.kt

@@ -7,8 +7,8 @@ import com.arkivanov.decompose.router.stack.bringToFront
 import com.arkivanov.decompose.router.stack.childStack
 import com.arkivanov.decompose.value.Value
 import dev.johnoreilly.confetti.BuildKonfig
-import dev.johnoreilly.confetti.decompose.HomeComponent.Child
 import dev.johnoreilly.confetti.auth.User
+import dev.johnoreilly.confetti.decompose.HomeComponent.Child
 import kotlinx.serialization.Serializable
 
 interface HomeComponent {

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/JobConferenceRefresh.kt

@@ -2,7 +2,6 @@ package dev.johnoreilly.confetti.decompose
 
 import dev.johnoreilly.confetti.ApolloClientCache
 import dev.johnoreilly.confetti.ConfettiRepository
-import dev.johnoreilly.confetti.work.AvatarType
 import dev.johnoreilly.confetti.work.updateCache
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/App.kt

@@ -46,16 +46,16 @@ import confetti.shared.generated.resources.bookmarks
 import confetti.shared.generated.resources.schedule
 import confetti.shared.generated.resources.speakers
 import confetti.shared.generated.resources.venue
-import dev.johnoreilly.confetti.bookmarks.BookmarksUI
 import dev.johnoreilly.confetti.decompose.AppComponent
 import dev.johnoreilly.confetti.decompose.ConferenceComponent
 import dev.johnoreilly.confetti.decompose.DefaultAppComponent
 import dev.johnoreilly.confetti.decompose.HomeComponent
-import dev.johnoreilly.confetti.search.SearchUI
-import dev.johnoreilly.confetti.settings.SettingsUI
+import dev.johnoreilly.confetti.ui.bookmarks.BookmarksUI
 import dev.johnoreilly.confetti.ui.component.LoadingView
+import dev.johnoreilly.confetti.ui.search.SearchUI
 import dev.johnoreilly.confetti.ui.sessions.SessionDetailsUI
 import dev.johnoreilly.confetti.ui.sessions.SessionsUI
+import dev.johnoreilly.confetti.ui.settings.SettingsUI
 import dev.johnoreilly.confetti.ui.speakers.SpeakerDetailsUI
 import dev.johnoreilly.confetti.ui.speakers.SpeakersUI
 import dev.johnoreilly.confetti.ui.venue.VenueUI

shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/bookmarks/BookmarksUI.kt

@@ -1,9 +1,8 @@
-package dev.johnoreilly.confetti.bookmarks
+package dev.johnoreilly.confetti.ui.bookmarks
 
 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material3.windowsizeclass.WindowSizeClass
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import confetti.shared.generated.resources.Res