Skip to content

Commit

Permalink
Bump dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
arkon committed Jul 18, 2023
1 parent 3f868c0 commit ac30654
Show file tree
Hide file tree
Showing 55 changed files with 109 additions and 111 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class ExtensionInstallerPreference(

override fun key() = "extension_installer"

val entries get() = ExtensionInstaller.values().run {
val entries get() = ExtensionInstaller.entries.run {
if (context.hasMiuiPackageInstaller) {
filter { it != ExtensionInstaller.PACKAGEINSTALLER }
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,8 +73,8 @@ class SetReadStatus(
await(manga.id, read)

sealed class Result {
object Success : Result()
object NoChapters : Result()
data object Success : Result()
data object NoChapters : Result()
data class InternalError(val error: Throwable) : Result()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ private fun Extension.getIcon(density: Int = DisplayMetrics.DENSITY_DEFAULT): St
}

sealed class Result<out T> {
object Loading : Result<Nothing>()
object Error : Result<Nothing>()
data object Loading : Result<Nothing>()
data object Error : Result<Nothing>()
data class Success<out T>(val value: T) : Result<T>()
}
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ fun GlobalSearchToolbar(
navigateUp = navigateUp,
scrollBehavior = scrollBehavior,
)
if (progress in 1 until total) {
if (progress in 1..<total) {
LinearProgressIndicator(
progress = progress / total.toFloat(),
modifier = Modifier
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ fun MangaBottomActionMenu(
var resetJob: Job? = remember { null }
val onLongClickItem: (Int) -> Unit = { toConfirmIndex ->
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
(0 until 7).forEach { i -> confirm[i] = i == toConfirmIndex }
(0..<7).forEach { i -> confirm[i] = i == toConfirmIndex }
resetJob?.cancel()
resetJob = scope.launch {
delay(1.seconds)
Expand Down Expand Up @@ -241,7 +241,7 @@ fun LibraryBottomActionMenu(
var resetJob: Job? = remember { null }
val onLongClickItem: (Int) -> Unit = { toConfirmIndex ->
haptic.performHapticFeedback(HapticFeedbackType.LongPress)
(0 until 5).forEach { i -> confirm[i] = i == toConfirmIndex }
(0..<5).forEach { i -> confirm[i] = i == toConfirmIndex }
resetJob?.cancel()
resetJob = scope.launch {
delay(1.seconds)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ object SettingsAppearanceScreen : SearchableSettings {
Preference.PreferenceItem.ListPreference(
pref = uiPreferences.tabletUiMode(),
title = stringResource(R.string.pref_tablet_ui_mode),
entries = TabletUiMode.values().associateWith { stringResource(it.titleResId) },
entries = TabletUiMode.entries.associateWith { stringResource(it.titleResId) },
onValueChanged = {
context.toast(R.string.requires_app_restart)
true
Expand Down Expand Up @@ -180,7 +180,7 @@ object SettingsAppearanceScreen : SearchableSettings {
var eventType = parser.eventType
while (eventType != XmlPullParser.END_DOCUMENT) {
if (eventType == XmlPullParser.START_TAG && parser.name == "locale") {
for (i in 0 until parser.attributeCount) {
for (i in 0..<parser.attributeCount) {
if (parser.getAttributeName(i) == "name") {
val langTag = parser.getAttributeValue(i)
val displayName = LocaleHelper.getDisplayName(langTag)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ object SettingsReaderScreen : SearchableSettings {
Preference.PreferenceItem.ListPreference(
pref = readerPref.defaultReadingMode(),
title = stringResource(R.string.pref_viewer_type),
entries = ReadingModeType.values().drop(1)
entries = ReadingModeType.entries.drop(1)
.associate { it.flagValue to stringResource(it.stringRes) },
),
Preference.PreferenceItem.ListPreference(
Expand Down Expand Up @@ -84,7 +84,7 @@ object SettingsReaderScreen : SearchableSettings {
Preference.PreferenceItem.ListPreference(
pref = readerPreferences.defaultOrientationType(),
title = stringResource(R.string.pref_rotation_type),
entries = OrientationType.values().drop(1)
entries = OrientationType.entries.drop(1)
.associate { it.flagValue to stringResource(it.stringRes) },
),
Preference.PreferenceItem.ListPreference(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ object SettingsSecurityScreen : SearchableSettings {
Preference.PreferenceItem.ListPreference(
pref = securityPreferences.secureScreen(),
title = stringResource(R.string.secure_screen),
entries = SecurityPreferences.SecureScreenMode.values()
entries = SecurityPreferences.SecureScreenMode.entries
.associateWith { stringResource(it.titleResId) },
),
Preference.PreferenceItem.InfoPreference(stringResource(R.string.secure_screen_summary)),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ private class ClearDatabaseScreenModel : StateScreenModel<ClearDatabaseScreenMod
}

sealed class State {
object Loading : State()
data object Loading : State()
data class Ready(
val items: List<SourceWithCount>,
val selection: List<Long> = emptyList(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private fun AppThemesList(
onItemClick: (AppTheme) -> Unit,
) {
val appThemes = remember {
AppTheme.values()
AppTheme.entries
.filterNot { it.titleResId == null || (it == AppTheme.MONET && !DeviceUtil.isDynamicColorAvailable) }
}
LazyRow(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import eu.kanade.presentation.more.stats.data.StatsData

sealed class StatsScreenState {
@Immutable
object Loading : StatsScreenState()
data object Loading : StatsScreenState()

@Immutable
data class Success(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ import tachiyomi.presentation.core.components.SettingsChipRow
import tachiyomi.presentation.core.components.SliderItem
import java.text.NumberFormat

private val readingModeOptions = ReadingModeType.values().map { it.stringRes to it }
private val orientationTypeOptions = OrientationType.values().map { it.stringRes to it }
private val tappingInvertModeOptions = ReaderPreferences.TappingInvertMode.values().map { it.titleResId to it }
private val readingModeOptions = ReadingModeType.entries.map { it.stringRes to it }
private val orientationTypeOptions = OrientationType.entries.map { it.stringRes to it }
private val tappingInvertModeOptions = ReaderPreferences.TappingInvertMode.entries.map { it.titleResId to it }

@Composable
internal fun ColumnScope.ReadingModePage(screenModel: ReaderSettingsScreenModel) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/eu/kanade/tachiyomi/AppInfo.kt
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@ object AppInfo {
*
* @since extension-lib 1.5
*/
fun getSupportedImageMimeTypes(): List<String> = ImageUtil.ImageType.values().map { it.mime }
fun getSupportedImageMimeTypes(): List<String> = ImageUtil.ImageType.entries.map { it.mime }
}
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ sealed class Location {
}
}

object Cache : Location()
data object Cache : Location()

fun directory(context: Context): File {
return when (this) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ class BangumiInterceptor(val bangumi: Bangumi) : Interceptor {

private fun addToken(token: String, oidFormBody: FormBody): FormBody {
val newFormBody = FormBody.Builder()
for (i in 0 until oidFormBody.size) {
for (i in 0..<oidFormBody.size) {
newFormBody.add(oidFormBody.name(i), oidFormBody.value(i))
}
newFormBody.add("access_token", token)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package eu.kanade.tachiyomi.extension.model

sealed class LoadResult {
class Success(val extension: Extension.Installed) : LoadResult()
class Untrusted(val extension: Extension.Untrusted) : LoadResult()
object Error : LoadResult()
data class Success(val extension: Extension.Installed) : LoadResult()
data class Untrusted(val extension: Extension.Untrusted) : LoadResult()
data object Error : LoadResult()
}
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,13 @@ class ExtensionFilterScreenModel(
}

sealed class ExtensionFilterEvent {
object FailedFetchingLanguages : ExtensionFilterEvent()
data object FailedFetchingLanguages : ExtensionFilterEvent()
}

sealed class ExtensionFilterState {

@Immutable
object Loading : ExtensionFilterState()
data object Loading : ExtensionFilterState()

@Immutable
data class Success(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ class ExtensionDetailsScreenModel(
}

sealed class ExtensionDetailsEvent {
object Uninstalled : ExtensionDetailsEvent()
data object Uninstalled : ExtensionDetailsEvent()
}

@Immutable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class MigrationMangaScreenModel(
}

sealed class MigrationMangaEvent {
object FailedFetchingFavorites : MigrationMangaEvent()
data object FailedFetchingFavorites : MigrationMangaEvent()
}

@Immutable
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ class MigrateSourceScreenModel(
}

sealed class Event {
object FailedFetchingSourcesWithCount : Event()
data object FailedFetchingSourcesWithCount : Event()
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ class SourcesFilterScreenModel(

sealed class SourcesFilterState {

object Loading : SourcesFilterState()
data object Loading : SourcesFilterState()

data class Error(
val throwable: Throwable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ class SourcesScreenModel(
}

sealed class Event {
object FailedFetchingSources : Event()
data object FailedFetchingSources : Event()
}

data class Dialog(val source: Source)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -350,8 +350,8 @@ class BrowseSourceScreenModel(
}

sealed class Listing(open val query: String?, open val filters: FilterList) {
object Popular : Listing(query = GetRemoteManga.QUERY_POPULAR, filters = FilterList())
object Latest : Listing(query = GetRemoteManga.QUERY_LATEST, filters = FilterList())
data object Popular : Listing(query = GetRemoteManga.QUERY_POPULAR, filters = FilterList())
data object Latest : Listing(query = GetRemoteManga.QUERY_LATEST, filters = FilterList())
data class Search(override val query: String?, override val filters: FilterList) : Listing(query = query, filters = filters)

companion object {
Expand All @@ -366,7 +366,7 @@ class BrowseSourceScreenModel(
}

sealed class Dialog {
object Filter : Dialog()
data object Filter : Dialog()
data class RemoveManga(val manga: Manga) : Dialog()
data class AddDuplicateManga(val manga: Manga, val duplicate: Manga) : Dialog()
data class ChangeMangaCategory(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ enum class SourceFilter {
}

sealed class SearchItemResult {
object Loading : SearchItemResult()
data object Loading : SearchItemResult()

data class Error(
val throwable: Throwable,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -108,20 +108,20 @@ class CategoryScreenModel(
}

sealed class CategoryDialog {
object Create : CategoryDialog()
data object Create : CategoryDialog()
data class Rename(val category: Category) : CategoryDialog()
data class Delete(val category: Category) : CategoryDialog()
}

sealed class CategoryEvent {
sealed class LocalizedMessage(@StringRes val stringRes: Int) : CategoryEvent()
object InternalError : LocalizedMessage(R.string.internal_error)
data object InternalError : LocalizedMessage(R.string.internal_error)
}

sealed class CategoryScreenState {

@Immutable
object Loading : CategoryScreenState()
data object Loading : CategoryScreenState()

@Immutable
data class Success(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,14 @@ class HistoryScreenModel(
}

sealed class Dialog {
object DeleteAll : Dialog()
data object DeleteAll : Dialog()
data class Delete(val history: HistoryWithRelations) : Dialog()
}

sealed class Event {
data class OpenChapter(val chapter: Chapter?) : Event()
object InternalError : Event()
object HistoryCleared : Event()
data object InternalError : Event()
data object HistoryCleared : Event()
}
}

Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/eu/kanade/tachiyomi/ui/home/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ object HomeScreen : Screen() {

sealed class Tab {
data class Library(val mangaIdToOpen: Long? = null) : Tab()
object Updates : Tab()
object History : Tab()
data object Updates : Tab()
data object History : Tab()
data class Browse(val toExtensions: Boolean = false) : Tab()
data class More(val toDownloads: Boolean) : Tab()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -658,7 +658,7 @@ class LibraryScreenModel(
}

sealed class Dialog {
object SettingsSheet : Dialog()
data object SettingsSheet : Dialog()
data class ChangeCategory(val manga: List<Manga>, val initialSelection: List<CheckboxState<Category>>) : Dialog()
data class DeleteManga(val manga: List<Manga>) : Dialog()
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -854,10 +854,10 @@ class MangaInfoScreenModel(
// Try to select the items in-between when possible
val range: IntRange
if (selectedIndex < selectedPositions[0]) {
range = selectedIndex + 1 until selectedPositions[0]
range = selectedIndex + 1..<selectedPositions[0]
selectedPositions[0] = selectedIndex
} else if (selectedIndex > selectedPositions[1]) {
range = (selectedPositions[1] + 1) until selectedIndex
range = (selectedPositions[1] + 1)..<selectedIndex
selectedPositions[1] = selectedIndex
} else {
// Just select itself
Expand Down Expand Up @@ -946,9 +946,9 @@ class MangaInfoScreenModel(
data class ChangeCategory(val manga: Manga, val initialSelection: List<CheckboxState<Category>>) : Dialog()
data class DeleteChapters(val chapters: List<Chapter>) : Dialog()
data class DuplicateManga(val manga: Manga, val duplicate: Manga) : Dialog()
object SettingsSheet : Dialog()
object TrackSheet : Dialog()
object FullCover : Dialog()
data object SettingsSheet : Dialog()
data object TrackSheet : Dialog()
data object FullCover : Dialog()
}

fun dismissDialog() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/eu/kanade/tachiyomi/ui/more/MoreTab.kt
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ private class MoreScreenModel(
}

sealed class DownloadQueueState {
object Stopped : DownloadQueueState()
data object Stopped : DownloadQueueState()
data class Paused(val pending: Int) : DownloadQueueState()
data class Downloading(val pending: Int) : DownloadQueueState()
}
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@ class ReaderActivity : BaseActivity() {

setOnClickListener {
popupMenu(
items = ReadingModeType.values().map { it.flagValue to it.stringRes },
items = ReadingModeType.entries.map { it.flagValue to it.stringRes },
selectedItemId = viewModel.getMangaReadingMode(resolveDefault = false),
) {
val newReadingMode = ReadingModeType.fromPreference(itemId)
Expand Down Expand Up @@ -538,7 +538,7 @@ class ReaderActivity : BaseActivity() {

setOnClickListener {
popupMenu(
items = OrientationType.values().map { it.flagValue to it.stringRes },
items = OrientationType.entries.map { it.flagValue to it.stringRes },
selectedItemId = viewModel.manga?.orientationType?.toInt()
?: readerPreferences.defaultOrientationType().get(),
) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -861,13 +861,13 @@ class ReaderViewModel(
}

sealed class Dialog {
object Loading : Dialog()
object Settings : Dialog()
data object Loading : Dialog()
data object Settings : Dialog()
data class PageActions(val page: ReaderPage) : Dialog()
}

sealed class Event {
object ReloadViewerChapters : Event()
data object ReloadViewerChapters : Event()
data class SetOrientation(val orientation: Int) : Event()
data class SetCoverResult(val result: SetAsCoverResult) : Event()

Expand Down
Loading

0 comments on commit ac30654

Please sign in to comment.