Merge pull request #763 from joreilly/move_decompose_files

move Decompose components to commonMain

Author: joreilly

androidApp/src/main/java/dev/johnoreilly/confetti/MainActivity.kt

@@ -16,6 +16,8 @@ import androidx.lifecycle.repeatOnLifecycle
 import com.arkivanov.decompose.defaultComponentContext
 import com.google.accompanist.adaptive.calculateDisplayFeatures
 import dev.johnoreilly.confetti.account.googleSignInClient
+import dev.johnoreilly.confetti.decompose.DefaultAppComponent
+import dev.johnoreilly.confetti.decompose.SettingsComponent
 import dev.johnoreilly.confetti.ui.ConfettiApp
 import dev.johnoreilly.confetti.ui.ConfettiTheme
 import dev.johnoreilly.confetti.ui.component.ConfettiBackground

androidApp/src/main/java/dev/johnoreilly/confetti/account/SignInView.kt

@@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
 import dev.johnoreilly.confetti.R
-import dev.johnoreilly.confetti.SignInComponent
+import dev.johnoreilly.confetti.decompose.SignInComponent
 import org.koin.compose.koinInject
 
 

androidApp/src/main/java/dev/johnoreilly/confetti/bookmarks/BookmarksRoute.kt

@@ -6,7 +6,7 @@ import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import dev.johnoreilly.confetti.BookmarksComponent
+import dev.johnoreilly.confetti.decompose.BookmarksComponent
 import dev.johnoreilly.confetti.R
 import dev.johnoreilly.confetti.ui.HomeScaffold
 

androidApp/src/main/java/dev/johnoreilly/confetti/bookmarks/BookmarksView.kt

@@ -20,7 +20,7 @@ import androidx.compose.material3.TabRow
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
-import dev.johnoreilly.confetti.DateSessionsMap
+import dev.johnoreilly.confetti.decompose.DateSessionsMap
 import dev.johnoreilly.confetti.sessions.SessionItemView
 import dev.johnoreilly.confetti.ui.LoadingView
 import dev.johnoreilly.confetti.ui.component.ConfettiHeader

androidApp/src/main/java/dev/johnoreilly/confetti/conferences/ConferencesView.kt

@@ -24,7 +24,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.arkivanov.decompose.extensions.compose.jetpack.subscribeAsState
-import dev.johnoreilly.confetti.ConferencesComponent
+import dev.johnoreilly.confetti.decompose.ConferencesComponent
 import dev.johnoreilly.confetti.GetConferencesQuery
 import dev.johnoreilly.confetti.R
 import dev.johnoreilly.confetti.ui.ConfettiTheme

androidApp/src/main/java/dev/johnoreilly/confetti/di/AppModule.kt

@@ -8,9 +8,9 @@ import com.arkivanov.essenty.lifecycle.LifecycleRegistry
 import com.arkivanov.essenty.lifecycle.resume
 import com.google.android.horologist.annotations.ExperimentalHorologistApi
 import com.google.android.horologist.datalayer.phone.PhoneDataLayerAppHelper
-import dev.johnoreilly.confetti.ConferenceRefresh
+import dev.johnoreilly.confetti.decompose.ConferenceRefresh
 import dev.johnoreilly.confetti.ConfettiRepository
-import dev.johnoreilly.confetti.SettingsComponent
+import dev.johnoreilly.confetti.decompose.SettingsComponent
 import dev.johnoreilly.confetti.auth.Authentication
 import dev.johnoreilly.confetti.auth.DefaultAuthentication
 import dev.johnoreilly.confetti.settings.DefaultSettingsComponent

androidApp/src/main/java/dev/johnoreilly/confetti/search/SearchRoute.kt

@@ -7,7 +7,7 @@ import androidx.compose.runtime.getValue
 import androidx.compose.ui.res.stringResource
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import dev.johnoreilly.confetti.R
-import dev.johnoreilly.confetti.SearchComponent
+import dev.johnoreilly.confetti.decompose.SearchComponent
 import dev.johnoreilly.confetti.ui.HomeScaffold
 
 @Composable

androidApp/src/main/java/dev/johnoreilly/confetti/sessiondetails/SessionDetailsView.kt

@@ -49,8 +49,8 @@ import androidx.compose.ui.unit.dp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.arkivanov.decompose.extensions.compose.jetpack.subscribeAsState
 import dev.johnoreilly.confetti.R
-import dev.johnoreilly.confetti.SessionDetailsComponent
-import dev.johnoreilly.confetti.SessionDetailsUiState
+import dev.johnoreilly.confetti.decompose.SessionDetailsComponent
+import dev.johnoreilly.confetti.decompose.SessionDetailsUiState
 import dev.johnoreilly.confetti.auth.Authentication
 import dev.johnoreilly.confetti.fragment.SessionDetails
 import dev.johnoreilly.confetti.ui.Bookmark

androidApp/src/main/java/dev/johnoreilly/confetti/sessions/SessionListGridView.kt

@@ -56,7 +56,7 @@ import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import coil.compose.AsyncImage
-import dev.johnoreilly.confetti.SessionsUiState
+import dev.johnoreilly.confetti.decompose.SessionsUiState
 import dev.johnoreilly.confetti.fragment.RoomDetails
 import dev.johnoreilly.confetti.fragment.SessionDetails
 import dev.johnoreilly.confetti.isLightning

androidApp/src/main/java/dev/johnoreilly/confetti/sessions/SessionListView.kt

@@ -42,8 +42,7 @@ import androidx.compose.ui.draw.clipToBounds
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
-import dev.johnoreilly.confetti.SessionsUiState
-import dev.johnoreilly.confetti.auth.User
+import dev.johnoreilly.confetti.decompose.SessionsUiState
 import dev.johnoreilly.confetti.fragment.SessionDetails
 import dev.johnoreilly.confetti.isBreak
 import dev.johnoreilly.confetti.isLightning