Merge remote-tracking branch 'origin/dev' into dev

app/src/main/java/ani/dantotsu/connections/anilist/Anilist.kt

@@ -41,20 +41,54 @@ object Anilist {
         "SCORE_DESC",
         "POPULARITY_DESC",
         "TRENDING_DESC",
+        "START_DATE_DESC",
         "TITLE_ENGLISH",
         "TITLE_ENGLISH_DESC",
         "SCORE"
     )
 
+    val source = listOf(
+        "ORIGINAL",
+        "MANGA",
+        "LIGHT NOVEL",
+        "VISUAL NOVEL",
+        "VIDEO GAME",
+        "OTHER",
+        "NOVEL",
+        "DOUJINSHI",
+        "ANIME",
+        "WEB NOVEL",
+        "LIVE ACTION",
+        "GAME",
+        "COMIC",
+        "MULTIMEDIA PROJECT",
+        "PICTURE BOOK"
+    )
+
+    val animeStatus = listOf(
+        "FINISHED",
+        "RELEASING",
+        "NOT YET RELEASED",
+        "CANCELLED"
+    )
+
+    val mangaStatus = listOf(
+        "FINISHED",
+        "RELEASING",
+        "NOT YET RELEASED",
+        "HIATUS",
+        "CANCELLED"
+    )
+
     val seasons = listOf(
         "WINTER", "SPRING", "SUMMER", "FALL"
     )
 
-    val anime_formats = listOf(
+    val animeFormats = listOf(
         "TV", "TV SHORT", "MOVIE", "SPECIAL", "OVA", "ONA", "MUSIC"
     )
 
-    val manga_formats = listOf(
+    val mangaFormats = listOf(
         "MANGA", "NOVEL", "ONE SHOT"
     )
 

app/src/main/java/ani/dantotsu/connections/anilist/AnilistQueries.kt

@@ -885,11 +885,15 @@ class AnilistQueries {
         sort: String? = null,
         genres: MutableList<String>? = null,
         tags: MutableList<String>? = null,
+        status: String? = null,
+        source: String? = null,
         format: String? = null,
+        countryOfOrigin: String? = null,
         isAdult: Boolean = false,
         onList: Boolean? = null,
         excludedGenres: MutableList<String>? = null,
         excludedTags: MutableList<String>? = null,
+        startYear: Int? = null,
         seasonYear: Int? = null,
         season: String? = null,
         id: Int? = null,
@@ -897,7 +901,7 @@ class AnilistQueries {
         adultOnly: 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
@@ -946,11 +950,15 @@ query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult:
             ${if (onList != null) ""","onList":$onList""" else ""}
             ${if (page != null) ""","page":"$page"""" else ""}
             ${if (id != null) ""","id":"$id"""" else ""}
-            ${if (seasonYear != null) ""","seasonYear":"$seasonYear"""" else ""}
+            ${if (type == "ANIME" && seasonYear != null) ""","seasonYear":"$seasonYear"""" else ""}
+            ${if (type == "MANGA" && startYear != null) ""","yearGreater":${startYear}0000,"yearLesser":${startYear + 1}0000""" else ""}
             ${if (season != null) ""","season":"$season"""" else ""}
             ${if (search != null) ""","search":"$search"""" else ""}
+            ${if (source != null) ""","source":"$source"""" else ""}
             ${if (sort != null) ""","sort":"$sort"""" else ""}
+            ${if (status != null) ""","status":"$status"""" else ""}
             ${if (format != null) ""","format":"${format.replace(" ", "_")}"""" else ""}
+            ${if (countryOfOrigin != null) ""","countryOfOrigin":"$countryOfOrigin"""" else ""}
             ${if (genres?.isNotEmpty() == true) ""","genres":[${genres.joinToString { "\"$it\"" }}]""" else ""}
             ${
             if (excludedGenres?.isNotEmpty() == true)
@@ -982,7 +990,6 @@ query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult:
             else ""
         }
             }""".replace("\n", " ").replace("""  """, "")
-
         val response = executeQuery<Query.Page>(query, variables, true)?.data?.page
         if (response?.media != null) {
             val responseArray = arrayListOf<Media>()
@@ -1014,7 +1021,11 @@ query (${"$"}page: Int = 1, ${"$"}id: Int, ${"$"}type: MediaType, ${"$"}isAdult:
                 excludedGenres = excludedGenres,
                 tags = tags,
                 excludedTags = excludedTags,
+                status = status,
+                source = source,
                 format = format,
+                countryOfOrigin = countryOfOrigin,
+                startYear = startYear,
                 seasonYear = seasonYear,
                 season = season,
                 results = responseArray,

app/src/main/java/ani/dantotsu/connections/anilist/AnilistViewModel.kt

@@ -176,7 +176,10 @@ class AnilistAnimeViewModel : ViewModel() {
             r.sort,
             r.genres,
             r.tags,
+            r.status,
+            r.source,
             r.format,
+            r.countryOfOrigin,
             r.isAdult,
             r.onList,
             adultOnly = PrefManager.getVal(PrefName.AdultOnly),
@@ -281,11 +284,15 @@ class AnilistMangaViewModel : ViewModel() {
             r.sort,
             r.genres,
             r.tags,
+            r.status,
+            r.source,
             r.format,
+            r.countryOfOrigin,
             r.isAdult,
             r.onList,
             r.excludedGenres,
             r.excludedTags,
+            r.startYear,
             r.seasonYear,
             r.season,
             adultOnly = PrefManager.getVal(PrefName.AdultOnly)
@@ -342,11 +349,15 @@ class AnilistSearch : ViewModel() {
             r.sort,
             r.genres,
             r.tags,
+            r.status,
+            r.source,
             r.format,
+            r.countryOfOrigin,
             r.isAdult,
             r.onList,
             r.excludedGenres,
             r.excludedTags,
+            r.startYear,
             r.seasonYear,
             r.season,
         )
@@ -361,11 +372,15 @@ class AnilistSearch : ViewModel() {
             r.sort,
             r.genres,
             r.tags,
+            r.status,
+            r.source,
             r.format,
+            r.countryOfOrigin,
             r.isAdult,
             r.onList,
             r.excludedGenres,
             r.excludedTags,
+            r.startYear,
             r.seasonYear,
             r.season
         )

app/src/main/java/ani/dantotsu/connections/anilist/SearchResults.kt

@@ -11,13 +11,17 @@ data class SearchResults(
     var onList: Boolean? = null,
     var perPage: Int? = null,
     var search: String? = null,
+    var countryOfOrigin :String? = null,
     var sort: String? = null,
     var genres: MutableList<String>? = null,
     var excludedGenres: MutableList<String>? = null,
     var tags: MutableList<String>? = null,
     var excludedTags: MutableList<String>? = null,
+    var status: String? = null,
+    var source: String? = null,
     var format: String? = null,
     var seasonYear: Int? = null,
+    var startYear: Int? = null,
     var season: String? = null,
     var page: Int = 1,
     var results: MutableList<Media>,
@@ -37,12 +41,24 @@ data class SearchResults(
                 )
             )
         }
+        status?.let {
+            list.add(SearchChip("STATUS", currContext()!!.getString(R.string.filter_status, it)))
+        }
+        source?.let {
+            list.add(SearchChip("SOURCE", currContext()!!.getString(R.string.filter_source, it)))
+        }
         format?.let {
             list.add(SearchChip("FORMAT", currContext()!!.getString(R.string.filter_format, it)))
         }
+        countryOfOrigin?.let {
+            list.add(SearchChip("COUNTRY", currContext()!!.getString(R.string.filter_country, it)))
+        }
         season?.let {
             list.add(SearchChip("SEASON", it))
         }
+        startYear?.let {
+            list.add(SearchChip("START_YEAR", it.toString()))
+        }
         seasonYear?.let {
             list.add(SearchChip("SEASON_YEAR", it.toString()))
         }
@@ -74,8 +90,12 @@ data class SearchResults(
     fun removeChip(chip: SearchChip) {
         when (chip.type) {
             "SORT" -> sort = null
+            "STATUS" -> status = null
+            "SOURCE" -> source = null
             "FORMAT" -> format = null
+            "COUNTRY" -> countryOfOrigin = null
             "SEASON" -> season = null
+            "START_YEAR" -> startYear = null
             "SEASON_YEAR" -> seasonYear = null
             "GENRE" -> genres?.remove(chip.text)
             "EXCLUDED_GENRE" -> excludedGenres?.remove(chip.text)