mirror of
https://github.com/rebelonion/Dantotsu.git
synced 2026-01-21 14:43:56 +00:00
feat(sortBy): added new releases item
This commit is contained in:
@@ -40,6 +40,7 @@ object Anilist {
|
||||
"SCORE_DESC",
|
||||
"POPULARITY_DESC",
|
||||
"TRENDING_DESC",
|
||||
"START_DATE_DESC",
|
||||
"TITLE_ENGLISH",
|
||||
"TITLE_ENGLISH_DESC",
|
||||
"SCORE"
|
||||
|
||||
@@ -889,14 +889,14 @@ class AnilistQueries {
|
||||
onList: Boolean? = null,
|
||||
excludedGenres: MutableList<String>? = null,
|
||||
excludedTags: MutableList<String>? = null,
|
||||
startYear: Int? =null,
|
||||
startYear: Int? = null,
|
||||
seasonYear: Int? = null,
|
||||
season: String? = null,
|
||||
id: Int? = null,
|
||||
hd: Boolean = false,
|
||||
): SearchResults? {
|
||||
val query = """
|
||||
query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult: Boolean = false, ${"$"}search: String, ${"$"}format: [MediaFormat], ${"$"}status: MediaStatus, ${"$"}countryOfOrigin: CountryCode, ${"$"}source: MediaSource, ${"$"}season: MediaSeason, ${"$"}seasonYear: Int, ${"$"}year: String, ${"$"}onList: Boolean, ${"$"}yearLesser: FuzzyDateInt, ${"$"}yearGreater: FuzzyDateInt, ${"$"}episodeLesser: Int, ${"$"}episodeGreater: Int, ${"$"}durationLesser: Int, ${"$"}durationGreater: Int, ${"$"}chapterLesser: Int, ${"$"}chapterGreater: Int, ${"$"}volumeLesser: Int, ${"$"}volumeGreater: Int, ${"$"}licensedBy: [String], ${"$"}isLicensed: Boolean, ${"$"}genres: [String], ${"$"}excludedGenres: [String], ${"$"}tags: [String], ${"$"}excludedTags: [String], ${"$"}minimumTagRank: Int, ${"$"}sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC]) {
|
||||
query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult: Boolean = false, ${"$"}search: String, ${"$"}format: [MediaFormat], ${"$"}status: MediaStatus, ${"$"}countryOfOrigin: CountryCode, ${"$"}source: MediaSource, ${"$"}season: MediaSeason, ${"$"}seasonYear: Int, ${"$"}year: String, ${"$"}onList: Boolean, ${"$"}yearLesser: FuzzyDateInt, ${"$"}yearGreater: FuzzyDateInt, ${"$"}episodeLesser: Int, ${"$"}episodeGreater: Int, ${"$"}durationLesser: Int, ${"$"}durationGreater: Int, ${"$"}chapterLesser: Int, ${"$"}chapterGreater: Int, ${"$"}volumeLesser: Int, ${"$"}volumeGreater: Int, ${"$"}licensedBy: [String], ${"$"}isLicensed: Boolean, ${"$"}genres: [String], ${"$"}excludedGenres: [String], ${"$"}tags: [String], ${"$"}excludedTags: [String], ${"$"}minimumTagRank: Int, ${"$"}sort: [MediaSort] = [POPULARITY_DESC, SCORE_DESC, START_DATE_DESC]) {
|
||||
Page(page: ${"$"}page, perPage: ${perPage ?: 50}) {
|
||||
pageInfo {
|
||||
total
|
||||
|
||||
@@ -50,9 +50,10 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
|
||||
Anilist.sortBy[0] -> R.drawable.ic_round_area_chart_24
|
||||
Anilist.sortBy[1] -> R.drawable.ic_round_filter_peak_24
|
||||
Anilist.sortBy[2] -> R.drawable.ic_round_star_graph_24
|
||||
Anilist.sortBy[3] -> R.drawable.ic_round_filter_list_24
|
||||
Anilist.sortBy[4] -> R.drawable.ic_round_filter_list_24_reverse
|
||||
Anilist.sortBy[5] -> R.drawable.ic_round_assist_walker_24
|
||||
Anilist.sortBy[3] -> R.drawable.ic_round_new_releases_24
|
||||
Anilist.sortBy[4] -> R.drawable.ic_round_filter_list_24
|
||||
Anilist.sortBy[5] -> R.drawable.ic_round_filter_list_24_reverse
|
||||
Anilist.sortBy[6] -> R.drawable.ic_round_assist_walker_24
|
||||
else -> R.drawable.ic_round_filter_alt_24
|
||||
}
|
||||
binding.filterTextView.setCompoundDrawablesWithIntrinsicBounds(filterDrawable, 0, 0, 0)
|
||||
@@ -138,24 +139,30 @@ class SearchAdapter(private val activity: SearchActivity, private val type: Stri
|
||||
activity.search()
|
||||
updateFilterTextViewDrawable()
|
||||
}
|
||||
R.id.sort_by_a_z -> {
|
||||
R.id.sort_by_recent -> {
|
||||
activity.result.sort = Anilist.sortBy[3]
|
||||
activity.updateChips.invoke()
|
||||
activity.search()
|
||||
updateFilterTextViewDrawable()
|
||||
}
|
||||
R.id.sort_by_z_a -> {
|
||||
R.id.sort_by_a_z -> {
|
||||
activity.result.sort = Anilist.sortBy[4]
|
||||
activity.updateChips.invoke()
|
||||
activity.search()
|
||||
updateFilterTextViewDrawable()
|
||||
}
|
||||
R.id.sort_by_pure_pain -> {
|
||||
R.id.sort_by_z_a -> {
|
||||
activity.result.sort = Anilist.sortBy[5]
|
||||
activity.updateChips.invoke()
|
||||
activity.search()
|
||||
updateFilterTextViewDrawable()
|
||||
}
|
||||
R.id.sort_by_pure_pain -> {
|
||||
activity.result.sort = Anilist.sortBy[6]
|
||||
activity.updateChips.invoke()
|
||||
activity.search()
|
||||
updateFilterTextViewDrawable()
|
||||
}
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
@@ -61,9 +61,10 @@ class SearchFilterBottomDialog : BottomSheetDialogFragment() {
|
||||
Anilist.sortBy[0] -> R.drawable.ic_round_area_chart_24
|
||||
Anilist.sortBy[1] -> R.drawable.ic_round_filter_peak_24
|
||||
Anilist.sortBy[2] -> R.drawable.ic_round_star_graph_24
|
||||
Anilist.sortBy[3] -> R.drawable.ic_round_filter_list_24
|
||||
Anilist.sortBy[4] -> R.drawable.ic_round_filter_list_24_reverse
|
||||
Anilist.sortBy[5] -> R.drawable.ic_round_assist_walker_24
|
||||
Anilist.sortBy[3] -> R.drawable.ic_round_new_releases_24
|
||||
Anilist.sortBy[4] -> R.drawable.ic_round_filter_list_24
|
||||
Anilist.sortBy[5] -> R.drawable.ic_round_filter_list_24_reverse
|
||||
Anilist.sortBy[6] -> R.drawable.ic_round_assist_walker_24
|
||||
else -> R.drawable.ic_round_filter_alt_24
|
||||
}
|
||||
binding.sortByFilter.setImageResource(filterDrawable)
|
||||
@@ -167,20 +168,26 @@ class SearchFilterBottomDialog : BottomSheetDialogFragment() {
|
||||
startBounceZoomAnimation()
|
||||
}
|
||||
|
||||
R.id.sort_by_a_z -> {
|
||||
R.id.sort_by_recent -> {
|
||||
activity.result.sort = Anilist.sortBy[3]
|
||||
binding.sortByFilter.setImageResource(R.drawable.ic_round_new_releases_24)
|
||||
startBounceZoomAnimation()
|
||||
}
|
||||
|
||||
R.id.sort_by_a_z -> {
|
||||
activity.result.sort = Anilist.sortBy[4]
|
||||
binding.sortByFilter.setImageResource(R.drawable.ic_round_filter_list_24)
|
||||
startBounceZoomAnimation()
|
||||
}
|
||||
|
||||
R.id.sort_by_z_a -> {
|
||||
activity.result.sort = Anilist.sortBy[4]
|
||||
activity.result.sort = Anilist.sortBy[5]
|
||||
binding.sortByFilter.setImageResource(R.drawable.ic_round_filter_list_24_reverse)
|
||||
startBounceZoomAnimation()
|
||||
}
|
||||
|
||||
R.id.sort_by_pure_pain -> {
|
||||
activity.result.sort = Anilist.sortBy[5]
|
||||
activity.result.sort = Anilist.sortBy[6]
|
||||
binding.sortByFilter.setImageResource(R.drawable.ic_round_assist_walker_24)
|
||||
startBounceZoomAnimation()
|
||||
}
|
||||
|
||||
@@ -9,6 +9,9 @@
|
||||
<item
|
||||
android:id="@+id/sort_by_trending"
|
||||
android:title="Trending" />
|
||||
<item
|
||||
android:id="@+id/sort_by_recent"
|
||||
android:title="New Releases" />
|
||||
<item
|
||||
android:id="@+id/sort_by_a_z"
|
||||
android:title="A-Z" />
|
||||
|
||||
@@ -462,6 +462,7 @@
|
||||
<item>Score</item>
|
||||
<item>Popular</item>
|
||||
<item>Trending</item>
|
||||
<item>New Releases</item>
|
||||
<item>A-Z</item>
|
||||
<item>Z-A</item>
|
||||
<item>Pure pain</item>
|
||||
|
||||
Reference in New Issue
Block a user