Rename internal compose packages

This commit is contained in:
vfsfitvnm 2022-10-26 13:36:09 +02:00
parent ed8eb7cf8a
commit 055ad86f2c
27 changed files with 61 additions and 51 deletions

View file

@ -4,9 +4,9 @@ import android.annotation.SuppressLint
import androidx.compose.animation.ExperimentalAnimationApi import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import it.vfsfitvnm.route.Route0 import it.vfsfitvnm.compose.routing.Route0
import it.vfsfitvnm.route.Route1 import it.vfsfitvnm.compose.routing.Route1
import it.vfsfitvnm.route.RouteHandlerScope import it.vfsfitvnm.compose.routing.RouteHandlerScope
import it.vfsfitvnm.vimusic.enums.BuiltInPlaylist import it.vfsfitvnm.vimusic.enums.BuiltInPlaylist
import it.vfsfitvnm.vimusic.ui.screens.album.AlbumScreen import it.vfsfitvnm.vimusic.ui.screens.album.AlbumScreen
import it.vfsfitvnm.vimusic.ui.screens.artist.ArtistScreen import it.vfsfitvnm.vimusic.ui.screens.artist.ArtistScreen

View file

@ -22,7 +22,7 @@ import it.vfsfitvnm.compose.persist.persist
import it.vfsfitvnm.innertube.Innertube import it.vfsfitvnm.innertube.Innertube
import it.vfsfitvnm.innertube.models.bodies.BrowseBody import it.vfsfitvnm.innertube.models.bodies.BrowseBody
import it.vfsfitvnm.innertube.requests.albumPage 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.Database
import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.models.Album import it.vfsfitvnm.vimusic.models.Album

View file

@ -25,7 +25,7 @@ import it.vfsfitvnm.innertube.models.bodies.ContinuationBody
import it.vfsfitvnm.innertube.requests.artistPage import it.vfsfitvnm.innertube.requests.artistPage
import it.vfsfitvnm.innertube.requests.itemsPage import it.vfsfitvnm.innertube.requests.itemsPage
import it.vfsfitvnm.innertube.utils.from 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.Database
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.R

View file

@ -7,7 +7,7 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.saveable.rememberSaveable
import androidx.compose.runtime.saveable.rememberSaveableStateHolder import androidx.compose.runtime.saveable.rememberSaveableStateHolder
import it.vfsfitvnm.compose.persist.PersistMapCleanup 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.R
import it.vfsfitvnm.vimusic.enums.BuiltInPlaylist import it.vfsfitvnm.vimusic.enums.BuiltInPlaylist
import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold

View file

@ -6,13 +6,13 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.saveable.rememberSaveableStateHolder import androidx.compose.runtime.saveable.rememberSaveableStateHolder
import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalContext
import it.vfsfitvnm.compose.persist.PersistMapCleanup import it.vfsfitvnm.compose.persist.PersistMapCleanup
import it.vfsfitvnm.route.RouteHandler import it.vfsfitvnm.compose.routing.RouteHandler
import it.vfsfitvnm.route.defaultStacking import it.vfsfitvnm.compose.routing.defaultStacking
import it.vfsfitvnm.route.defaultStill import it.vfsfitvnm.compose.routing.defaultStill
import it.vfsfitvnm.route.defaultUnstacking import it.vfsfitvnm.compose.routing.defaultUnstacking
import it.vfsfitvnm.route.isStacking import it.vfsfitvnm.compose.routing.isStacking
import it.vfsfitvnm.route.isUnknown import it.vfsfitvnm.compose.routing.isUnknown
import it.vfsfitvnm.route.isUnstacking import it.vfsfitvnm.compose.routing.isUnstacking
import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.Database
import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.models.SearchQuery import it.vfsfitvnm.vimusic.models.SearchQuery

View file

@ -5,7 +5,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.saveable.rememberSaveableStateHolder import androidx.compose.runtime.saveable.rememberSaveableStateHolder
import it.vfsfitvnm.compose.persist.PersistMapCleanup 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.R
import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold
import it.vfsfitvnm.vimusic.ui.screens.globalRoutes import it.vfsfitvnm.vimusic.ui.screens.globalRoutes

View file

@ -27,11 +27,11 @@ import it.vfsfitvnm.compose.persist.persist
import it.vfsfitvnm.innertube.Innertube import it.vfsfitvnm.innertube.Innertube
import it.vfsfitvnm.innertube.models.bodies.BrowseBody import it.vfsfitvnm.innertube.models.bodies.BrowseBody
import it.vfsfitvnm.innertube.requests.playlistPage import it.vfsfitvnm.innertube.requests.playlistPage
import it.vfsfitvnm.reordering.ReorderingLazyColumn import it.vfsfitvnm.compose.reordering.ReorderingLazyColumn
import it.vfsfitvnm.reordering.animateItemPlacement import it.vfsfitvnm.compose.reordering.animateItemPlacement
import it.vfsfitvnm.reordering.draggedItem import it.vfsfitvnm.compose.reordering.draggedItem
import it.vfsfitvnm.reordering.rememberReorderingState import it.vfsfitvnm.compose.reordering.rememberReorderingState
import it.vfsfitvnm.reordering.reorder import it.vfsfitvnm.compose.reordering.reorder
import it.vfsfitvnm.vimusic.Database import it.vfsfitvnm.vimusic.Database
import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets import it.vfsfitvnm.vimusic.LocalPlayerAwareWindowInsets
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder

View file

@ -47,7 +47,7 @@ import androidx.media3.common.MediaItem
import androidx.media3.common.Player import androidx.media3.common.Player
import coil.compose.AsyncImage import coil.compose.AsyncImage
import it.vfsfitvnm.innertube.models.NavigationEndpoint 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.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.service.PlayerService import it.vfsfitvnm.vimusic.service.PlayerService

View file

@ -53,11 +53,11 @@ import androidx.media3.common.MediaItem
import androidx.media3.common.Player import androidx.media3.common.Player
import androidx.media3.common.Timeline import androidx.media3.common.Timeline
import com.valentinilk.shimmer.shimmer import com.valentinilk.shimmer.shimmer
import it.vfsfitvnm.reordering.ReorderingLazyColumn import it.vfsfitvnm.compose.reordering.ReorderingLazyColumn
import it.vfsfitvnm.reordering.animateItemPlacement import it.vfsfitvnm.compose.reordering.animateItemPlacement
import it.vfsfitvnm.reordering.draggedItem import it.vfsfitvnm.compose.reordering.draggedItem
import it.vfsfitvnm.reordering.rememberReorderingState import it.vfsfitvnm.compose.reordering.rememberReorderingState
import it.vfsfitvnm.reordering.reorder import it.vfsfitvnm.compose.reordering.reorder
import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder import it.vfsfitvnm.vimusic.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.ui.components.BottomSheet import it.vfsfitvnm.vimusic.ui.components.BottomSheet

View file

@ -5,7 +5,7 @@ import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.saveable.rememberSaveableStateHolder import androidx.compose.runtime.saveable.rememberSaveableStateHolder
import it.vfsfitvnm.compose.persist.PersistMapCleanup 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.R
import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold
import it.vfsfitvnm.vimusic.ui.screens.globalRoutes import it.vfsfitvnm.vimusic.ui.screens.globalRoutes

View file

@ -17,7 +17,7 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.text.TextRange import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue import androidx.compose.ui.text.input.TextFieldValue
import it.vfsfitvnm.compose.persist.PersistMapCleanup 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.R
import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold
import it.vfsfitvnm.vimusic.ui.screens.globalRoutes import it.vfsfitvnm.vimusic.ui.screens.globalRoutes

View file

@ -18,7 +18,7 @@ import it.vfsfitvnm.innertube.models.bodies.ContinuationBody
import it.vfsfitvnm.innertube.models.bodies.SearchBody import it.vfsfitvnm.innertube.models.bodies.SearchBody
import it.vfsfitvnm.innertube.requests.searchPage import it.vfsfitvnm.innertube.requests.searchPage
import it.vfsfitvnm.innertube.utils.from 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.LocalPlayerServiceBinder
import it.vfsfitvnm.vimusic.R import it.vfsfitvnm.vimusic.R
import it.vfsfitvnm.vimusic.ui.components.LocalMenuState import it.vfsfitvnm.vimusic.ui.components.LocalMenuState

View file

@ -1,27 +1,37 @@
package it.vfsfitvnm.vimusic.ui.screens.settings package it.vfsfitvnm.vimusic.ui.screens.settings
import androidx.compose.animation.* import androidx.compose.animation.ExperimentalAnimationApi
import androidx.compose.foundation.* import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.layout.* 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.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.rememberSaveable
import androidx.compose.runtime.saveable.rememberSaveableStateHolder import androidx.compose.runtime.saveable.rememberSaveableStateHolder
import androidx.compose.runtime.setValue
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.alpha import androidx.compose.ui.draw.alpha
import androidx.compose.ui.graphics.*
import androidx.compose.ui.platform.LocalSavedStateRegistryOwner
import androidx.compose.ui.unit.dp 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.R
import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold import it.vfsfitvnm.vimusic.ui.components.themed.Scaffold
import it.vfsfitvnm.vimusic.ui.components.themed.Switch import it.vfsfitvnm.vimusic.ui.components.themed.Switch
import it.vfsfitvnm.vimusic.ui.components.themed.ValueSelectorDialog import it.vfsfitvnm.vimusic.ui.components.themed.ValueSelectorDialog
import it.vfsfitvnm.vimusic.ui.screens.globalRoutes 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.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 @ExperimentalFoundationApi
@ExperimentalAnimationApi @ExperimentalAnimationApi

View file

@ -4,7 +4,7 @@ plugins {
} }
android { android {
namespace = "it.vfsfitvnm.reordering" namespace = "it.vfsfitvnm.compose.reordering"
compileSdk = 33 compileSdk = 33
defaultConfig { defaultConfig {

View file

@ -1,4 +1,4 @@
package it.vfsfitvnm.reordering package it.vfsfitvnm.compose.reordering
import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.Animatable
import androidx.compose.animation.core.AnimationVector import androidx.compose.animation.core.AnimationVector

View file

@ -1,4 +1,4 @@
package it.vfsfitvnm.reordering package it.vfsfitvnm.compose.reordering
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.lazy.LazyItemScope import androidx.compose.foundation.lazy.LazyItemScope

View file

@ -1,4 +1,4 @@
package it.vfsfitvnm.reordering package it.vfsfitvnm.compose.reordering
import androidx.compose.foundation.gestures.Orientation import androidx.compose.foundation.gestures.Orientation
import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.offset

View file

@ -1,4 +1,4 @@
package it.vfsfitvnm.reordering package it.vfsfitvnm.compose.reordering
import androidx.compose.foundation.gestures.detectDragGestures import androidx.compose.foundation.gestures.detectDragGestures
import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress import androidx.compose.foundation.gestures.detectDragGesturesAfterLongPress

View file

@ -1,6 +1,6 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") @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.FlingBehavior
import androidx.compose.foundation.gestures.ScrollableDefaults import androidx.compose.foundation.gestures.ScrollableDefaults

View file

@ -1,6 +1,6 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") @file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE")
package it.vfsfitvnm.reordering package it.vfsfitvnm.compose.reordering
import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.OverscrollEffect import androidx.compose.foundation.OverscrollEffect

View file

@ -1,6 +1,6 @@
@file:Suppress("INVISIBLE_MEMBER", "INVISIBLE_REFERENCE") @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.Animatable
import androidx.compose.animation.core.AnimationVector1D import androidx.compose.animation.core.AnimationVector1D

View file

@ -4,7 +4,7 @@ plugins {
} }
android { android {
namespace = "it.vfsfitvnm.route" namespace = "it.vfsfitvnm.compose.routing"
compileSdk = 33 compileSdk = 33
defaultConfig { defaultConfig {

View file

@ -1,4 +1,4 @@
package it.vfsfitvnm.route package it.vfsfitvnm.compose.routing
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.LaunchedEffect

View file

@ -1,6 +1,6 @@
@file:Suppress("UNCHECKED_CAST") @file:Suppress("UNCHECKED_CAST")
package it.vfsfitvnm.route package it.vfsfitvnm.compose.routing
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable
import androidx.compose.runtime.Immutable import androidx.compose.runtime.Immutable

View file

@ -1,4 +1,4 @@
package it.vfsfitvnm.route package it.vfsfitvnm.compose.routing
import androidx.activity.compose.BackHandler import androidx.activity.compose.BackHandler
import androidx.activity.compose.LocalOnBackPressedDispatcherOwner import androidx.activity.compose.LocalOnBackPressedDispatcherOwner

View file

@ -1,4 +1,4 @@
package it.vfsfitvnm.route package it.vfsfitvnm.compose.routing
import android.annotation.SuppressLint import android.annotation.SuppressLint
import androidx.compose.runtime.Composable import androidx.compose.runtime.Composable

View file

@ -1,4 +1,4 @@
package it.vfsfitvnm.route package it.vfsfitvnm.compose.routing
import androidx.compose.animation.AnimatedContentScope import androidx.compose.animation.AnimatedContentScope
import androidx.compose.animation.ContentTransform import androidx.compose.animation.ContentTransform