feat: voiceActors (not info for now)

This commit is contained in:
aayush262 2024-04-05 01:09:56 +05:30
parent e0df092a70
commit dec4996760
8 changed files with 59 additions and 9 deletions

View file

@ -72,7 +72,7 @@ class AnilistQueries {
media.cameFromContinue = false media.cameFromContinue = false
val query = val query =
"""{Media(id:${media.id}){id favourites popularity mediaListEntry{id status score(format:POINT_100)progress private notes repeat customLists updatedAt startedAt{year month day}completedAt{year month day}}isFavourite siteUrl idMal nextAiringEpisode{episode airingAt}source countryOfOrigin format duration season seasonYear startDate{year month day}endDate{year month day}genres studios(isMain:true){nodes{id name siteUrl}}description trailer{site id}synonyms tags{name rank isMediaSpoiler}characters(sort:[ROLE,FAVOURITES_DESC],perPage:25,page:1){edges{role node{id image{medium}name{userPreferred}isFavourite}}}relations{edges{relationType(version:2)node{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}popularity meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}staffPreview:staff(perPage:8,sort:[RELEVANCE,ID]){edges{role node{id image{large medium}name{userPreferred}}}}recommendations(sort:RATING_DESC){nodes{mediaRecommendation{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}externalLinks{url site}}}""" """{Media(id:${media.id}){id favourites popularity mediaListEntry{id status score(format:POINT_100)progress private notes repeat customLists updatedAt startedAt{year month day}completedAt{year month day}}isFavourite siteUrl idMal nextAiringEpisode{episode airingAt}source countryOfOrigin format duration season seasonYear startDate{year month day}endDate{year month day}genres studios(isMain:true){nodes{id name siteUrl}}description trailer{site id}synonyms tags{name rank isMediaSpoiler}characters(sort:[ROLE,FAVOURITES_DESC],perPage:25,page:1){edges{role voiceActors { id name { first middle last full native userPreferred } image { large medium } languageV2 } node{id image{medium}name{userPreferred}isFavourite}}}relations{edges{relationType(version:2)node{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}popularity meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}staffPreview:staff(perPage:8,sort:[RELEVANCE,ID]){edges{role node{id image{large medium}name{userPreferred}}}}recommendations(sort:RATING_DESC){nodes{mediaRecommendation{id idMal mediaListEntry{progress private score(format:POINT_100)status}episodes chapters nextAiringEpisode{episode}meanScore isAdult isFavourite format title{english romaji userPreferred}type status(version:2)bannerImage coverImage{large}}}}externalLinks{url site}}}"""
runBlocking { runBlocking {
val anilist = async { val anilist = async {
var response = executeQuery<Query.Media>(query, force = true, show = true) var response = executeQuery<Query.Media>(query, force = true, show = true)
@ -139,7 +139,15 @@ class AnilistQueries {
?: "SUPPORTING" ?: "SUPPORTING"
else -> i.role.toString() else -> i.role.toString()
} },
voiceActor = i.voiceActors?.map {
Author(
id = it.id,
name = it.name?.userPreferred,
image = it.image?.medium,
role = it.languageV2
)
} as ArrayList<Author>
) )
) )
} }

View file

@ -72,7 +72,7 @@ data class CharacterEdge(
@SerialName("name") var name: String?, @SerialName("name") var name: String?,
// The voice actors of the character // The voice actors of the character
// @SerialName("voiceActors") var voiceActors: List<Staff>?, @SerialName("voiceActors") var voiceActors: List<Staff>?,
// The voice actors of the character with role date // The voice actors of the character with role date
// @SerialName("voiceActorRoles") var voiceActorRoles: List<StaffRoleType>?, // @SerialName("voiceActorRoles") var voiceActorRoles: List<StaffRoleType>?,

View file

@ -1,6 +1,8 @@
package ani.dantotsu.media package ani.dantotsu.media
import ani.dantotsu.connections.anilist.api.FuzzyDate import ani.dantotsu.connections.anilist.api.FuzzyDate
import ani.dantotsu.connections.anilist.api.Query
import org.checkerframework.checker.units.qual.A
import java.io.Serializable import java.io.Serializable
data class Character( data class Character(
@ -14,5 +16,6 @@ data class Character(
var age: String? = null, var age: String? = null,
var gender: String? = null, var gender: String? = null,
var dateOfBirth: FuzzyDate? = null, var dateOfBirth: FuzzyDate? = null,
var roles: ArrayList<Media>? = null var roles: ArrayList<Media>? = null,
val voiceActor: ArrayList<Author>? = null,
) : Serializable ) : Serializable

View file

@ -28,6 +28,7 @@ class CharacterAdapter(
setAnimation(binding.root.context, holder.binding.root) setAnimation(binding.root.context, holder.binding.root)
val character = characterList[position] val character = characterList[position]
val whitespace = "${character.role} " val whitespace = "${character.role} "
character.voiceActor
binding.itemCompactRelation.text = whitespace binding.itemCompactRelation.text = whitespace
binding.itemCompactImage.loadImage(character.image) binding.itemCompactImage.loadImage(character.image)
binding.itemCompactTitle.text = character.name binding.itemCompactTitle.text = character.name

View file

@ -3,6 +3,7 @@ package ani.dantotsu.media
import android.app.Activity import android.app.Activity
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.ViewGroup import android.view.ViewGroup
import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import ani.dantotsu.R import ani.dantotsu.R
import ani.dantotsu.currActivity import ani.dantotsu.currActivity
@ -36,7 +37,10 @@ class CharacterDetailsAdapter(private val character: Character, private val acti
val markWon = Markwon.builder(activity).usePlugin(SoftBreakAddsNewLinePlugin.create()) val markWon = Markwon.builder(activity).usePlugin(SoftBreakAddsNewLinePlugin.create())
.usePlugin(SpoilerPlugin()).build() .usePlugin(SpoilerPlugin()).build()
markWon.setMarkdown(binding.characterDesc, desc.replace("~!", "||").replace("!~", "||")) markWon.setMarkdown(binding.characterDesc, desc.replace("~!", "||").replace("!~", "||"))
binding.voiceActorRecycler.adapter = AuthorAdapter(character.voiceActor ?: arrayListOf())
binding.voiceActorRecycler.layoutManager = LinearLayoutManager(
activity, LinearLayoutManager.HORIZONTAL, false
)
} }
override fun getItemCount(): Int = 1 override fun getItemCount(): Int = 1

View file

@ -64,8 +64,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:alpha="0.58" android:alpha="0.58"
android:ellipsize="end" android:ellipsize="start"
android:includeFontPadding="false"
android:singleLine="true" android:singleLine="true"
android:textAlignment="textEnd" android:textAlignment="textEnd"
android:textAllCaps="true" android:textAllCaps="true"

View file

@ -22,15 +22,49 @@
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:alpha="0.58" android:alpha="0.58"
tools:maxLines="10"
tools:ignore="TextContrastCheck" tools:ignore="TextContrastCheck"
tools:text="@tools:sample/lorem/random" /> tools:text="@tools:sample/lorem/random" />
<LinearLayout
android:id="@+id/voiceActorContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp"
android:fontFamily="@font/poppins_bold"
android:padding="8dp"
android:text="@string/voice_actors"
android:textSize="18sp" />
<ani.dantotsu.FadingEdgeRecyclerView
android:id="@+id/voiceActorRecycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:clipToPadding="false"
android:nestedScrollingEnabled="true"
android:paddingStart="20dp"
android:paddingEnd="20dp"
android:requiresFadingEdge="horizontal"
tools:itemCount="4"
tools:layoutManager="androidx.recyclerview.widget.GridLayoutManager"
tools:listitem="@layout/item_media_compact"
tools:orientation="horizontal" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="32dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="32dp" android:layout_marginEnd="32dp"
android:fontFamily="@font/poppins_bold" android:fontFamily="@font/poppins_bold"
android:padding="8dp"
android:text="@string/roles" android:text="@string/roles"
android:textSize="16sp" /> android:textSize="18sp" />
</LinearLayout>
</LinearLayout> </LinearLayout>

View file

@ -885,4 +885,5 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
<string name="download_location_msg">Are you sure you want to change the download location?\nOld downloads may no longer be accessible.</string> <string name="download_location_msg">Are you sure you want to change the download location?\nOld downloads may no longer be accessible.</string>
<string name="report">Report</string> <string name="report">Report</string>
<string name="ban">Ban</string> <string name="ban">Ban</string>
<string name="voice_actors">Voice Actors</string>
</resources> </resources>