Update parsers and add support for Upcoming state

app/build.gradle

@@ -82,7 +82,7 @@ afterEvaluate {
 }
 dependencies {
 	//noinspection GradleDependency
-	implementation('com.github.kotatsuapp:kotatsu-parsers:904e0719eb') {
+	implementation('com.github.KotatsuApp:kotatsu-parsers:a228d71d57') {
 		exclude group: 'org.json', module: 'json'
 	}
 

app/src/main/kotlin/org/koitharu/kotatsu/core/model/Manga.kt

@@ -12,6 +12,7 @@ import org.koitharu.kotatsu.parsers.model.MangaChapter
 import org.koitharu.kotatsu.parsers.model.MangaSource
 import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.util.mapToSet
+import com.google.android.material.R as materialR
 
 @JvmName("mangaIds")
 fun Collection<Manga>.ids() = mapToSet { it.id }
@@ -42,15 +43,17 @@ val MangaState.titleResId: Int
 		MangaState.FINISHED -> R.string.state_finished
 		MangaState.ABANDONED -> R.string.state_abandoned
 		MangaState.PAUSED -> R.string.state_paused
+		MangaState.UPCOMING -> R.string.state_upcoming
 	}
 
 @get:DrawableRes
 val MangaState.iconResId: Int
 	get() = when (this) {
-		MangaState.ONGOING -> R.drawable.ic_state_ongoing
+		MangaState.ONGOING -> R.drawable.ic_play
 		MangaState.FINISHED -> R.drawable.ic_state_finished
 		MangaState.ABANDONED -> R.drawable.ic_state_abandoned
 		MangaState.PAUSED -> R.drawable.ic_action_pause
+		MangaState.UPCOMING -> materialR.drawable.ic_clock_black_24dp
 	}
 
 fun Manga.findChapter(id: Long): MangaChapter? {

app/src/main/kotlin/org/koitharu/kotatsu/core/ui/model/SortOrder.kt

@@ -12,4 +12,5 @@ val SortOrder.titleRes: Int
 		SortOrder.RATING -> R.string.by_rating
 		SortOrder.NEWEST -> R.string.newest
 		SortOrder.ALPHABETICAL -> R.string.by_name
+		SortOrder.ALPHABETICAL_DESC -> R.string.by_name_reverse
 	}

app/src/main/kotlin/org/koitharu/kotatsu/details/ui/DetailsFragment.kt

@@ -30,6 +30,8 @@ import org.koitharu.kotatsu.bookmarks.domain.Bookmark
 import org.koitharu.kotatsu.bookmarks.ui.adapter.BookmarksAdapter
 import org.koitharu.kotatsu.bookmarks.ui.sheet.BookmarksSheet
 import org.koitharu.kotatsu.core.model.countChaptersByBranch
+import org.koitharu.kotatsu.core.model.iconResId
+import org.koitharu.kotatsu.core.model.titleResId
 import org.koitharu.kotatsu.core.ui.BaseFragment
 import org.koitharu.kotatsu.core.ui.BaseListAdapter
 import org.koitharu.kotatsu.core.ui.image.CoverSizeResolver
@@ -66,7 +68,6 @@ import org.koitharu.kotatsu.list.ui.size.StaticItemSizeResolver
 import org.koitharu.kotatsu.main.ui.owners.NoModalBottomSheetOwner
 import org.koitharu.kotatsu.parsers.model.Manga
 import org.koitharu.kotatsu.parsers.model.MangaSource
-import org.koitharu.kotatsu.parsers.model.MangaState
 import org.koitharu.kotatsu.parsers.model.MangaTag
 import org.koitharu.kotatsu.reader.ui.ReaderActivity
 import org.koitharu.kotatsu.scrobbling.common.domain.model.ScrobblingInfo
@@ -181,28 +182,13 @@ class DetailsFragment :
 				ratingBar.isVisible = false
 			}
 
-			when (manga.state) {
-				MangaState.FINISHED -> infoLayout.textViewState.apply {
-					textAndVisible = resources.getString(R.string.state_finished)
-					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_finished)
+			infoLayout.textViewState.apply {
+				manga.state?.let { state ->
+					textAndVisible = resources.getString(state.titleResId)
+					drawableTop = ContextCompat.getDrawable(context, state.iconResId)
+				} ?: run {
+					isVisible = false
 				}
-
-				MangaState.ONGOING -> infoLayout.textViewState.apply {
-					textAndVisible = resources.getString(R.string.state_ongoing)
-					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_ongoing)
-				}
-
-				MangaState.ABANDONED -> infoLayout.textViewState.apply {
-					textAndVisible = resources.getString(R.string.state_abandoned)
-					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_state_abandoned)
-				}
-
-				MangaState.PAUSED -> infoLayout.textViewState.apply {
-					textAndVisible = resources.getString(R.string.state_paused)
-					drawableTop = ContextCompat.getDrawable(context, R.drawable.ic_action_pause)
-				}
-
-				null -> infoLayout.textViewState.isVisible = false
 			}
 			if (manga.source == MangaSource.LOCAL) {
 				infoLayout.textViewSource.isVisible = false

app/src/main/res/values/strings.xml

@@ -548,4 +548,6 @@
 	<string name="sync_auth">Login to sync account</string>
 	<string name="restore">Restore</string>
 	<string name="backup_date_">Backup date: %s</string>
+	<string name="state_upcoming">Upcoming</string>
+	<string name="by_name_reverse">Name reversed</string>
 </resources>