diff --git a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/AiringTodayRepository.kt b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/AiringTodayRepository.kt index 7813454..6265668 100644 --- a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/AiringTodayRepository.kt +++ b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/AiringTodayRepository.kt @@ -20,7 +20,7 @@ class AiringTodayRepository( page = p, nsfw = n, ) - } + }.distinctUntilChanged() private val airingPreFilter = query.transform { return@transform emitAll(apolloClient.query(it.toGraphQL()).toFlow()) diff --git a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularNextSeasonRepository.kt b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularNextSeasonRepository.kt index e50c742..b8a666b 100644 --- a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularNextSeasonRepository.kt +++ b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularNextSeasonRepository.kt @@ -36,7 +36,7 @@ class PopularNextSeasonRepository( season = season, year = year ) - } + }.distinctUntilChanged() private val fallbackQuery = query.transform { return@transform emitAll(fallbackClient.query(it.toGraphQL()).toFlow()) }.mapNotNull { diff --git a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularSeasonRepository.kt b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularSeasonRepository.kt index 860d3d7..b305ee2 100644 --- a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularSeasonRepository.kt +++ b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/PopularSeasonRepository.kt @@ -29,7 +29,7 @@ class PopularSeasonRepository( type = t, nsfw = n ) - } + }.distinctUntilChanged() private val fallbackQuery = query.transform { return@transform emitAll(fallbackClient.query(it.toGraphQL()).toFlow()) }.mapNotNull { diff --git a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/TrendingRepository.kt b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/TrendingRepository.kt index ca678f0..049dfaf 100644 --- a/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/TrendingRepository.kt +++ b/anilist/src/commonMain/kotlin/dev/datlag/aniflow/anilist/TrendingRepository.kt @@ -29,7 +29,7 @@ class TrendingRepository( type = t, nsfw = n ) - } + }.distinctUntilChanged() private val fallbackQuery = query.transform { return@transform emitAll(fallbackClient.query(it.toGraphQL()).toFlow()) }.mapNotNull { diff --git a/composeApp/src/androidMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.android.kt b/composeApp/src/androidMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.android.kt similarity index 96% rename from composeApp/src/androidMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.android.kt rename to composeApp/src/androidMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.android.kt index 5ed8ed3..2add183 100644 --- a/composeApp/src/androidMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.android.kt +++ b/composeApp/src/androidMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.android.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings.component +package dev.datlag.aniflow.ui.navigation.screen.settings.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/other/StateSaver.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/other/StateSaver.kt index c83fa50..f5ee1b7 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/other/StateSaver.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/other/StateSaver.kt @@ -90,5 +90,12 @@ data object StateSaver { popularNextLoading.update { false } return state } + + fun updateAllLoading() { + airingLoading.update { true } + trendingLoading.update { true } + popularCurrentLoading.update { true } + popularNextLoading.update { true } + } } } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/RootComponent.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/RootComponent.kt index 35c9771..c72aa54 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/RootComponent.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/RootComponent.kt @@ -1,18 +1,26 @@ package dev.datlag.aniflow.ui.navigation +import androidx.compose.animation.core.tween +import androidx.compose.foundation.gestures.Orientation import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.layout.layout import com.arkivanov.decompose.ComponentContext import com.arkivanov.decompose.ExperimentalDecomposeApi import com.arkivanov.decompose.extensions.compose.stack.Children import com.arkivanov.decompose.extensions.compose.stack.animation.predictiveback.predictiveBackAnimation import com.arkivanov.decompose.extensions.compose.stack.animation.slide import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimation +import com.arkivanov.decompose.extensions.compose.stack.animation.stackAnimator import com.arkivanov.decompose.router.stack.* import dev.datlag.aniflow.common.onRender import dev.datlag.aniflow.model.ifValueOrNull import dev.datlag.aniflow.other.UserHelper import dev.datlag.aniflow.ui.navigation.screen.initial.InitialScreenComponent import dev.datlag.aniflow.ui.navigation.screen.medium.MediumScreenComponent +import dev.datlag.aniflow.ui.navigation.screen.settings.SettingsScreen +import dev.datlag.aniflow.ui.navigation.screen.settings.SettingsScreenComponent +import io.github.aakira.napier.Napier import org.kodein.di.DI import org.kodein.di.instance @@ -40,6 +48,9 @@ class RootComponent( di = di, onMediumDetails = { navigation.push(RootConfig.Details(it)) + }, + onProfile = { + navigation.push(RootConfig.Settings) } ) is RootConfig.Details -> MediumScreenComponent( @@ -48,6 +59,10 @@ class RootComponent( initialMedium = rootConfig.medium, onBack = navigation::pop ) + is RootConfig.Settings -> SettingsScreenComponent( + componentContext = componentContext, + di = di + ) } } @@ -59,9 +74,40 @@ class RootComponent( stack = stack, animation = predictiveBackAnimation( backHandler = this.backHandler, - fallbackAnimation = stackAnimation( - animator = slide() - ), + fallbackAnimation = stackAnimation { child -> + when (child.configuration) { + is RootConfig.Settings -> stackAnimator(tween()) { factor, _, content -> + content( + Modifier.layout { measurable, constraints -> + val placeable = measurable.measure(constraints) + + layout(placeable.width, placeable.height) { + placeable.placeRelative(y = -(placeable.height.toFloat() * factor).toInt(), x = 0) + } + } + ) + } + is RootConfig.Home -> { + val current = stack.value.active + + when (current.configuration) { + is RootConfig.Settings -> stackAnimator(tween()) { factor, _, content -> + content( + Modifier.layout { measurable, constraints -> + val placeable = measurable.measure(constraints) + + layout(placeable.width, placeable.height) { + placeable.placeRelative(y = -(placeable.height.toFloat() * factor).toInt(), x = 0) + } + } + ) + } + else -> slide() + } + } + else -> slide() + } + }, onBack = { navigation.pop() } diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/RootConfig.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/RootConfig.kt index 1fed75e..78858a3 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/RootConfig.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/RootConfig.kt @@ -13,4 +13,7 @@ sealed class RootConfig { data class Details(val medium: Medium) : RootConfig() { constructor(id: Int) : this(Medium(id)) } + + @Serializable + data object Settings : RootConfig() } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/InitialComponent.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/InitialComponent.kt index 84381cd..62a22bd 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/InitialComponent.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/InitialComponent.kt @@ -18,6 +18,7 @@ interface InitialComponent : Component { val pages: Value> fun selectPage(index: Int) + fun viewProfile() fun viewAnime() fun viewManga() diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/InitialScreenComponent.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/InitialScreenComponent.kt index 40ead26..0df6215 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/InitialScreenComponent.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/InitialScreenComponent.kt @@ -16,12 +16,13 @@ import dev.datlag.aniflow.anilist.model.Medium import dev.datlag.aniflow.anilist.type.MediaType import dev.datlag.aniflow.common.onRender import dev.datlag.aniflow.model.coroutines.Executor +import dev.datlag.aniflow.other.StateSaver import dev.datlag.aniflow.settings.Settings import dev.datlag.aniflow.ui.navigation.Component import dev.datlag.aniflow.ui.navigation.ContentHolderComponent import dev.datlag.aniflow.ui.navigation.screen.initial.favorites.FavoritesScreenComponent import dev.datlag.aniflow.ui.navigation.screen.initial.home.HomeScreenComponent -import dev.datlag.aniflow.ui.navigation.screen.initial.settings.SettingsScreenComponent +import dev.datlag.aniflow.ui.navigation.screen.settings.SettingsScreenComponent import kotlinx.coroutines.flow.map import org.kodein.di.DI import org.kodein.di.instance @@ -29,16 +30,13 @@ import org.kodein.di.instance class InitialScreenComponent( componentContext: ComponentContext, override val di: DI, - private val onMediumDetails: (Medium) -> Unit + private val onMediumDetails: (Medium) -> Unit, + private val onProfile: () -> Unit ) : InitialComponent, ComponentContext by componentContext { private val appSettings by di.instance() override val pagerItems: List = listOf( - InitialComponent.PagerItem( - label = SharedRes.strings.profile, - icon = Icons.Filled.AccountCircle - ), InitialComponent.PagerItem( label = SharedRes.strings.home, icon = Icons.Default.Home @@ -59,11 +57,10 @@ class InitialScreenComponent( initialPages = { Pages( items = listOf( - View.Settings, View.Home, View.Favorites ), - selectedIndex = 1 + selectedIndex = 0 ) }, childFactory = ::createChild @@ -99,10 +96,6 @@ class InitialScreenComponent( di = di, onMediumDetails = onMediumDetails ) - is View.Settings -> SettingsScreenComponent( - componentContext = componentContext, - di = di - ) is View.Favorites -> FavoritesScreenComponent( componentContext = componentContext, di = di @@ -119,7 +112,12 @@ class InitialScreenComponent( } } + override fun viewProfile() { + onProfile() + } + override fun viewAnime() { + StateSaver.Home.updateAllLoading() launchIO { viewTypeExecutor.enqueue { appSettings.setViewManga(false) @@ -128,6 +126,7 @@ class InitialScreenComponent( } override fun viewManga() { + StateSaver.Home.updateAllLoading() launchIO { viewTypeExecutor.enqueue { appSettings.setViewManga(true) diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/View.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/View.kt index 9bcd045..4ac5437 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/View.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/View.kt @@ -7,9 +7,6 @@ sealed class View { @Serializable data object Home : View() - @Serializable - data object Settings : View() - @Serializable data object Favorites : View() } \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/CompactScreen.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/CompactScreen.kt index 089b4cd..9f52d1b 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/CompactScreen.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/CompactScreen.kt @@ -46,7 +46,7 @@ fun CompactScreen(component: InitialComponent) { scrollBehavior = scrollBehavior, viewTypeFlow = component.viewing, onProfileClick = { - + component.viewProfile() }, onAnimeClick = { component.viewAnime() diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/ExpandedScreen.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/ExpandedScreen.kt index 813963a..92201eb 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/ExpandedScreen.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/ExpandedScreen.kt @@ -8,20 +8,44 @@ import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll import androidx.compose.ui.unit.dp import com.arkivanov.decompose.ExperimentalDecomposeApi import com.arkivanov.decompose.extensions.compose.subscribeAsState import dev.datlag.aniflow.common.isScrollingUp import dev.datlag.aniflow.ui.custom.ExpandedPages import dev.datlag.aniflow.ui.navigation.screen.initial.InitialComponent +import dev.datlag.aniflow.ui.navigation.screen.initial.home.component.CollapsingToolbar import dev.datlag.aniflow.ui.navigation.screen.initial.model.FABConfig import dev.datlag.tooling.compose.EndCornerShape import dev.icerock.moko.resources.compose.stringResource -@OptIn(ExperimentalDecomposeApi::class) +@OptIn(ExperimentalDecomposeApi::class, ExperimentalMaterial3Api::class) @Composable fun ExpandedScreen(component: InitialComponent) { + val appBarState = rememberTopAppBarState() + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior( + state = appBarState + ) + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + CollapsingToolbar( + state = appBarState, + scrollBehavior = scrollBehavior, + viewTypeFlow = component.viewing, + onProfileClick = { + component.viewProfile() + }, + onAnimeClick = { + component.viewAnime() + }, + onMangaClick = { + component.viewManga() + } + ) + }, floatingActionButton = { val state by FABConfig.state diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/MediumScreen.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/MediumScreen.kt index 2134bd1..394bf0f 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/MediumScreen.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/component/MediumScreen.kt @@ -9,18 +9,42 @@ import androidx.compose.material3.* import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Modifier +import androidx.compose.ui.input.nestedscroll.nestedScroll import com.arkivanov.decompose.ExperimentalDecomposeApi import com.arkivanov.decompose.extensions.compose.subscribeAsState import dev.datlag.aniflow.common.isScrollingUp import dev.datlag.aniflow.ui.custom.ExpandedPages import dev.datlag.aniflow.ui.navigation.screen.initial.InitialComponent +import dev.datlag.aniflow.ui.navigation.screen.initial.home.component.CollapsingToolbar import dev.datlag.aniflow.ui.navigation.screen.initial.model.FABConfig import dev.icerock.moko.resources.compose.stringResource -@OptIn(ExperimentalDecomposeApi::class) +@OptIn(ExperimentalDecomposeApi::class, ExperimentalMaterial3Api::class) @Composable fun MediumScreen(component: InitialComponent) { + val appBarState = rememberTopAppBarState() + val scrollBehavior = TopAppBarDefaults.exitUntilCollapsedScrollBehavior( + state = appBarState + ) + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + CollapsingToolbar( + state = appBarState, + scrollBehavior = scrollBehavior, + viewTypeFlow = component.viewing, + onProfileClick = { + component.viewProfile() + }, + onAnimeClick = { + component.viewAnime() + }, + onMangaClick = { + component.viewManga() + } + ) + }, floatingActionButton = { val state by FABConfig.state diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsComponent.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsComponent.kt similarity index 92% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsComponent.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsComponent.kt index 3b20a4a..7973392 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsComponent.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsComponent.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings +package dev.datlag.aniflow.ui.navigation.screen.settings import dev.datlag.aniflow.anilist.model.User import dev.datlag.aniflow.ui.navigation.Component diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsScreen.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsScreen.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsScreen.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsScreen.kt index 16ca737..6c6278d 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsScreen.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsScreen.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings +package dev.datlag.aniflow.ui.navigation.screen.settings import androidx.compose.foundation.Image import androidx.compose.foundation.layout.* @@ -23,7 +23,7 @@ import dev.datlag.aniflow.SharedRes import dev.datlag.aniflow.common.plus import dev.datlag.aniflow.other.Constants import dev.datlag.aniflow.other.StateSaver -import dev.datlag.aniflow.ui.navigation.screen.initial.settings.component.* +import dev.datlag.aniflow.ui.navigation.screen.settings.component.* import dev.datlag.tooling.compose.onClick import dev.datlag.tooling.decompose.lifecycle.collectAsStateWithLifecycle import dev.icerock.moko.resources.compose.painterResource @@ -38,7 +38,7 @@ fun SettingsScreen(component: SettingsComponent) { LazyColumn( state = listState, - modifier = Modifier.fillMaxWidth().haze(state = LocalHaze.current), + modifier = Modifier.fillMaxWidth(), contentPadding = LocalPaddingValues.current?.plus(padding) ?: padding, verticalArrangement = Arrangement.spacedBy(8.dp) ) { diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsScreenComponent.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsScreenComponent.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsScreenComponent.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsScreenComponent.kt index dd175d3..b8a474b 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/SettingsScreenComponent.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/SettingsScreenComponent.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings +package dev.datlag.aniflow.ui.navigation.screen.settings import androidx.compose.runtime.Composable import com.arkivanov.decompose.ComponentContext diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/AdultSection.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/AdultSection.kt similarity index 96% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/AdultSection.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/AdultSection.kt index 5b854d8..90c7c2f 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/AdultSection.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/AdultSection.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings.component +package dev.datlag.aniflow.ui.navigation.screen.settings.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/CharacterSection.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/CharacterSection.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/CharacterSection.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/CharacterSection.kt index 5f2308b..bfc81f0 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/CharacterSection.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/CharacterSection.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings.component +package dev.datlag.aniflow.ui.navigation.screen.settings.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/ColorSection.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/ColorSection.kt similarity index 98% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/ColorSection.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/ColorSection.kt index 65730f2..7eb3a2b 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/ColorSection.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/ColorSection.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings.component +package dev.datlag.aniflow.ui.navigation.screen.settings.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.kt similarity index 67% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.kt index deff88c..965d9c3 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings.component +package dev.datlag.aniflow.ui.navigation.screen.settings.component import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/TitleSection.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/TitleSection.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/TitleSection.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/TitleSection.kt index 5ee8095..017f437 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/TitleSection.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/TitleSection.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings.component +package dev.datlag.aniflow.ui.navigation.screen.settings.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Row diff --git a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/UserSection.kt b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/UserSection.kt similarity index 97% rename from composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/UserSection.kt rename to composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/UserSection.kt index 5f7a5a7..5bc3a1c 100644 --- a/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/UserSection.kt +++ b/composeApp/src/commonMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/UserSection.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings.component +package dev.datlag.aniflow.ui.navigation.screen.settings.component import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column diff --git a/composeApp/src/iosMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.ios.kt b/composeApp/src/iosMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.ios.kt similarity index 65% rename from composeApp/src/iosMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.ios.kt rename to composeApp/src/iosMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.ios.kt index 156c6ef..8fe2b8e 100644 --- a/composeApp/src/iosMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/initial/settings/component/DomainSection.ios.kt +++ b/composeApp/src/iosMain/kotlin/dev/datlag/aniflow/ui/navigation/screen/settings/component/DomainSection.ios.kt @@ -1,4 +1,4 @@ -package dev.datlag.aniflow.ui.navigation.screen.initial.settings.component +package dev.datlag.aniflow.ui.navigation.screen.settings.component import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier