diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt index 2286f2b09..d5ff193cd 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionDetailsScreen.kt @@ -49,7 +49,6 @@ import eu.kanade.presentation.browse.components.ExtensionIcon import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.WarningBanner import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer @@ -58,6 +57,7 @@ import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.source.ConfigurableSource import eu.kanade.tachiyomi.ui.browse.extension.details.ExtensionDetailsState import eu.kanade.tachiyomi.util.system.LocaleHelper +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.DIVIDER_ALPHA import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.Scaffold diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt index aa17d9900..3c81a2867 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionFilterScreen.kt @@ -9,11 +9,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.extension.ExtensionFilterState import eu.kanade.tachiyomi.util.system.LocaleHelper +import tachiyomi.presentation.core.components.FastScrollLazyColumn import tachiyomi.presentation.core.components.material.Scaffold @Composable diff --git a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt index b77a8f6c7..5a34e985d 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/ExtensionsScreen.kt @@ -39,11 +39,8 @@ import com.google.accompanist.flowlayout.FlowRow import eu.kanade.presentation.browse.components.BaseBrowseItem import eu.kanade.presentation.browse.components.ExtensionIcon import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.manga.components.DotSeparatorNoSpaceText import eu.kanade.presentation.theme.header -import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.extension.model.Extension import eu.kanade.tachiyomi.extension.model.InstallStep @@ -52,10 +49,13 @@ import eu.kanade.tachiyomi.ui.browse.extension.ExtensionUiModel import eu.kanade.tachiyomi.ui.browse.extension.ExtensionsState import eu.kanade.tachiyomi.util.system.LocaleHelper import exh.source.anyIs +import tachiyomi.presentation.core.components.FastScrollLazyColumn import tachiyomi.presentation.core.components.LoadingScreen import tachiyomi.presentation.core.components.material.PullRefresh import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus +import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable fun ExtensionScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt index ff8a4f218..5c11e37f8 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/FeedScreen.kt @@ -34,8 +34,6 @@ import eu.kanade.presentation.browse.components.GlobalSearchErrorResultItem import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem import eu.kanade.presentation.browse.components.GlobalSearchResultItem import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.ScrollbarLazyColumn -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.browse.feed.FeedScreenState @@ -44,8 +42,10 @@ import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.model.FeedSavedSearch import tachiyomi.domain.source.model.SavedSearch import tachiyomi.presentation.core.components.LoadingScreen +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.PullRefresh import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus import kotlin.time.Duration.Companion.seconds data class FeedItemUI( diff --git a/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt index 67add4512..f5ba91e42 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/GlobalSearchScreen.kt @@ -13,13 +13,13 @@ import eu.kanade.presentation.browse.components.GlobalSearchErrorResultItem import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem import eu.kanade.presentation.browse.components.GlobalSearchResultItem import eu.kanade.presentation.browse.components.GlobalSearchToolbar -import eu.kanade.presentation.components.LazyColumn import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.browse.source.globalsearch.GlobalSearchState import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchItemResult import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.manga.model.Manga +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateMangaScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateMangaScreen.kt index 9d5c25874..efaef476e 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrateMangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateMangaScreen.kt @@ -7,11 +7,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.manga.components.BaseMangaListItem import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.migration.manga.MigrateMangaState import tachiyomi.domain.manga.model.Manga +import tachiyomi.presentation.core.components.FastScrollLazyColumn import tachiyomi.presentation.core.components.material.Scaffold @Composable diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt index 12494fab8..de22711a5 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSearchScreen.kt @@ -9,12 +9,12 @@ import eu.kanade.presentation.browse.components.GlobalSearchErrorResultItem import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem import eu.kanade.presentation.browse.components.GlobalSearchResultItem import eu.kanade.presentation.browse.components.GlobalSearchToolbar -import eu.kanade.presentation.components.LazyColumn import eu.kanade.tachiyomi.source.CatalogueSource import eu.kanade.tachiyomi.ui.browse.migration.search.MigrateSearchState import eu.kanade.tachiyomi.ui.browse.source.globalsearch.SearchItemResult import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.manga.model.Manga +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.Scaffold @Composable diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt index d6d4ff898..4d6effca0 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrateSourceScreen.kt @@ -28,11 +28,7 @@ import eu.kanade.domain.source.interactor.SetMigrateSorting import eu.kanade.presentation.browse.components.BaseSourceItem import eu.kanade.presentation.browse.components.SourceIcon import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.ScrollbarLazyColumn -import eu.kanade.presentation.components.Scroller.STICKY_HEADER_KEY_PREFIX import eu.kanade.presentation.theme.header -import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.migration.sources.MigrateSourceState import eu.kanade.tachiyomi.util.system.copyToClipboard @@ -40,8 +36,12 @@ import tachiyomi.domain.source.model.Source import tachiyomi.presentation.core.components.Badge import tachiyomi.presentation.core.components.BadgeGroup import tachiyomi.presentation.core.components.LoadingScreen +import tachiyomi.presentation.core.components.ScrollbarLazyColumn +import tachiyomi.presentation.core.components.Scroller.STICKY_HEADER_KEY_PREFIX import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus +import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable fun MigrateSourceScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt index 8b42239af..f2cb1d171 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/MigrationListScreen.kt @@ -28,14 +28,14 @@ import eu.kanade.presentation.browse.components.MigrationActionIcon import eu.kanade.presentation.browse.components.MigrationItem import eu.kanade.presentation.browse.components.MigrationItemResult import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.ScrollbarLazyColumn -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga import tachiyomi.core.util.lang.withIOContext import tachiyomi.domain.manga.model.Manga +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus @Composable fun MigrationListScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt index bade30852..55bd995e7 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourceFeedScreen.kt @@ -15,16 +15,16 @@ import eu.kanade.presentation.browse.components.GlobalSearchErrorResultItem import eu.kanade.presentation.browse.components.GlobalSearchLoadingResultItem import eu.kanade.presentation.browse.components.GlobalSearchResultItem import eu.kanade.presentation.components.AppBarTitle -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.SearchToolbar -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.source.model.FeedSavedSearch import tachiyomi.domain.source.model.SavedSearch import tachiyomi.presentation.core.components.LoadingScreen +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus sealed class SourceFeedUI { abstract val id: Long diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt index 8f7bfef49..1c36a4a01 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesFilterScreen.kt @@ -12,12 +12,12 @@ import androidx.compose.ui.res.stringResource import eu.kanade.presentation.browse.components.BaseSourceItem import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.source.SourcesFilterState import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.source.model.Source +import tachiyomi.presentation.core.components.FastScrollLazyColumn import tachiyomi.presentation.core.components.material.Scaffold @Composable diff --git a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt index 2111706c6..918a3b694 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/SourcesScreen.kt @@ -30,9 +30,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import eu.kanade.presentation.browse.components.BaseSourceItem import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.theme.header -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.LocalSource import eu.kanade.tachiyomi.ui.browse.source.SourcesState @@ -41,8 +39,10 @@ import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.source.model.Pin import tachiyomi.domain.source.model.Source import tachiyomi.presentation.core.components.LoadingScreen +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus @Composable fun SourcesScreen( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt index 4eda46d26..08d3e845c 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BaseSourceItem.kt @@ -9,10 +9,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.text.style.TextOverflow -import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.util.system.LocaleHelper import tachiyomi.domain.source.model.Source import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable fun BaseSourceItem( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt index 951b0b7ec..07025a329 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceComfortableGrid.kt @@ -16,9 +16,8 @@ import androidx.compose.ui.unit.dp import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import eu.kanade.presentation.browse.InLibraryBadge -import eu.kanade.presentation.components.CommonMangaItemDefaults -import eu.kanade.presentation.components.MangaComfortableGridItem -import eu.kanade.presentation.util.plus +import eu.kanade.presentation.library.components.CommonMangaItemDefaults +import eu.kanade.presentation.library.components.MangaComfortableGridItem import eu.kanade.tachiyomi.R import exh.metadata.metadata.MangaDexSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata @@ -26,6 +25,7 @@ import kotlinx.coroutines.flow.StateFlow import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaCover import tachiyomi.presentation.core.components.Badge +import tachiyomi.presentation.core.util.plus @Composable fun BrowseSourceComfortableGrid( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt index aeedeb39c..b9f8fe077 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceCompactGrid.kt @@ -16,9 +16,8 @@ import androidx.compose.ui.unit.dp import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import eu.kanade.presentation.browse.InLibraryBadge -import eu.kanade.presentation.components.CommonMangaItemDefaults -import eu.kanade.presentation.components.MangaCompactGridItem -import eu.kanade.presentation.util.plus +import eu.kanade.presentation.library.components.CommonMangaItemDefaults +import eu.kanade.presentation.library.components.MangaCompactGridItem import eu.kanade.tachiyomi.R import exh.metadata.metadata.MangaDexSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata @@ -26,6 +25,7 @@ import kotlinx.coroutines.flow.StateFlow import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaCover import tachiyomi.presentation.core.components.Badge +import tachiyomi.presentation.core.util.plus @Composable fun BrowseSourceCompactGrid( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt index b46b0b03c..b42bebfdf 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceEHentaiList.kt @@ -33,8 +33,7 @@ import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.items import com.gowtham.ratingbar.RatingBar import com.gowtham.ratingbar.RatingBarConfig -import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.MangaCover +import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.tachiyomi.R import exh.metadata.MetadataUtil import exh.metadata.metadata.EHentaiSearchMetadata @@ -47,6 +46,7 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.domain.manga.model.Manga import tachiyomi.presentation.core.components.Badge import tachiyomi.presentation.core.components.BadgeGroup +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.padding import java.util.Date diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt index eba518afb..2ee40609d 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/BrowseSourceList.kt @@ -13,10 +13,8 @@ import androidx.paging.LoadState import androidx.paging.compose.LazyPagingItems import androidx.paging.compose.items import eu.kanade.presentation.browse.InLibraryBadge -import eu.kanade.presentation.components.CommonMangaItemDefaults -import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.MangaListItem -import eu.kanade.presentation.util.plus +import eu.kanade.presentation.library.components.CommonMangaItemDefaults +import eu.kanade.presentation.library.components.MangaListItem import eu.kanade.tachiyomi.R import exh.metadata.metadata.MangaDexSearchMetadata import exh.metadata.metadata.base.RaisedSearchMetadata @@ -24,6 +22,8 @@ import kotlinx.coroutines.flow.StateFlow import tachiyomi.domain.manga.model.Manga import tachiyomi.domain.manga.model.MangaCover import tachiyomi.presentation.core.components.Badge +import tachiyomi.presentation.core.components.LazyColumn +import tachiyomi.presentation.core.util.plus @Composable fun BrowseSourceList( diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt index 3b9aea179..0a9bd1037 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/GlobalSearchCard.kt @@ -6,8 +6,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import eu.kanade.presentation.browse.InLibraryBadge -import eu.kanade.presentation.components.CommonMangaItemDefaults -import eu.kanade.presentation.components.MangaComfortableGridItem +import eu.kanade.presentation.library.components.CommonMangaItemDefaults +import eu.kanade.presentation.library.components.MangaComfortableGridItem import tachiyomi.domain.manga.model.MangaCover @Composable diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt index 2514c7d52..dc33cba4f 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItem.kt @@ -26,7 +26,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import eu.kanade.presentation.components.MangaCover +import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga import tachiyomi.core.util.lang.withIOContext diff --git a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt index 397c98dd4..c7af8d261 100644 --- a/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt +++ b/app/src/main/java/eu/kanade/presentation/browse/components/MigrationItemResult.kt @@ -22,7 +22,7 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.MangaCover +import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.presentation.util.rememberResourceBitmapPainter import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.migration.advanced.process.MigratingManga diff --git a/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt b/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt index 7ec7a5e78..04c933f65 100644 --- a/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/BiometricTimesScreen.kt @@ -11,13 +11,13 @@ import eu.kanade.presentation.category.components.CategoryFloatingActionButton import eu.kanade.presentation.category.components.biometric.BiometricTimesContent import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.biometric.BiometricTimesScreenState import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus @Composable fun BiometricTimesScreen( diff --git a/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt b/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt index 9d38bb157..64e9fce64 100644 --- a/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/CategoryScreen.kt @@ -11,13 +11,13 @@ import eu.kanade.presentation.category.components.CategoryContent import eu.kanade.presentation.category.components.CategoryFloatingActionButton import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.CategoryScreenState import tachiyomi.domain.category.model.Category import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus @Composable fun CategoryScreen( diff --git a/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt index 0191e2f7b..7e0369d06 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SortTagScreen.kt @@ -11,12 +11,12 @@ import eu.kanade.presentation.category.components.CategoryFloatingActionButton import eu.kanade.presentation.category.components.genre.SortTagContent import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.genre.SortTagScreenState import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus @Composable fun SortTagScreen( diff --git a/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt index 1ee03bde4..5f13e4c24 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SourceCategoryScreen.kt @@ -11,12 +11,12 @@ import eu.kanade.presentation.category.components.CategoryFloatingActionButton import eu.kanade.presentation.category.components.sources.SourceCategoryContent import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.sources.SourceCategoryScreenState import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus @Composable fun SourceCategoryScreen( diff --git a/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt b/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt index debd20df6..38585cd4a 100644 --- a/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/category/SourceRepoScreen.kt @@ -11,12 +11,12 @@ import eu.kanade.presentation.category.components.CategoryFloatingActionButton import eu.kanade.presentation.category.components.repo.SourceRepoContent import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.category.repos.RepoScreenState import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus @Composable fun SourceRepoScreen( diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryContent.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryContent.kt index 28d905aa4..b8a72c9ad 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryContent.kt @@ -7,8 +7,8 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import eu.kanade.presentation.components.LazyColumn import tachiyomi.domain.category.model.Category +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.padding @Composable diff --git a/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt b/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt index ec0310da4..15514d7f5 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/CategoryFloatingActionButton.kt @@ -7,10 +7,10 @@ import androidx.compose.material3.Icon import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.res.stringResource -import eu.kanade.presentation.util.isScrolledToEnd -import eu.kanade.presentation.util.isScrollingUp import eu.kanade.tachiyomi.R import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton +import tachiyomi.presentation.core.util.isScrolledToEnd +import tachiyomi.presentation.core.util.isScrollingUp @Composable fun CategoryFloatingActionButton( diff --git a/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesContent.kt b/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesContent.kt index da101c11c..b5400ee33 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesContent.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/biometric/BiometricTimesContent.kt @@ -7,8 +7,8 @@ import androidx.compose.foundation.lazy.items import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import eu.kanade.presentation.components.LazyColumn import eu.kanade.tachiyomi.ui.category.biometric.TimeRangeItem +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.padding @Composable diff --git a/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagContent.kt b/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagContent.kt index e90b1d89a..bd8807843 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagContent.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/genre/SortTagContent.kt @@ -7,7 +7,7 @@ import androidx.compose.foundation.lazy.itemsIndexed import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import eu.kanade.presentation.components.LazyColumn +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.padding @Composable diff --git a/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoContent.kt b/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoContent.kt index cde788602..c0cb684e5 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoContent.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/repo/SourceRepoContent.kt @@ -7,7 +7,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import eu.kanade.presentation.components.LazyColumn +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.padding @Composable diff --git a/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryContent.kt b/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryContent.kt index a69596914..ca0903d18 100644 --- a/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/category/components/sources/SourceCategoryContent.kt @@ -7,7 +7,7 @@ import androidx.compose.foundation.lazy.items import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier -import eu.kanade.presentation.components.LazyColumn +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.padding @Composable diff --git a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt index 849584158..248ef7302 100644 --- a/app/src/main/java/eu/kanade/presentation/components/AppBar.kt +++ b/app/src/main/java/eu/kanade/presentation/components/AppBar.kt @@ -44,9 +44,9 @@ import androidx.compose.ui.text.input.VisualTransformation import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import eu.kanade.presentation.util.runOnEnterKeyPressed -import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.util.runOnEnterKeyPressed +import tachiyomi.presentation.core.util.secondaryItemAlpha const val SEARCH_DEBOUNCE_MILLIS = 250L diff --git a/app/src/main/java/eu/kanade/presentation/components/Chip.kt b/app/src/main/java/eu/kanade/presentation/components/Chip.kt index da7989e97..502b356e3 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Chip.kt +++ b/app/src/main/java/eu/kanade/presentation/components/Chip.kt @@ -42,7 +42,7 @@ import androidx.compose.ui.graphics.Shape import androidx.compose.ui.text.TextStyle import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import eu.kanade.presentation.util.animateElevation +import tachiyomi.presentation.core.util.animateElevation import androidx.compose.material3.SuggestionChipDefaults as SuggestionChipDefaultsM3 @ExperimentalMaterial3Api @@ -182,7 +182,7 @@ private fun Chip( border: BorderStroke?, interactionSource: MutableInteractionSource, ) { - Surface( + tachiyomi.presentation.core.components.material.Surface( onClick = onClick, modifier = modifier, onLongClick = onLongClick, diff --git a/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt b/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt index f87572524..faf6bd0e9 100644 --- a/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/components/EmptyScreen.kt @@ -26,10 +26,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews -import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.ThemePreviews +import tachiyomi.presentation.core.util.secondaryItemAlpha import kotlin.random.Random @Composable diff --git a/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt b/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt index e52e7756d..542e3ef7f 100644 --- a/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt +++ b/app/src/main/java/eu/kanade/presentation/components/InfoScaffold.kt @@ -27,10 +27,10 @@ import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.zIndex import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews -import eu.kanade.presentation.util.secondaryItemAlpha import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.ThemePreviews +import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable fun InfoScaffold( diff --git a/app/src/main/java/eu/kanade/presentation/components/Pager.kt b/app/src/main/java/eu/kanade/presentation/components/Pager.kt index 9e21256e3..a2b980fbc 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Pager.kt +++ b/app/src/main/java/eu/kanade/presentation/components/Pager.kt @@ -31,6 +31,7 @@ import androidx.compose.ui.util.fastForEach import androidx.compose.ui.util.fastMaxBy import androidx.compose.ui.util.fastSumBy import kotlinx.coroutines.flow.distinctUntilChanged +import tachiyomi.presentation.core.components.LazyColumn @Composable fun HorizontalPager( diff --git a/app/src/main/java/eu/kanade/presentation/components/RelativeDateHeader.kt b/app/src/main/java/eu/kanade/presentation/components/RelativeDateHeader.kt index 0b525e59c..1a7683293 100644 --- a/app/src/main/java/eu/kanade/presentation/components/RelativeDateHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/components/RelativeDateHeader.kt @@ -5,6 +5,7 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import eu.kanade.tachiyomi.util.lang.toRelativeString +import tachiyomi.presentation.core.components.ListGroupHeader import java.text.DateFormat import java.util.Date diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt index 5b59035fa..1cce258d9 100644 --- a/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/TabbedDialog.kt @@ -32,6 +32,7 @@ import androidx.compose.ui.util.fastForEachIndexed import eu.kanade.tachiyomi.R import kotlinx.coroutines.launch import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.TabIndicator object TabbedDialogPaddings { val Horizontal = 24.dp diff --git a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt index 91fb1746a..5495ec927 100644 --- a/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/components/TabbedScreen.kt @@ -22,6 +22,8 @@ import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.res.stringResource import kotlinx.coroutines.launch import tachiyomi.presentation.core.components.material.Scaffold +import tachiyomi.presentation.core.components.material.TabIndicator +import tachiyomi.presentation.core.components.material.TabText @Composable fun TabbedScreen( diff --git a/app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt b/app/src/main/java/eu/kanade/presentation/components/dialogs/ChangeCategoryDialog.kt similarity index 97% rename from app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt rename to app/src/main/java/eu/kanade/presentation/components/dialogs/ChangeCategoryDialog.kt index fe8e99dd9..5aaa64487 100644 --- a/app/src/main/java/eu/kanade/presentation/components/ChangeCategoryDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/dialogs/ChangeCategoryDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package eu.kanade.presentation.components.dialogs import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column @@ -25,6 +25,7 @@ import eu.kanade.core.prefs.CheckboxState import eu.kanade.presentation.category.visualName import eu.kanade.tachiyomi.R import tachiyomi.domain.category.model.Category +import tachiyomi.presentation.core.components.material.TextButton import tachiyomi.presentation.core.components.material.padding @Composable diff --git a/app/src/main/java/eu/kanade/presentation/components/DeleteLibraryMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/components/dialogs/DeleteLibraryMangaDialog.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/components/DeleteLibraryMangaDialog.kt rename to app/src/main/java/eu/kanade/presentation/components/dialogs/DeleteLibraryMangaDialog.kt index 52ee61559..cb691dcdb 100644 --- a/app/src/main/java/eu/kanade/presentation/components/DeleteLibraryMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/dialogs/DeleteLibraryMangaDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package eu.kanade.presentation.components.dialogs import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Column diff --git a/app/src/main/java/eu/kanade/presentation/components/DuplicateMangaDialog.kt b/app/src/main/java/eu/kanade/presentation/components/dialogs/DuplicateMangaDialog.kt similarity index 96% rename from app/src/main/java/eu/kanade/presentation/components/DuplicateMangaDialog.kt rename to app/src/main/java/eu/kanade/presentation/components/dialogs/DuplicateMangaDialog.kt index 6c416716d..edab1002d 100644 --- a/app/src/main/java/eu/kanade/presentation/components/DuplicateMangaDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/components/dialogs/DuplicateMangaDialog.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package eu.kanade.presentation.components.dialogs import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer diff --git a/app/src/main/java/eu/kanade/presentation/crash/CrashScreen.kt b/app/src/main/java/eu/kanade/presentation/crash/CrashScreen.kt index ada8f268f..bb08db6b2 100644 --- a/app/src/main/java/eu/kanade/presentation/crash/CrashScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/crash/CrashScreen.kt @@ -16,11 +16,11 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import eu.kanade.presentation.components.InfoScaffold import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.CrashLogUtil import kotlinx.coroutines.launch import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.ThemePreviews @Composable fun CrashScreen( diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt index 0976f7de0..e9cdb789a 100644 --- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt +++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryContent.kt @@ -6,10 +6,10 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import eu.kanade.domain.ui.UiPreferences -import eu.kanade.presentation.components.FastScrollLazyColumn import eu.kanade.presentation.components.RelativeDateHeader import eu.kanade.presentation.history.HistoryUiModel import tachiyomi.domain.history.model.HistoryWithRelations +import tachiyomi.presentation.core.components.FastScrollLazyColumn import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get import java.text.DateFormat diff --git a/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt b/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt index 4cce6682d..b1d117186 100644 --- a/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt +++ b/app/src/main/java/eu/kanade/presentation/history/components/HistoryItem.kt @@ -20,7 +20,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.MangaCover +import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.lang.toTimestampString import tachiyomi.domain.history.model.HistoryWithRelations diff --git a/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt b/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt rename to app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt index d575abc23..7e8617df5 100644 --- a/app/src/main/java/eu/kanade/presentation/components/CommonMangaItem.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/CommonMangaItem.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package eu.kanade.presentation.library.components import androidx.compose.foundation.background import androidx.compose.foundation.combinedClickable @@ -39,8 +39,9 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import eu.kanade.presentation.util.selectedBackground +import eu.kanade.presentation.manga.components.MangaCover import tachiyomi.presentation.core.components.BadgeGroup +import tachiyomi.presentation.core.util.selectedBackground object CommonMangaItemDefaults { val GridHorizontalSpacer = 4.dp diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LazyLibraryGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LazyLibraryGrid.kt index cd0601ac2..bb18a7b5c 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LazyLibraryGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LazyLibraryGrid.kt @@ -8,9 +8,8 @@ import androidx.compose.foundation.lazy.grid.LazyGridScope import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.CommonMangaItemDefaults -import eu.kanade.presentation.components.FastScrollLazyVerticalGrid -import eu.kanade.presentation.util.plus +import tachiyomi.presentation.core.components.FastScrollLazyVerticalGrid +import tachiyomi.presentation.core.util.plus @Composable fun LazyLibraryGrid( diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt index ffa4eb608..e16d15ef1 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryBadges.kt @@ -6,8 +6,8 @@ import androidx.compose.material.icons.outlined.Folder import androidx.compose.material3.MaterialTheme import androidx.compose.runtime.Composable import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews import tachiyomi.presentation.core.components.Badge +import tachiyomi.presentation.core.util.ThemePreviews @Composable fun DownloadsBadge(count: Long) { diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt index 2a6baa093..c2e69531f 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryComfortableGrid.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.util.fastAny -import eu.kanade.presentation.components.MangaComfortableGridItem import eu.kanade.tachiyomi.ui.library.LibraryItem import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.MangaCover diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt index c47607088..bfe187c39 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryCompactGrid.kt @@ -6,7 +6,6 @@ import androidx.compose.foundation.lazy.grid.items import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.util.fastAny -import eu.kanade.presentation.components.MangaCompactGridItem import eu.kanade.tachiyomi.ui.library.LibraryItem import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.MangaCover diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt index 3c612546f..c3b608349 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryList.kt @@ -8,12 +8,11 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastAny -import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.components.MangaListItem -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.ui.library.LibraryItem import tachiyomi.domain.library.model.LibraryManga import tachiyomi.domain.manga.model.MangaCover +import tachiyomi.presentation.core.components.FastScrollLazyColumn +import tachiyomi.presentation.core.util.plus @Composable fun LibraryList( diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt index 0af97dfea..e60101ba0 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryPager.kt @@ -20,11 +20,11 @@ import eu.kanade.core.prefs.PreferenceMutableState import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.HorizontalPager import eu.kanade.presentation.components.PagerState -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.library.LibraryItem import tachiyomi.domain.library.model.LibraryDisplayMode import tachiyomi.domain.library.model.LibraryManga +import tachiyomi.presentation.core.util.plus @Composable fun LibraryPager( diff --git a/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt b/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt index 2a206e681..c1fe115a4 100644 --- a/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt +++ b/app/src/main/java/eu/kanade/presentation/library/components/LibraryTabs.kt @@ -7,10 +7,10 @@ import androidx.compose.material3.Tab import androidx.compose.runtime.Composable import androidx.compose.ui.unit.dp import eu.kanade.presentation.category.visualName -import eu.kanade.presentation.components.TabIndicator -import eu.kanade.presentation.components.TabText import tachiyomi.domain.category.model.Category import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.components.material.TabIndicator +import tachiyomi.presentation.core.components.material.TabText @Composable fun LibraryTabs( diff --git a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt index 6041b0c23..29999b6ec 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/MangaScreen.kt @@ -48,21 +48,17 @@ import androidx.compose.ui.util.fastAll import androidx.compose.ui.util.fastAny import androidx.compose.ui.util.fastMap import eu.kanade.domain.manga.model.chaptersFiltered -import eu.kanade.presentation.components.ChapterDownloadAction -import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.components.MangaBottomActionMenu -import eu.kanade.presentation.components.VerticalFastScroller +import eu.kanade.presentation.manga.components.ChapterDownloadAction import eu.kanade.presentation.manga.components.ChapterHeader import eu.kanade.presentation.manga.components.ExpandableMangaDescription import eu.kanade.presentation.manga.components.MangaActionRow +import eu.kanade.presentation.manga.components.MangaBottomActionMenu import eu.kanade.presentation.manga.components.MangaChapterListItem import eu.kanade.presentation.manga.components.MangaInfoBox import eu.kanade.presentation.manga.components.MangaInfoButtons import eu.kanade.presentation.manga.components.MangaToolbar import eu.kanade.presentation.manga.components.PagePreviews import eu.kanade.presentation.manga.components.SearchMetadataChips -import eu.kanade.presentation.util.isScrolledToEnd -import eu.kanade.presentation.util.isScrollingUp import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.source.Source @@ -95,10 +91,14 @@ import exh.ui.metadata.adapters.PururinDescription import exh.ui.metadata.adapters.TsuminoDescription import tachiyomi.domain.chapter.model.Chapter import tachiyomi.domain.manga.model.Manga +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.TwoPanelBox +import tachiyomi.presentation.core.components.VerticalFastScroller import tachiyomi.presentation.core.components.material.ExtendedFloatingActionButton import tachiyomi.presentation.core.components.material.PullRefresh import tachiyomi.presentation.core.components.material.Scaffold +import tachiyomi.presentation.core.util.isScrolledToEnd +import tachiyomi.presentation.core.util.isScrollingUp import java.text.DateFormat import java.util.Date diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/BaseMangaListItem.kt b/app/src/main/java/eu/kanade/presentation/manga/components/BaseMangaListItem.kt index 98e2b48a4..0462396f5 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/BaseMangaListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/BaseMangaListItem.kt @@ -14,7 +14,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.MangaCover import tachiyomi.domain.manga.model.Manga import tachiyomi.presentation.core.components.material.padding diff --git a/app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt rename to app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt index 16b5b2d9f..a6c533d1d 100644 --- a/app/src/main/java/eu/kanade/presentation/components/ChapterDownloadIndicator.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/ChapterDownloadIndicator.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package eu.kanade.presentation.manga.components import androidx.compose.animation.core.animateFloatAsState import androidx.compose.foundation.combinedClickable @@ -32,10 +32,11 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.dp -import eu.kanade.presentation.util.secondaryItemAlpha +import eu.kanade.presentation.components.DropdownMenu import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.model.Download import tachiyomi.presentation.core.components.material.IconButtonTokens +import tachiyomi.presentation.core.util.secondaryItemAlpha enum class ChapterDownloadAction { START, diff --git a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt similarity index 99% rename from app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt rename to app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt index 3f4ab359b..6a342456c 100644 --- a/app/src/main/java/eu/kanade/presentation/components/MangaBottomActionMenu.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaBottomActionMenu.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package eu.kanade.presentation.manga.components import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.core.animateFloatAsState @@ -55,6 +55,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp +import eu.kanade.presentation.components.DownloadDropdownMenu +import eu.kanade.presentation.components.DropdownMenu import eu.kanade.presentation.manga.DownloadAction import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.isTabletUi diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt index 8432c1bf5..eb9be0d81 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaChapterListItem.kt @@ -27,13 +27,11 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import eu.kanade.presentation.components.ChapterDownloadAction -import eu.kanade.presentation.components.ChapterDownloadIndicator -import eu.kanade.presentation.util.selectedBackground import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.model.Download import tachiyomi.presentation.core.components.material.ReadItemAlpha import tachiyomi.presentation.core.components.material.SecondaryItemAlpha +import tachiyomi.presentation.core.util.selectedBackground @Composable fun MangaChapterListItem( diff --git a/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt similarity index 97% rename from app/src/main/java/eu/kanade/presentation/components/MangaCover.kt rename to app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt index d585215e8..04794119c 100644 --- a/app/src/main/java/eu/kanade/presentation/components/MangaCover.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCover.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package eu.kanade.presentation.manga.components import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.aspectRatio diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt index 728a24f8e..31944447e 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaCoverDialog.kt @@ -45,11 +45,11 @@ import coil.request.ImageRequest import coil.size.Size import eu.kanade.presentation.components.DropdownMenu import eu.kanade.presentation.manga.EditCoverAction -import eu.kanade.presentation.util.clickableNoIndication import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.reader.viewer.ReaderPageImageView import tachiyomi.domain.manga.model.Manga import tachiyomi.presentation.core.components.material.Scaffold +import tachiyomi.presentation.core.util.clickableNoIndication @Composable fun MangaCoverDialog( diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt index f1b72b83b..8d168022a 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaDialogs.kt @@ -19,8 +19,8 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties -import eu.kanade.presentation.util.minimumTouchTargetSize import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.util.minimumTouchTargetSize @Composable fun DeleteChaptersDialog( diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoButtons.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoButtons.kt index f44cf07d8..3a99fd208 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoButtons.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoButtons.kt @@ -8,8 +8,8 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.Button import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.material.Button @Composable fun MangaInfoButtons( diff --git a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt index 485e00bf3..fb18961a3 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt +++ b/app/src/main/java/eu/kanade/presentation/manga/components/MangaInfoHeader.kt @@ -72,15 +72,14 @@ import androidx.compose.ui.unit.sp import coil.compose.AsyncImage import com.google.accompanist.flowlayout.FlowRow import eu.kanade.presentation.components.DropdownMenu -import eu.kanade.presentation.components.MangaCover -import eu.kanade.presentation.components.TextButton -import eu.kanade.presentation.util.clickableNoIndication -import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.model.SManga import eu.kanade.tachiyomi.util.system.copyToClipboard import tachiyomi.domain.manga.model.Manga +import tachiyomi.presentation.core.components.material.TextButton import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.clickableNoIndication +import tachiyomi.presentation.core.util.secondaryItemAlpha import kotlin.math.roundToInt private val whitespaceLineRegex = Regex("[\\r\\n]{2,}", setOf(RegexOption.MULTILINE)) diff --git a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt index ce472f65f..45af73bb2 100644 --- a/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/MoreScreen.kt @@ -27,13 +27,13 @@ import androidx.compose.ui.platform.LocalUriHandler import androidx.compose.ui.res.pluralStringResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.vectorResource -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.components.WarningBanner import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.more.DownloadQueueState import tachiyomi.core.Constants +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.Scaffold diff --git a/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt b/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt index 6d5976d75..4e24da3ab 100644 --- a/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/NewUpdateScreen.kt @@ -21,9 +21,9 @@ import com.halilibo.richtext.ui.material3.Material3RichText import com.halilibo.richtext.ui.string.RichTextStringStyle import eu.kanade.presentation.components.InfoScaffold import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews import eu.kanade.tachiyomi.R import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.ThemePreviews @Composable fun NewUpdateScreen( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt index 1d7494401..c346c06e0 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceItem.kt @@ -31,9 +31,9 @@ import eu.kanade.presentation.more.settings.widget.SwitchPreferenceWidget import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.more.settings.widget.TrackingPreferenceWidget import eu.kanade.presentation.util.collectAsState -import eu.kanade.presentation.util.secondaryItemAlpha import kotlinx.coroutines.launch import tachiyomi.core.preference.PreferenceStore +import tachiyomi.presentation.core.util.secondaryItemAlpha import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScreen.kt index 46466f6b8..236719024 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/PreferenceScreen.kt @@ -11,10 +11,10 @@ import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastForEachIndexed -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.more.settings.screen.SearchableSettings import eu.kanade.presentation.more.settings.widget.PreferenceGroupHeader import kotlinx.coroutines.delay +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import kotlin.time.Duration.Companion.seconds /** diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt index fdf98a686..777dd57d7 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/AboutScreen.kt @@ -25,7 +25,6 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.domain.ui.UiPreferences import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.more.LogoHeader import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.util.LocalBackPress @@ -46,6 +45,7 @@ import tachiyomi.core.util.lang.withIOContext import tachiyomi.core.util.lang.withUIContext import tachiyomi.core.util.system.logcat import tachiyomi.presentation.core.components.LinkIcon +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Scaffold import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt index d08fc1e04..21ac4619b 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/ClearDatabaseScreen.kt @@ -43,8 +43,6 @@ import eu.kanade.presentation.browse.components.SourceIcon import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.util.selectedBackground import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.flow.collectLatest @@ -55,9 +53,11 @@ import tachiyomi.core.util.lang.withNonCancellableContext import tachiyomi.data.Database import tachiyomi.domain.source.model.Source import tachiyomi.domain.source.model.SourceWithCount +import tachiyomi.presentation.core.components.FastScrollLazyColumn import tachiyomi.presentation.core.components.LoadingScreen import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.Scaffold +import tachiyomi.presentation.core.util.selectedBackground import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt index 066754f9b..ca6f41d10 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsBackupScreen.kt @@ -37,11 +37,8 @@ import androidx.compose.ui.unit.dp import androidx.core.net.toUri import com.hippo.unifile.UniFile import eu.kanade.domain.backup.service.BackupPreferences -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.util.collectAsState -import eu.kanade.presentation.util.isScrolledToEnd -import eu.kanade.presentation.util.isScrolledToStart import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.backup.BackupConst import eu.kanade.tachiyomi.data.backup.BackupCreatorJob @@ -53,7 +50,10 @@ import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.copyToClipboard import eu.kanade.tachiyomi.util.system.toast import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.util.isScrolledToEnd +import tachiyomi.presentation.core.util.isScrolledToStart import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt index b517031eb..c5783f5b6 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsLibraryScreen.kt @@ -36,8 +36,6 @@ import eu.kanade.domain.category.interactor.ResetCategoryFlags import eu.kanade.domain.library.model.GroupLibraryMode import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.presentation.category.visualName -import eu.kanade.presentation.components.WheelPicker -import eu.kanade.presentation.components.WheelPickerDefaults import eu.kanade.presentation.more.settings.Preference import eu.kanade.presentation.more.settings.widget.TriStateListDialog import eu.kanade.presentation.util.collectAsState @@ -57,6 +55,8 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.runBlocking import tachiyomi.domain.category.interactor.GetCategories import tachiyomi.domain.category.model.Category +import tachiyomi.presentation.core.components.WheelPicker +import tachiyomi.presentation.core.components.WheelPickerDefaults import uy.kohesive.injekt.Injekt import uy.kohesive.injekt.api.get diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt index f95b74b35..eadb35ff2 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsMainScreen.kt @@ -47,13 +47,13 @@ import cafe.adriel.voyager.navigator.Navigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AppBarActions -import eu.kanade.presentation.components.LazyColumn import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.util.LocalBackPress import eu.kanade.tachiyomi.R import exh.assets.EhAssets import exh.assets.ehassets.EhLogo import exh.assets.ehassets.MangadexLogo +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.Scaffold object SettingsMainScreen : Screen { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt index c656d6dd9..bf7af9e8d 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/SettingsSearchScreen.kt @@ -52,11 +52,11 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.more.settings.Preference -import eu.kanade.presentation.util.runOnEnterKeyPressed import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.isLTR import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.Scaffold +import tachiyomi.presentation.core.util.runOnEnterKeyPressed class SettingsSearchScreen : Screen { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/WhatsNewDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/WhatsNewDialog.kt index 57c77b4b9..da29cf37a 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/WhatsNewDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/WhatsNewDialog.kt @@ -21,7 +21,6 @@ import androidx.compose.ui.text.SpanStyle import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.LazyColumn import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.isPreviewBuildType import kotlinx.serialization.Serializable @@ -30,6 +29,7 @@ import nl.adaptivity.xmlutil.serialization.XML import nl.adaptivity.xmlutil.serialization.XmlSerialName import nl.adaptivity.xmlutil.serialization.XmlValue import tachiyomi.core.util.lang.withIOContext +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.padding diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/screen/WorkerInfoScreen.kt b/app/src/main/java/eu/kanade/presentation/more/settings/screen/WorkerInfoScreen.kt index f4c10f244..eb652d0ae 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/screen/WorkerInfoScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/screen/WorkerInfoScreen.kt @@ -37,14 +37,14 @@ import cafe.adriel.voyager.core.model.rememberScreenModel import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow -import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.Scaffold +import tachiyomi.presentation.core.util.plus object WorkerInfoScreen : Screen { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt index 8a45052b9..c7aa00999 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/AppThemePreferenceWidget.kt @@ -39,15 +39,15 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import eu.kanade.domain.ui.model.AppTheme -import eu.kanade.presentation.components.MangaCover +import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews -import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.DeviceUtil import eu.kanade.tachiyomi.util.system.isDynamicColorAvailable import tachiyomi.presentation.core.components.material.DIVIDER_ALPHA import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.ThemePreviews +import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable internal fun AppThemePreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/InfoWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/InfoWidget.kt index 208cdb896..1183414e2 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/InfoWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/InfoWidget.kt @@ -13,10 +13,10 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.res.stringResource import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews -import eu.kanade.presentation.util.secondaryItemAlpha import eu.kanade.tachiyomi.R import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.ThemePreviews +import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable internal fun InfoWidget(text: String) { diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt index 2d63969be..c6ee53ccb 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/ListPreferenceWidget.kt @@ -22,12 +22,12 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.ScrollbarLazyColumn -import eu.kanade.presentation.util.isScrolledToEnd -import eu.kanade.presentation.util.isScrolledToStart -import eu.kanade.presentation.util.minimumTouchTargetSize import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.util.isScrolledToEnd +import tachiyomi.presentation.core.util.isScrolledToStart +import tachiyomi.presentation.core.util.minimumTouchTargetSize @Composable fun ListPreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt index 23e547892..8965d0266 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/MultiSelectListPreferenceWidget.kt @@ -23,8 +23,8 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import eu.kanade.presentation.more.settings.Preference -import eu.kanade.presentation.util.minimumTouchTargetSize import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.util.minimumTouchTargetSize @Composable fun MultiSelectListPreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt index 534a71929..7de5c68d3 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/SwitchPreferenceWidget.kt @@ -10,7 +10,7 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews +import tachiyomi.presentation.core.util.ThemePreviews @Composable fun SwitchPreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt index 84fabb188..cf1ad09bb 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TextPreferenceWidget.kt @@ -18,8 +18,8 @@ import androidx.compose.ui.text.buildAnnotatedString import androidx.compose.ui.text.withStyle import androidx.compose.ui.tooling.preview.Preview import eu.kanade.presentation.theme.TachiyomiTheme -import eu.kanade.presentation.util.ThemePreviews -import eu.kanade.presentation.util.secondaryItemAlpha +import tachiyomi.presentation.core.util.ThemePreviews +import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable fun TextPreferenceWidget( diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt index 5c95eacc6..8fcbc807d 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TrackingPreferenceWidget.kt @@ -17,8 +17,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.TrackLogoIcon import eu.kanade.presentation.more.settings.LocalPreferenceHighlighted +import eu.kanade.presentation.track.components.TrackLogoIcon import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.TrackService diff --git a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt index 682033b7d..5c810f9e8 100644 --- a/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt +++ b/app/src/main/java/eu/kanade/presentation/more/settings/widget/TriStateListDialog.kt @@ -27,11 +27,11 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.util.isScrolledToEnd -import eu.kanade.presentation.util.isScrolledToStart import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.Divider +import tachiyomi.presentation.core.util.isScrolledToEnd +import tachiyomi.presentation.core.util.isScrolledToStart private enum class State { CHECKED, INVERSED, UNCHECKED diff --git a/app/src/main/java/eu/kanade/presentation/more/stats/StatsScreenContent.kt b/app/src/main/java/eu/kanade/presentation/more/stats/StatsScreenContent.kt index 3a63875ef..c9c5f497b 100644 --- a/app/src/main/java/eu/kanade/presentation/more/stats/StatsScreenContent.kt +++ b/app/src/main/java/eu/kanade/presentation/more/stats/StatsScreenContent.kt @@ -14,12 +14,12 @@ import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import eu.kanade.core.util.toDurationString -import eu.kanade.presentation.components.LazyColumn import eu.kanade.presentation.more.stats.components.StatsItem import eu.kanade.presentation.more.stats.components.StatsOverviewItem import eu.kanade.presentation.more.stats.components.StatsSection import eu.kanade.presentation.more.stats.data.StatsData import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.LazyColumn import tachiyomi.presentation.core.components.material.padding import java.util.Locale import kotlin.time.DurationUnit diff --git a/app/src/main/java/eu/kanade/presentation/manga/TrackInfoDialogHome.kt b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogHome.kt similarity index 99% rename from app/src/main/java/eu/kanade/presentation/manga/TrackInfoDialogHome.kt rename to app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogHome.kt index 4447894b4..3662b0bc0 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/TrackInfoDialogHome.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogHome.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.manga +package eu.kanade.presentation.track import androidx.compose.animation.animateContentSize import androidx.compose.foundation.background @@ -43,7 +43,7 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import eu.kanade.presentation.components.DropdownMenu -import eu.kanade.presentation.components.TrackLogoIcon +import eu.kanade.presentation.track.components.TrackLogoIcon import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.TrackService import eu.kanade.tachiyomi.ui.manga.track.TrackItem diff --git a/app/src/main/java/eu/kanade/presentation/manga/TrackInfoDialogSelector.kt b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt similarity index 93% rename from app/src/main/java/eu/kanade/presentation/manga/TrackInfoDialogSelector.kt rename to app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt index 4c37a8e08..1ee7cd992 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/TrackInfoDialogSelector.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackInfoDialogSelector.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.manga +package eu.kanade.presentation.track import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box @@ -29,18 +29,19 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.ScrollbarLazyColumn -import eu.kanade.presentation.components.WheelDatePicker -import eu.kanade.presentation.components.WheelTextPicker -import eu.kanade.presentation.util.isScrolledToEnd -import eu.kanade.presentation.util.isScrolledToStart -import eu.kanade.presentation.util.minimumTouchTargetSize import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.ScrollbarLazyColumn +import tachiyomi.presentation.core.components.WheelDatePicker +import tachiyomi.presentation.core.components.WheelTextPicker import tachiyomi.presentation.core.components.material.AlertDialogContent import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.isScrolledToEnd +import tachiyomi.presentation.core.util.isScrolledToStart +import tachiyomi.presentation.core.util.minimumTouchTargetSize import java.time.LocalDate import java.time.format.TextStyle +import java.util.Locale @Composable fun TrackStatusSelector( @@ -160,7 +161,7 @@ fun TrackDateSelector( .weight(1f) .padding(end = 16.dp), text = internalSelection.dayOfWeek - .getDisplayName(TextStyle.SHORT, java.util.Locale.getDefault()), + .getDisplayName(TextStyle.SHORT, Locale.getDefault()), textAlign = TextAlign.Center, style = MaterialTheme.typography.titleMedium, ) diff --git a/app/src/main/java/eu/kanade/presentation/manga/TrackServiceSearch.kt b/app/src/main/java/eu/kanade/presentation/track/TrackServiceSearch.kt similarity index 97% rename from app/src/main/java/eu/kanade/presentation/manga/TrackServiceSearch.kt rename to app/src/main/java/eu/kanade/presentation/track/TrackServiceSearch.kt index bc4b8ba6c..ec87f8d3b 100644 --- a/app/src/main/java/eu/kanade/presentation/manga/TrackServiceSearch.kt +++ b/app/src/main/java/eu/kanade/presentation/track/TrackServiceSearch.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.manga +package eu.kanade.presentation.track import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.fadeIn @@ -57,17 +57,17 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.text.toLowerCase import androidx.compose.ui.unit.dp import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.MangaCover -import eu.kanade.presentation.components.ScrollbarLazyColumn -import eu.kanade.presentation.util.plus -import eu.kanade.presentation.util.runOnEnterKeyPressed -import eu.kanade.presentation.util.secondaryItemAlpha +import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.track.model.TrackSearch import tachiyomi.presentation.core.components.LoadingScreen +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.plus +import tachiyomi.presentation.core.util.runOnEnterKeyPressed +import tachiyomi.presentation.core.util.secondaryItemAlpha @Composable fun TrackServiceSearch( diff --git a/app/src/main/java/eu/kanade/presentation/components/TrackLogoIcon.kt b/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIcon.kt similarity index 91% rename from app/src/main/java/eu/kanade/presentation/components/TrackLogoIcon.kt rename to app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIcon.kt index e798155c2..293faf62f 100644 --- a/app/src/main/java/eu/kanade/presentation/components/TrackLogoIcon.kt +++ b/app/src/main/java/eu/kanade/presentation/track/components/TrackLogoIcon.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package eu.kanade.presentation.track.components import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -13,8 +13,8 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import eu.kanade.presentation.util.clickableNoIndication import eu.kanade.tachiyomi.data.track.TrackService +import tachiyomi.presentation.core.util.clickableNoIndication @Composable fun TrackLogoIcon( diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt index c91aa7112..af8720d60 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesScreen.kt @@ -24,16 +24,16 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.util.fastAll import androidx.compose.ui.util.fastAny import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.ChapterDownloadAction import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.FastScrollLazyColumn -import eu.kanade.presentation.components.MangaBottomActionMenu +import eu.kanade.presentation.manga.components.ChapterDownloadAction +import eu.kanade.presentation.manga.components.MangaBottomActionMenu import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.ui.updates.UpdatesItem import eu.kanade.tachiyomi.ui.updates.UpdatesState import kotlinx.coroutines.delay import kotlinx.coroutines.launch +import tachiyomi.presentation.core.components.FastScrollLazyColumn import tachiyomi.presentation.core.components.LoadingScreen import tachiyomi.presentation.core.components.material.PullRefresh import tachiyomi.presentation.core.components.material.Scaffold diff --git a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt index 4f84a49f8..2278c8652 100644 --- a/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt +++ b/app/src/main/java/eu/kanade/presentation/updates/UpdatesUiItem.kt @@ -33,18 +33,18 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontStyle import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp -import eu.kanade.presentation.components.ChapterDownloadAction -import eu.kanade.presentation.components.ChapterDownloadIndicator -import eu.kanade.presentation.components.ListGroupHeader -import eu.kanade.presentation.components.MangaCover +import eu.kanade.presentation.manga.components.ChapterDownloadAction +import eu.kanade.presentation.manga.components.ChapterDownloadIndicator import eu.kanade.presentation.manga.components.DotSeparatorText -import eu.kanade.presentation.util.selectedBackground +import eu.kanade.presentation.manga.components.MangaCover import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.model.Download import eu.kanade.tachiyomi.ui.updates.UpdatesItem import tachiyomi.domain.updates.model.UpdatesWithRelations +import tachiyomi.presentation.core.components.ListGroupHeader import tachiyomi.presentation.core.components.material.ReadItemAlpha import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.selectedBackground import java.util.Date import kotlin.time.Duration.Companion.minutes diff --git a/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt b/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt index c18619876..15d312d71 100644 --- a/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt +++ b/app/src/main/java/eu/kanade/presentation/webview/EhLoginWebViewScreen.kt @@ -38,10 +38,10 @@ import com.google.accompanist.web.WebView import com.google.accompanist.web.rememberWebViewNavigator import com.google.accompanist.web.rememberWebViewState import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.Button import eu.kanade.tachiyomi.BuildConfig import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.setDefaultSettings +import tachiyomi.presentation.core.components.material.Button import tachiyomi.presentation.core.components.material.Scaffold @Composable diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt index 33053f2c6..c527778b1 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/browse/source/browse/BrowseSourceScreen.kt @@ -45,8 +45,8 @@ import eu.kanade.presentation.browse.components.FailedToLoadSavedSearchDialog import eu.kanade.presentation.browse.components.RemoveMangaDialog import eu.kanade.presentation.browse.components.SavedSearchCreateDialog import eu.kanade.presentation.browse.components.SavedSearchDeleteDialog -import eu.kanade.presentation.components.ChangeCategoryDialog -import eu.kanade.presentation.components.DuplicateMangaDialog +import eu.kanade.presentation.components.dialogs.ChangeCategoryDialog +import eu.kanade.presentation.components.dialogs.DuplicateMangaDialog import eu.kanade.presentation.util.AssistContentScreen import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.source.CatalogueSource diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt index 76d853262..e71d21ec5 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryTab.kt @@ -31,16 +31,16 @@ import cafe.adriel.voyager.navigator.tab.TabOptions import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.library.model.LibraryGroup import eu.kanade.domain.manga.model.isLocal -import eu.kanade.presentation.components.ChangeCategoryDialog -import eu.kanade.presentation.components.DeleteLibraryMangaDialog import eu.kanade.presentation.components.EmptyScreen import eu.kanade.presentation.components.EmptyScreenAction -import eu.kanade.presentation.components.LibraryBottomActionMenu +import eu.kanade.presentation.components.dialogs.ChangeCategoryDialog +import eu.kanade.presentation.components.dialogs.DeleteLibraryMangaDialog import eu.kanade.presentation.library.components.LibraryContent import eu.kanade.presentation.library.components.LibraryToolbar import eu.kanade.presentation.library.components.SyncFavoritesConfirmDialog import eu.kanade.presentation.library.components.SyncFavoritesProgressDialog import eu.kanade.presentation.library.components.SyncFavoritesWarningDialog +import eu.kanade.presentation.manga.components.LibraryBottomActionMenu import eu.kanade.presentation.util.Tab import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.library.LibraryUpdateJob diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt index 0a03243b3..3fc751a10 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreen.kt @@ -28,9 +28,9 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder import eu.kanade.domain.UnsortedPreferences import eu.kanade.domain.manga.model.hasCustomCover import eu.kanade.domain.manga.model.toSManga -import eu.kanade.presentation.components.ChangeCategoryDialog -import eu.kanade.presentation.components.DuplicateMangaDialog import eu.kanade.presentation.components.NavigatorAdaptiveSheet +import eu.kanade.presentation.components.dialogs.ChangeCategoryDialog +import eu.kanade.presentation.components.dialogs.DuplicateMangaDialog import eu.kanade.presentation.manga.ChapterSettingsDialog import eu.kanade.presentation.manga.EditCoverAction import eu.kanade.presentation.manga.MangaScreen diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt index d5d6d3a34..4aeb8c2cc 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/MangaScreenModel.kt @@ -38,8 +38,8 @@ import eu.kanade.domain.source.service.SourcePreferences import eu.kanade.domain.track.model.toDbTrack import eu.kanade.domain.track.model.toDomainTrack import eu.kanade.domain.ui.UiPreferences -import eu.kanade.presentation.components.ChapterDownloadAction import eu.kanade.presentation.manga.DownloadAction +import eu.kanade.presentation.manga.components.ChapterDownloadAction import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.download.DownloadCache import eu.kanade.tachiyomi.data.download.DownloadManager diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt index e94e48fd1..b8030fb7c 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackInfoDialog.kt @@ -40,12 +40,12 @@ import eu.kanade.domain.chapter.interactor.SyncChaptersWithTrackServiceTwoWay import eu.kanade.domain.track.model.toDbTrack import eu.kanade.domain.track.model.toDomainTrack import eu.kanade.domain.ui.UiPreferences -import eu.kanade.presentation.manga.TrackChapterSelector -import eu.kanade.presentation.manga.TrackDateSelector -import eu.kanade.presentation.manga.TrackInfoDialogHome -import eu.kanade.presentation.manga.TrackScoreSelector -import eu.kanade.presentation.manga.TrackServiceSearch -import eu.kanade.presentation.manga.TrackStatusSelector +import eu.kanade.presentation.track.TrackChapterSelector +import eu.kanade.presentation.track.TrackDateSelector +import eu.kanade.presentation.track.TrackInfoDialogHome +import eu.kanade.presentation.track.TrackScoreSelector +import eu.kanade.presentation.track.TrackServiceSearch +import eu.kanade.presentation.track.TrackStatusSelector import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.data.database.models.Track import eu.kanade.tachiyomi.data.track.EnhancedTrackService diff --git a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt index f32105a01..7060b4eab 100644 --- a/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt +++ b/app/src/main/java/eu/kanade/tachiyomi/ui/updates/UpdatesScreenModel.kt @@ -14,7 +14,7 @@ import eu.kanade.core.util.insertSeparators import eu.kanade.domain.chapter.interactor.SetReadStatus import eu.kanade.domain.library.service.LibraryPreferences import eu.kanade.domain.ui.UiPreferences -import eu.kanade.presentation.components.ChapterDownloadAction +import eu.kanade.presentation.manga.components.ChapterDownloadAction import eu.kanade.presentation.updates.UpdatesUiModel import eu.kanade.tachiyomi.data.download.DownloadCache import eu.kanade.tachiyomi.data.download.DownloadManager diff --git a/app/src/main/java/exh/debug/SettingsDebugScreen.kt b/app/src/main/java/exh/debug/SettingsDebugScreen.kt index 75f27bb75..1029495d4 100644 --- a/app/src/main/java/exh/debug/SettingsDebugScreen.kt +++ b/app/src/main/java/exh/debug/SettingsDebugScreen.kt @@ -48,19 +48,19 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.core.prefs.PreferenceMutableState import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.more.settings.widget.TextPreferenceWidget import eu.kanade.presentation.more.settings.widget.TrailingWidgetBuffer -import eu.kanade.presentation.util.plus import exh.util.capitalize import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch import kotlinx.coroutines.withContext import tachiyomi.presentation.core.components.LoadingScreen +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Divider import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus import java.util.Locale import kotlin.reflect.KFunction import kotlin.reflect.KVisibility diff --git a/app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt b/app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt index 2e193da7d..17e35feb4 100644 --- a/app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt +++ b/app/src/main/java/exh/md/follows/MangaDexFollowsScreen.kt @@ -19,8 +19,8 @@ import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.browse.BrowseSourceContent import eu.kanade.presentation.browse.components.BrowseSourceSimpleToolbar import eu.kanade.presentation.browse.components.RemoveMangaDialog -import eu.kanade.presentation.components.ChangeCategoryDialog -import eu.kanade.presentation.components.DuplicateMangaDialog +import eu.kanade.presentation.components.dialogs.ChangeCategoryDialog +import eu.kanade.presentation.components.dialogs.DuplicateMangaDialog import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.ui.browse.source.browse.BrowseSourceScreenModel import eu.kanade.tachiyomi.ui.category.CategoryScreen diff --git a/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt b/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt index a93e102b6..dac96ef34 100644 --- a/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt +++ b/app/src/main/java/exh/pagepreview/components/PagePreviewScreen.kt @@ -33,16 +33,16 @@ import androidx.compose.ui.unit.dp import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.AroundLayout import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.ScrollbarLazyColumn import eu.kanade.presentation.manga.components.PagePreview -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import exh.pagepreview.PagePreviewState import exh.util.floor import kotlinx.coroutines.launch import tachiyomi.presentation.core.components.LoadingScreen +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.plus import kotlin.math.roundToInt @Composable diff --git a/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt b/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt index 223e53ec6..3d0f6d0f8 100644 --- a/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt +++ b/app/src/main/java/exh/ui/batchadd/BatchAddScreen.kt @@ -31,12 +31,12 @@ import cafe.adriel.voyager.core.screen.Screen import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.AppBar -import eu.kanade.presentation.components.Button -import eu.kanade.presentation.components.LazyColumn -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R +import tachiyomi.presentation.core.components.LazyColumn +import tachiyomi.presentation.core.components.material.Button import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.padding +import tachiyomi.presentation.core.util.plus class BatchAddScreen : Screen { diff --git a/app/src/main/java/exh/ui/metadata/MetadataViewScreen.kt b/app/src/main/java/exh/ui/metadata/MetadataViewScreen.kt index b9da4b3b3..c6ec250e5 100644 --- a/app/src/main/java/exh/ui/metadata/MetadataViewScreen.kt +++ b/app/src/main/java/exh/ui/metadata/MetadataViewScreen.kt @@ -24,14 +24,14 @@ import cafe.adriel.voyager.navigator.LocalNavigator import cafe.adriel.voyager.navigator.currentOrThrow import eu.kanade.presentation.components.AppBar import eu.kanade.presentation.components.EmptyScreen -import eu.kanade.presentation.components.ScrollbarLazyColumn -import eu.kanade.presentation.util.clickableNoIndication -import eu.kanade.presentation.util.plus import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.util.system.copyToClipboard import tachiyomi.presentation.core.components.LoadingScreen +import tachiyomi.presentation.core.components.ScrollbarLazyColumn import tachiyomi.presentation.core.components.material.Scaffold import tachiyomi.presentation.core.components.material.topSmallPaddingValues +import tachiyomi.presentation.core.util.clickableNoIndication +import tachiyomi.presentation.core.util.plus class MetadataViewScreen(private val mangaId: Long, private val sourceId: Long) : Screen { diff --git a/app/src/main/java/eu/kanade/presentation/components/LazyGrid.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/LazyGrid.kt similarity index 95% rename from app/src/main/java/eu/kanade/presentation/components/LazyGrid.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/LazyGrid.kt index fc1858a88..085caf59f 100644 --- a/app/src/main/java/eu/kanade/presentation/components/LazyGrid.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/LazyGrid.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components import androidx.compose.foundation.gestures.FlingBehavior import androidx.compose.foundation.layout.Arrangement @@ -14,7 +14,7 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import eu.kanade.presentation.util.flingBehaviorIgnoringMotionScale +import tachiyomi.presentation.core.util.flingBehaviorIgnoringMotionScale @Composable fun FastScrollLazyVerticalGrid( diff --git a/app/src/main/java/eu/kanade/presentation/components/LazyList.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/LazyList.kt similarity index 95% rename from app/src/main/java/eu/kanade/presentation/components/LazyList.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/LazyList.kt index 6698444e6..afce11140 100644 --- a/app/src/main/java/eu/kanade/presentation/components/LazyList.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/LazyList.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components import androidx.compose.foundation.gestures.FlingBehavior import androidx.compose.foundation.layout.Arrangement @@ -14,8 +14,8 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.unit.dp -import eu.kanade.presentation.util.drawVerticalScrollbar -import eu.kanade.presentation.util.flingBehaviorIgnoringMotionScale +import tachiyomi.presentation.core.util.drawVerticalScrollbar +import tachiyomi.presentation.core.util.flingBehaviorIgnoringMotionScale /** * LazyColumn with fling animation fix diff --git a/app/src/main/java/eu/kanade/presentation/components/ListGroupHeader.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/ListGroupHeader.kt similarity index 94% rename from app/src/main/java/eu/kanade/presentation/components/ListGroupHeader.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/ListGroupHeader.kt index f1a1b5431..c0ffb35d4 100644 --- a/app/src/main/java/eu/kanade/presentation/components/ListGroupHeader.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/ListGroupHeader.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components import androidx.compose.foundation.layout.padding import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/eu/kanade/presentation/components/VerticalFastScroller.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/VerticalFastScroller.kt similarity index 99% rename from app/src/main/java/eu/kanade/presentation/components/VerticalFastScroller.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/VerticalFastScroller.kt index c18049f6a..92fcd0ca3 100644 --- a/app/src/main/java/eu/kanade/presentation/components/VerticalFastScroller.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/VerticalFastScroller.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components import android.view.ViewConfiguration import androidx.compose.animation.core.Animatable @@ -45,10 +45,10 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastFirstOrNull import androidx.compose.ui.util.fastForEach import androidx.compose.ui.util.fastMaxBy -import eu.kanade.presentation.components.Scroller.STICKY_HEADER_KEY_PREFIX import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.collectLatest +import tachiyomi.presentation.core.components.Scroller.STICKY_HEADER_KEY_PREFIX import kotlin.math.abs import kotlin.math.max import kotlin.math.min diff --git a/app/src/main/java/eu/kanade/presentation/components/WheelPicker.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/WheelPicker.kt similarity index 99% rename from app/src/main/java/eu/kanade/presentation/components/WheelPicker.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/WheelPicker.kt index 628f3d157..093a4a8dd 100644 --- a/app/src/main/java/eu/kanade/presentation/components/WheelPicker.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/WheelPicker.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.gestures.snapping.rememberSnapFlingBehavior diff --git a/app/src/main/java/eu/kanade/presentation/components/Button.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Button.kt similarity index 99% rename from app/src/main/java/eu/kanade/presentation/components/Button.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Button.kt index 18c2e9c12..3a5de0275 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Button.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Button.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components.material import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.VectorConverter @@ -38,7 +38,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Shape import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import eu.kanade.presentation.util.animateElevation +import tachiyomi.presentation.core.util.animateElevation import androidx.compose.material3.ButtonDefaults as M3ButtonDefaults /** diff --git a/app/src/main/java/eu/kanade/presentation/components/Surface.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Surface.kt similarity index 97% rename from app/src/main/java/eu/kanade/presentation/components/Surface.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Surface.kt index d44dc966e..1b3a60380 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Surface.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Surface.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components.material import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background @@ -27,7 +27,7 @@ import androidx.compose.ui.graphics.compositeOver import androidx.compose.ui.semantics.Role import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp -import eu.kanade.presentation.util.minimumTouchTargetSize +import tachiyomi.presentation.core.util.minimumTouchTargetSize import kotlin.math.ln /** diff --git a/app/src/main/java/eu/kanade/presentation/components/Tabs.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt similarity index 96% rename from app/src/main/java/eu/kanade/presentation/components/Tabs.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt index 075537fde..28f9f9aa6 100644 --- a/app/src/main/java/eu/kanade/presentation/components/Tabs.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/components/material/Tabs.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.components +package tachiyomi.presentation.core.components.material import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Row diff --git a/app/src/main/java/eu/kanade/presentation/util/Elevation.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Elevation.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/util/Elevation.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/util/Elevation.kt index bece50fc7..67792fbaf 100644 --- a/app/src/main/java/eu/kanade/presentation/util/Elevation.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Elevation.kt @@ -18,7 +18,7 @@ * Straight copy from Compose M3 for Button fork */ -package eu.kanade.presentation.util +package tachiyomi.presentation.core.util import androidx.compose.animation.core.Animatable import androidx.compose.animation.core.AnimationSpec @@ -47,7 +47,7 @@ import androidx.compose.ui.unit.Dp * when this component is being pressed. `null` if this component is moving back to its default * state. */ -internal suspend fun Animatable.animateElevation( +suspend fun Animatable.animateElevation( target: Dp, from: Interaction? = null, to: Interaction? = null, diff --git a/app/src/main/java/eu/kanade/presentation/util/LazyListState.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/LazyListState.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/util/LazyListState.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/util/LazyListState.kt index 30304c78b..c0b326464 100644 --- a/app/src/main/java/eu/kanade/presentation/util/LazyListState.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/LazyListState.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.util +package tachiyomi.presentation.core.util import androidx.compose.foundation.lazy.LazyListState import androidx.compose.runtime.Composable diff --git a/app/src/main/java/eu/kanade/presentation/util/Modifier.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Modifier.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/util/Modifier.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/util/Modifier.kt index 8d9a30e1e..d81aeadb2 100644 --- a/app/src/main/java/eu/kanade/presentation/util/Modifier.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Modifier.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.util +package tachiyomi.presentation.core.util import androidx.compose.foundation.background import androidx.compose.foundation.combinedClickable diff --git a/app/src/main/java/eu/kanade/presentation/util/PaddingValues.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/PaddingValues.kt similarity index 95% rename from app/src/main/java/eu/kanade/presentation/util/PaddingValues.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/util/PaddingValues.kt index 039883ce8..6d3baad5e 100644 --- a/app/src/main/java/eu/kanade/presentation/util/PaddingValues.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/PaddingValues.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.util +package tachiyomi.presentation.core.util import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.calculateEndPadding diff --git a/app/src/main/java/eu/kanade/presentation/util/Preview.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Preview.kt similarity index 87% rename from app/src/main/java/eu/kanade/presentation/util/Preview.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/util/Preview.kt index 35e7314c6..21dc9cabc 100644 --- a/app/src/main/java/eu/kanade/presentation/util/Preview.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Preview.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.util +package tachiyomi.presentation.core.util import android.content.res.Configuration import androidx.compose.ui.tooling.preview.Preview diff --git a/app/src/main/java/eu/kanade/presentation/util/Scrollable.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollable.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/util/Scrollable.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollable.kt index 6b7316a70..96d9166b1 100644 --- a/app/src/main/java/eu/kanade/presentation/util/Scrollable.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollable.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.util +package tachiyomi.presentation.core.util import androidx.compose.animation.core.AnimationState import androidx.compose.animation.core.DecayAnimationSpec diff --git a/app/src/main/java/eu/kanade/presentation/util/Scrollbar.kt b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt similarity index 98% rename from app/src/main/java/eu/kanade/presentation/util/Scrollbar.kt rename to presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt index ab7f5b7ab..55552d78c 100644 --- a/app/src/main/java/eu/kanade/presentation/util/Scrollbar.kt +++ b/presentation-core/src/main/java/tachiyomi/presentation/core/util/Scrollbar.kt @@ -1,4 +1,4 @@ -package eu.kanade.presentation.util +package tachiyomi.presentation.core.util /* * MIT License @@ -64,10 +64,10 @@ import androidx.compose.ui.unit.LayoutDirection import androidx.compose.ui.unit.dp import androidx.compose.ui.util.fastFirstOrNull import androidx.compose.ui.util.fastSumBy -import eu.kanade.presentation.components.Scroller.STICKY_HEADER_KEY_PREFIX import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.collectLatest +import tachiyomi.presentation.core.components.Scroller.STICKY_HEADER_KEY_PREFIX /** * Draws horizontal scrollbar to a LazyList.