From 103be31a43b4d85c4cfdebea96233373fbb725ea Mon Sep 17 00:00:00 2001 From: rebelonion <87634197+rebelonion@users.noreply.github.com> Date: Fri, 1 Mar 2024 18:15:09 -0600 Subject: [PATCH] fix: separate nullable statistics class --- .../dantotsu/connections/anilist/api/Data.kt | 20 ++++++++++++++++++- .../dantotsu/connections/anilist/api/User.kt | 18 ++++++++--------- 2 files changed, 28 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt b/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt index 25050fbf..361c68c7 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/Data.kt @@ -208,12 +208,30 @@ class Query { @SerialName("favorites") val favorites: UserFavorites?, @SerialName("statistics") - val statistics: UserStatisticTypes, + val statistics: NNUserStatisticTypes, @SerialName("siteUrl") val siteUrl: String, ) @Serializable + data class NNUserStatisticTypes( + @SerialName("anime") var anime: NNUserStatistics, + @SerialName("manga") var manga: NNUserStatistics + ) + + @Serializable + data class NNUserStatistics( + // + @SerialName("count") var count: Int, + @SerialName("meanScore") var meanScore: Float, + @SerialName("standardDeviation") var standardDeviation: Float, + @SerialName("minutesWatched") var minutesWatched: Int, + @SerialName("episodesWatched") var episodesWatched: Int, + @SerialName("chaptersRead") var chaptersRead: Int, + @SerialName("volumesRead") var volumesRead: Int, + ) + + @Serializable data class UserFavorites( @SerialName("anime") val anime: UserMediaFavoritesCollection, diff --git a/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt b/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt index 5e82d028..dddef0d5 100644 --- a/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt +++ b/app/src/main/java/ani/dantotsu/connections/anilist/api/User.kt @@ -115,20 +115,20 @@ data class UserAvatar( @Serializable data class UserStatisticTypes( - @SerialName("anime") var anime: UserStatistics, - @SerialName("manga") var manga: UserStatistics + @SerialName("anime") var anime: UserStatistics?, + @SerialName("manga") var manga: UserStatistics? ) @Serializable data class UserStatistics( // - @SerialName("count") var count: Int, - @SerialName("meanScore") var meanScore: Float, - @SerialName("standardDeviation") var standardDeviation: Float, - @SerialName("minutesWatched") var minutesWatched: Int, - @SerialName("episodesWatched") var episodesWatched: Int, - @SerialName("chaptersRead") var chaptersRead: Int, - @SerialName("volumesRead") var volumesRead: Int, + @SerialName("count") var count: Int?, + @SerialName("meanScore") var meanScore: Float?, + @SerialName("standardDeviation") var standardDeviation: Float?, + @SerialName("minutesWatched") var minutesWatched: Int?, + @SerialName("episodesWatched") var episodesWatched: Int?, + @SerialName("chaptersRead") var chaptersRead: Int?, + @SerialName("volumesRead") var volumesRead: Int?, // @SerialName("formats") var formats: List?, // @SerialName("statuses") var statuses: List?, // @SerialName("scores") var scores: List?,