diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/Routes.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/Routes.kt index f70cb89..5535ccb 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/Routes.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/Routes.kt @@ -4,9 +4,9 @@ import android.annotation.SuppressLint import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.runtime.Composable -import it.vfsfitvnm.route.Route0 -import it.vfsfitvnm.route.Route1 -import it.vfsfitvnm.route.RouteHandlerScope +import it.vfsfitvnm.compose.routing.Route0 +import it.vfsfitvnm.compose.routing.Route1 +import it.vfsfitvnm.compose.routing.RouteHandlerScope import it.vfsfitvnm.vimusic.enums.BuiltInPlaylist import it.vfsfitvnm.vimusic.ui.screens.album.AlbumScreen import it.vfsfitvnm.vimusic.ui.screens.artist.ArtistScreen diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt index 885c778..8b2fdea 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/album/AlbumScreen.kt @@ -22,7 +22,7 @@ import it.vfsfitvnm.compose.persist.persist import it.vfsfitvnm.innertube.Innertube import it.vfsfitvnm.innertube.models.bodies.BrowseBody import it.vfsfitvnm.innertube.requests.albumPage -import it.vfsfitvnm.route.RouteHandler +import it.vfsfitvnm.compose.routing.RouteHandler import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.models.Album diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistScreen.kt index 60067a3..d252e97 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/artist/ArtistScreen.kt @@ -25,7 +25,7 @@ import it.vfsfitvnm.innertube.models.bodies.ContinuationBody import it.vfsfitvnm.innertube.requests.artistPage import it.vfsfitvnm.innertube.requests.itemsPage import it.vfsfitvnm.innertube.utils.from -import it.vfsfitvnm.route.RouteHandler +import it.vfsfitvnm.compose.routing.RouteHandler import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder import it.vfsfitvnm.vimusic.R diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistScreen.kt index 4517944..2d678d9 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/builtinplaylist/BuiltInPlaylistScreen.kt @@ -7,7 +7,7 @@ import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveableStateHolder import it.vfsfitvnm.compose.persist.PersistMapCleanup -import it.vfsfitvnm.route.RouteHandler +import it.vfsfitvnm.compose.routing.RouteHandler import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.enums.BuiltInPlaylist import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt index e371bb0..6dedb89 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/home/HomeScreen.kt @@ -6,13 +6,13 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.saveable.rememberSaveableStateHolder import androidx.compose.ui.platform.LocalContext import it.vfsfitvnm.compose.persist.PersistMapCleanup -import it.vfsfitvnm.route.RouteHandler -import it.vfsfitvnm.route.defaultStacking -import it.vfsfitvnm.route.defaultStill -import it.vfsfitvnm.route.defaultUnstacking -import it.vfsfitvnm.route.isStacking -import it.vfsfitvnm.route.isUnknown -import it.vfsfitvnm.route.isUnstacking +import it.vfsfitvnm.compose.routing.RouteHandler +import it.vfsfitvnm.compose.routing.defaultStacking +import it.vfsfitvnm.compose.routing.defaultStill +import it.vfsfitvnm.compose.routing.defaultUnstacking +import it.vfsfitvnm.compose.routing.isStacking +import it.vfsfitvnm.compose.routing.isUnknown +import it.vfsfitvnm.compose.routing.isUnstacking import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.models.SearchQuery diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistScreen.kt index 9f5f92f..8df4f82 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistScreen.kt @@ -5,7 +5,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.runtime.Composable import androidx.compose.runtime.saveable.rememberSaveableStateHolder import it.vfsfitvnm.compose.persist.PersistMapCleanup -import it.vfsfitvnm.route.RouteHandler +import it.vfsfitvnm.compose.routing.RouteHandler import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.screens.globalRoutes diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt index 47ed32d..4feaebe 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/localplaylist/LocalPlaylistSongs.kt @@ -27,11 +27,11 @@ import it.vfsfitvnm.compose.persist.persist import it.vfsfitvnm.innertube.Innertube import it.vfsfitvnm.innertube.models.bodies.BrowseBody import it.vfsfitvnm.innertube.requests.playlistPage -import it.vfsfitvnm.reordering.ReorderingLazyColumn -import it.vfsfitvnm.reordering.animateItemPlacement -import it.vfsfitvnm.reordering.draggedItem -import it.vfsfitvnm.reordering.rememberReorderingState -import it.vfsfitvnm.reordering.reorder +import it.vfsfitvnm.compose.reordering.ReorderingLazyColumn +import it.vfsfitvnm.compose.reordering.animateItemPlacement +import it.vfsfitvnm.compose.reordering.draggedItem +import it.vfsfitvnm.compose.reordering.rememberReorderingState +import it.vfsfitvnm.compose.reordering.reorder import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Player.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Player.kt index 2c5845c..12b6d10 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Player.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Player.kt @@ -47,7 +47,7 @@ import androidx.media3.common.MediaItem import androidx.media3.common.Player import coil.compose.AsyncImage import it.vfsfitvnm.innertube.models.NavigationEndpoint -import it.vfsfitvnm.route.OnGlobalRoute +import it.vfsfitvnm.compose.routing.OnGlobalRoute import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.service.PlayerService diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt index b7a77f6..138d985 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/player/Queue.kt @@ -53,11 +53,11 @@ import androidx.media3.common.MediaItem import androidx.media3.common.Player import androidx.media3.common.Timeline import com.valentinilk.shimmer.shimmer -import it.vfsfitvnm.reordering.ReorderingLazyColumn -import it.vfsfitvnm.reordering.animateItemPlacement -import it.vfsfitvnm.reordering.draggedItem -import it.vfsfitvnm.reordering.rememberReorderingState -import it.vfsfitvnm.reordering.reorder +import it.vfsfitvnm.compose.reordering.ReorderingLazyColumn +import it.vfsfitvnm.compose.reordering.animateItemPlacement +import it.vfsfitvnm.compose.reordering.draggedItem +import it.vfsfitvnm.compose.reordering.rememberReorderingState +import it.vfsfitvnm.compose.reordering.reorder import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.components.BottomSheet diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistScreen.kt index a936005..c73ac9b 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/playlist/PlaylistScreen.kt @@ -5,7 +5,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.runtime.Composable import androidx.compose.runtime.saveable.rememberSaveableStateHolder import it.vfsfitvnm.compose.persist.PersistMapCleanup -import it.vfsfitvnm.route.RouteHandler +import it.vfsfitvnm.compose.routing.RouteHandler import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.screens.globalRoutes diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/SearchScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/SearchScreen.kt index eb6c3fc..49426c3 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/SearchScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/search/SearchScreen.kt @@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.input.TextFieldValue import it.vfsfitvnm.compose.persist.PersistMapCleanup -import it.vfsfitvnm.route.RouteHandler +import it.vfsfitvnm.compose.routing.RouteHandler import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.screens.globalRoutes diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/SearchResultScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/SearchResultScreen.kt index f980da7..46266bb 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/SearchResultScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/searchresult/SearchResultScreen.kt @@ -18,7 +18,7 @@ import it.vfsfitvnm.innertube.models.bodies.ContinuationBody import it.vfsfitvnm.innertube.models.bodies.SearchBody import it.vfsfitvnm.innertube.requests.searchPage import it.vfsfitvnm.innertube.utils.from -import it.vfsfitvnm.route.RouteHandler +import it.vfsfitvnm.compose.routing.RouteHandler import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.components.LocalMenuState diff --git a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/SettingsScreen.kt b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/SettingsScreen.kt index 6186d7f..aa67bdb 100644 --- a/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/SettingsScreen.kt +++ b/app/src/main/kotlin/it/vfsfitvnm/vimusic/ui/screens/settings/SettingsScreen.kt @@ -1,27 +1,37 @@ package it.vfsfitvnm.vimusic.ui.screens.settings -import androidx.compose.animation.* -import androidx.compose.foundation.* -import androidx.compose.foundation.layout.* +import androidx.compose.animation.ExperimentalAnimationApi +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding import androidx.compose.foundation.text.BasicText -import androidx.compose.runtime.* +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveableStateHolder +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.draw.alpha -import androidx.compose.ui.graphics.* -import androidx.compose.ui.platform.LocalSavedStateRegistryOwner import androidx.compose.ui.unit.dp -import it.vfsfitvnm.route.* +import it.vfsfitvnm.compose.routing.RouteHandler import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.components.themed.Switch import it.vfsfitvnm.vimusic.ui.components.themed.ValueSelectorDialog import it.vfsfitvnm.vimusic.ui.screens.globalRoutes -import it.vfsfitvnm.vimusic.ui.screens.settings.* import it.vfsfitvnm.vimusic.ui.styling.LocalAppearance -import it.vfsfitvnm.vimusic.utils.* +import it.vfsfitvnm.vimusic.utils.color +import it.vfsfitvnm.vimusic.utils.secondary +import it.vfsfitvnm.vimusic.utils.semiBold @ExperimentalFoundationApi @ExperimentalAnimationApi diff --git a/compose-reordering/build.gradle.kts b/compose-reordering/build.gradle.kts index 22dc0a1..f2ae44b 100644 --- a/compose-reordering/build.gradle.kts +++ b/compose-reordering/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } android { - namespace = "it.vfsfitvnm.reordering" + namespace = "it.vfsfitvnm.compose.reordering" compileSdk = 33 defaultConfig { diff --git a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/AnimatablesPool.kt b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/AnimatablesPool.kt similarity index 96% rename from compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/AnimatablesPool.kt rename to compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/AnimatablesPool.kt index dcef4f0..f0a968c 100644 --- a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/AnimatablesPool.kt +++ b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/AnimatablesPool.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.reordering +package it.vfsfitvnm.compose.reordering import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector diff --git a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/AnimateItemPlacement.kt b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/AnimateItemPlacement.kt similarity index 89% rename from compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/AnimateItemPlacement.kt rename to compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/AnimateItemPlacement.kt index 79c612d..69a3859 100644 --- a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/AnimateItemPlacement.kt +++ b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/AnimateItemPlacement.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.reordering +package it.vfsfitvnm.compose.reordering import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.lazy.LazyItemScope diff --git a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/DraggedItem.kt b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/DraggedItem.kt similarity index 96% rename from compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/DraggedItem.kt rename to compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/DraggedItem.kt index 59f4042..d626e29 100644 --- a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/DraggedItem.kt +++ b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/DraggedItem.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.reordering +package it.vfsfitvnm.compose.reordering import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.layout.offset diff --git a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/Reorder.kt b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/Reorder.kt similarity index 97% rename from compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/Reorder.kt rename to compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/Reorder.kt index c061487..7b7d591 100644 --- a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/Reorder.kt +++ b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/Reorder.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.reordering +package it.vfsfitvnm.compose.reordering import androidx.compose.foundation.gestures.detectDragGestures import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress diff --git a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingLazyColumn.kt b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingLazyColumn.kt similarity index 97% rename from compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingLazyColumn.kt rename to compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingLazyColumn.kt index 927ad5d..e970e7e 100644 --- a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingLazyColumn.kt +++ b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingLazyColumn.kt @@ -1,6 +1,6 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package it.vfsfitvnm.reordering +package it.vfsfitvnm.compose.reordering import androidx.compose.foundation.gestures.FlingBehavior import androidx.compose.foundation.gestures.ScrollableDefaults diff --git a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingLazyList.kt b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingLazyList.kt similarity index 99% rename from compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingLazyList.kt rename to compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingLazyList.kt index 30514fd..8752a51 100644 --- a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingLazyList.kt +++ b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingLazyList.kt @@ -1,6 +1,6 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package it.vfsfitvnm.reordering +package it.vfsfitvnm.compose.reordering import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.OverscrollEffect diff --git a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingState.kt b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingState.kt similarity index 99% rename from compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingState.kt rename to compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingState.kt index ff8f22e..11f4dc9 100644 --- a/compose-reordering/src/main/kotlin/it/vfsfitvnm/reordering/ReorderingState.kt +++ b/compose-reordering/src/main/kotlin/it/vfsfitvnm/compose/reordering/ReorderingState.kt @@ -1,6 +1,6 @@ @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") -package it.vfsfitvnm.reordering +package it.vfsfitvnm.compose.reordering import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationVector1D diff --git a/compose-routing/build.gradle.kts b/compose-routing/build.gradle.kts index ed120d4..b33472c 100644 --- a/compose-routing/build.gradle.kts +++ b/compose-routing/build.gradle.kts @@ -4,7 +4,7 @@ plugins { } android { - namespace = "it.vfsfitvnm.route" + namespace = "it.vfsfitvnm.compose.routing" compileSdk = 33 defaultConfig { diff --git a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/GlobalRoute.kt b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/GlobalRoute.kt similarity index 91% rename from compose-routing/src/main/kotlin/it/vfsfitvnm/route/GlobalRoute.kt rename to compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/GlobalRoute.kt index 00a17af..920343b 100644 --- a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/GlobalRoute.kt +++ b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/GlobalRoute.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.route +package it.vfsfitvnm.compose.routing import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect diff --git a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Route.kt b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/Route.kt similarity index 98% rename from compose-routing/src/main/kotlin/it/vfsfitvnm/route/Route.kt rename to compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/Route.kt index 992286d..5c6b02c 100644 --- a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Route.kt +++ b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/Route.kt @@ -1,6 +1,6 @@ @file:Suppress("UNCHECKED_CAST") -package it.vfsfitvnm.route +package it.vfsfitvnm.compose.routing import androidx.compose.runtime.Composable import androidx.compose.runtime.Immutable diff --git a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/RouteHandler.kt b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/RouteHandler.kt similarity index 98% rename from compose-routing/src/main/kotlin/it/vfsfitvnm/route/RouteHandler.kt rename to compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/RouteHandler.kt index 14032bc..212fd58 100644 --- a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/RouteHandler.kt +++ b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/RouteHandler.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.route +package it.vfsfitvnm.compose.routing import androidx.activity.compose.BackHandler import androidx.activity.compose.LocalOnBackPressedDispatcherOwner diff --git a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/RouteHandlerScope.kt b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/RouteHandlerScope.kt similarity index 95% rename from compose-routing/src/main/kotlin/it/vfsfitvnm/route/RouteHandlerScope.kt rename to compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/RouteHandlerScope.kt index 05394e5..17429af 100644 --- a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/RouteHandlerScope.kt +++ b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/RouteHandlerScope.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.route +package it.vfsfitvnm.compose.routing import android.annotation.SuppressLint import androidx.compose.runtime.Composable diff --git a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Transitions.kt b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/Transitions.kt similarity index 97% rename from compose-routing/src/main/kotlin/it/vfsfitvnm/route/Transitions.kt rename to compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/Transitions.kt index 79a54a1..3be3f19 100644 --- a/compose-routing/src/main/kotlin/it/vfsfitvnm/route/Transitions.kt +++ b/compose-routing/src/main/kotlin/it/vfsfitvnm/compose/routing/Transitions.kt @@ -1,4 +1,4 @@ -package it.vfsfitvnm.route +package it.vfsfitvnm.compose.routing import androidx.compose.animation.AnimatedContentScope import androidx.compose.animation.ContentTransform