Skip to content

Fix settings and search ui package #1574

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yschimke merged 2 commits into from
Apr 6, 2025
Merged

Fix settings and search ui package #1574

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04e5987
Fix settings and search ui package
yschimke Apr 6, 2025
deb33dc
cleanup imports
yschimke Apr 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion shared/src/androidMain/kotlin/dev/johnoreilly/confetti/analytics/FirebaseAnalyticsLogger.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
8 changes: 4 additions & 4 deletions shared/src/androidMain/kotlin/dev/johnoreilly/confetti/di/KoinAndroid.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 2 additions & 3 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ApolloClientCache.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ConfettiRepository.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/AppComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/ConferenceComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/HomeComponent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 0 additions & 1 deletion shared/src/commonMain/kotlin/dev/johnoreilly/confetti/decompose/JobConferenceRefresh.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/bookmarks/BookmarksUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/bookmarks/BookmarksView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@file:OptIn(ExperimentalFoundationApi::class, ExperimentalFoundationApi::class)

package dev.johnoreilly.confetti.bookmarks
package dev.johnoreilly.confetti.ui.bookmarks

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Column
Expand All @@ -25,10 +25,10 @@ import confetti.shared.generated.resources.bookmarks_past
import confetti.shared.generated.resources.bookmarks_upcoming
import confetti.shared.generated.resources.no_bookmarks
import dev.johnoreilly.confetti.decompose.DateSessionsMap
import dev.johnoreilly.confetti.ui.component.LoadingView
import dev.johnoreilly.confetti.ui.component.ConfettiHeader
import dev.johnoreilly.confetti.ui.component.ConfettiTab
import dev.johnoreilly.confetti.ui.component.EmptyView
import dev.johnoreilly.confetti.ui.component.LoadingView
import dev.johnoreilly.confetti.ui.sessions.SessionItemView
import kotlinx.coroutines.launch
import org.jetbrains.compose.resources.stringResource
Expand Down
3 changes: 1 addition & 2 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/search/SearchUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package dev.johnoreilly.confetti.search
package dev.johnoreilly.confetti.ui.search

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
Expand Down
4 changes: 2 additions & 2 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/search/SearchView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
ExperimentalFoundationApi::class, ExperimentalLayoutApi::class
)

package dev.johnoreilly.confetti.search
package dev.johnoreilly.confetti.ui.search

import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.Column
Expand Down Expand Up @@ -54,8 +54,8 @@ import confetti.shared.generated.resources.sessions
import confetti.shared.generated.resources.speakers
import dev.johnoreilly.confetti.fragment.SessionDetails
import dev.johnoreilly.confetti.fragment.SpeakerDetails
import dev.johnoreilly.confetti.ui.component.LoadingView
import dev.johnoreilly.confetti.ui.component.ConfettiHeader
import dev.johnoreilly.confetti.ui.component.LoadingView
import dev.johnoreilly.confetti.ui.sessions.SessionItemView
import dev.johnoreilly.confetti.ui.speakers.SpeakerItemView
import org.jetbrains.compose.resources.stringResource
Expand Down
2 changes: 1 addition & 1 deletion shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/sessions/SessionItemView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ import dev.johnoreilly.confetti.isBreak
import dev.johnoreilly.confetti.isLightning
import dev.johnoreilly.confetti.isService
import dev.johnoreilly.confetti.sessionSpeakers
import dev.johnoreilly.confetti.ui.bookmarks.Bookmark
import dev.johnoreilly.confetti.ui.SignInDialog
import dev.johnoreilly.confetti.ui.bookmarks.Bookmark

@Composable
fun SessionItemView(
Expand Down
2 changes: 1 addition & 1 deletion shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/settings/SettingsUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@file:OptIn(ExperimentalMaterial3Api::class)

package dev.johnoreilly.confetti.settings
package dev.johnoreilly.confetti.ui.settings

import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Box
Expand Down
99 changes: 0 additions & 99 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/settings/SettingsViewModel.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/speakers/SpeakersDetailsView.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ import coil3.compose.AsyncImage
import confetti.shared.generated.resources.Res
import confetti.shared.generated.resources.sessions
import dev.johnoreilly.confetti.fragment.SpeakerDetails
import dev.johnoreilly.confetti.ui.sessions.SocialIcon
import dev.johnoreilly.confetti.ui.component.ConfettiHeader
import dev.johnoreilly.confetti.ui.sessions.SocialIcon
import org.jetbrains.compose.resources.stringResource

@OptIn(ExperimentalMaterial3Api::class)
Expand Down
4 changes: 2 additions & 2 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/speakers/SpeakersUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package dev.johnoreilly.confetti.ui.speakers

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
Expand All @@ -17,8 +17,8 @@ import dev.johnoreilly.confetti.decompose.SpeakerDetailsComponent
import dev.johnoreilly.confetti.decompose.SpeakerDetailsUiState
import dev.johnoreilly.confetti.decompose.SpeakersComponent
import dev.johnoreilly.confetti.decompose.SpeakersUiState
import dev.johnoreilly.confetti.ui.component.LoadingView
import dev.johnoreilly.confetti.ui.component.ErrorView
import dev.johnoreilly.confetti.ui.component.LoadingView
import org.jetbrains.compose.resources.stringResource

@OptIn(ExperimentalMaterial3Api::class)
Expand Down
4 changes: 2 additions & 2 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/ui/venue/VenueUI.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,17 @@ package dev.johnoreilly.confetti.ui.venue

import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.padding
import androidx.compose.material3.Scaffold
import androidx.compose.material3.CenterAlignedTopAppBar
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Modifier
import com.arkivanov.decompose.extensions.compose.subscribeAsState
import dev.johnoreilly.confetti.decompose.VenueComponent
import dev.johnoreilly.confetti.ui.component.LoadingView
import dev.johnoreilly.confetti.ui.component.ErrorView
import dev.johnoreilly.confetti.ui.component.LoadingView

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
4 changes: 2 additions & 2 deletions shared/src/commonMain/kotlin/dev/johnoreilly/confetti/utils/ClientQuery.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@ package dev.johnoreilly.confetti.utils
import com.apollographql.apollo.ApolloCall
import com.apollographql.apollo.api.Error
import com.apollographql.apollo.api.Query
import com.apollographql.cache.normalized.CacheInfo
import com.apollographql.cache.normalized.cacheInfo
import com.apollographql.apollo.exception.ApolloException
import com.apollographql.apollo.exception.CacheMissException
import com.apollographql.cache.normalized.CacheInfo
import com.apollographql.cache.normalized.cacheInfo
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.filterNot
import kotlinx.coroutines.flow.runningFold
Expand Down
4 changes: 2 additions & 2 deletions shared/src/iosMain/kotlin/dev/johnoreilly/confetti/di/KoiniOS.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
package dev.johnoreilly.confetti.di

import com.apollographql.apollo.ApolloClient
import com.apollographql.apollo.network.http.ApolloClientAwarenessInterceptor
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.memory.MemoryCacheFactory
import com.apollographql.cache.normalized.sql.SqlNormalizedCacheFactory
import com.apollographql.apollo.network.http.ApolloClientAwarenessInterceptor
import com.russhwolf.settings.ExperimentalSettingsApi
import com.russhwolf.settings.NSUserDefaultsSettings
import com.russhwolf.settings.ObservableSettings
Expand Down
4 changes: 3 additions & 1 deletion shared/src/iosMain/kotlin/dev/johnoreilly/confetti/utils/IosDateService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@ import kotlinx.datetime.LocalDateTime
import kotlinx.datetime.TimeZone
import kotlinx.datetime.toKotlinInstant
import kotlinx.datetime.toLocalDateTime
import platform.Foundation.*
import platform.Foundation.NSDate
import platform.Foundation.NSDateFormatter
import platform.Foundation.now

class IosDateService: DateService {
private val nsDateFormatter = NSDateFormatter()
Expand Down
2 changes: 1 addition & 1 deletion shared/src/jvmMain/kotlin/Main.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import com.apollographql.apollo.ApolloClient
import com.apollographql.apollo.api.ApolloResponse
import com.apollographql.apollo.api.DefaultFakeResolver
import com.apollographql.apollo.api.FakeResolverContext
import com.apollographql.cache.normalized.FetchPolicy
import com.apollographql.apollo.testing.MapTestNetworkTransport
import com.apollographql.cache.normalized.FetchPolicy
import com.benasher44.uuid.uuid4
import dev.johnoreilly.confetti.di.initKoin
import dev.johnoreilly.confetti.schema.__Schema
Expand Down
Loading
Loading