Skip to content

Profile Screen -> Media Tabs -> Episode/Chapter Progress #739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imashnake0 merged 8 commits into from
Jul 29, 2026
Merged

Profile Screen -> Media Tabs -> Episode/Chapter Progress #739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
bb211b5
add progress indicator
imashnake0 Jul 29, 2026
db7057f
adjust width and alpha
imashnake0 Jul 29, 2026
480f736
update ui
imashnake0 Jul 29, 2026
70c1398
slow down wave
imashnake0 Jul 29, 2026
92c745d
fallback to next airing episode
imashnake0 Jul 29, 2026
2ede8ce
support manga
imashnake0 Jul 29, 2026
47273a0
remove ep/s for media
imashnake0 Jul 29, 2026
b411141
use segments fallback for manga
imashnake0 Jul 29, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions api/anilist/src/main/graphql/fragments/MediaTracking.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,8 @@ fragment MediaTracking on Media {
seasonYear
format
episodes
chapters
nextAiringEpisode {
episode
}
}
1 change: 1 addition & 0 deletions api/anilist/src/main/graphql/queries/UserQuery.graphql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ query UserMediaListQuery($userId: Int, $type: MediaType) {
lists {
name
entries {
progress
score(format: POINT_10_DECIMAL)
media {
...MediaTracking
Expand Down
7 changes: 5 additions & 2 deletions api/anilist/src/main/kotlin/com/imashnake/animite/api/anilist/sanitize/media/Media.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -725,11 +725,13 @@
val season: Season?,
val seasonYear: Int?,
val format: Format?,
val episodes: Int?,
val segments: Int?,

Check warning

Code scanning / detekt

Public properties require documentation. Warning

The property segments is missing documentation.
val progress: Int?,

Check warning

Code scanning / detekt

Public properties require documentation. Warning

The property progress is missing documentation.
val score: Score?,
) {
internal constructor(
query: MediaTracking,
progress: Int?,
score: Float?,
language: Language
) : this(
Expand All @@ -744,7 +746,8 @@
season = query.season?.sanitize(),
seasonYear = query.seasonYear,
format = query.format?.sanitize(),
episodes = query.episodes,
segments = query.episodes ?: query.nextAiringEpisode?.episode ?: query.chapters,
progress = progress,
score = score?.let { Score(it) }
)
}
Expand Down
1 change: 1 addition & 0 deletions api/anilist/src/main/kotlin/com/imashnake/animite/api/anilist/sanitize/profile/Viewer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,7 @@ data class User(
list = query.entries.orEmpty().mapNotNull {
Media.Tracking(
query = it?.media?.mediaTracking ?: return@mapNotNull null,
progress = it.progress,
score = it.score?.toFloat(),
language = language
)
Expand Down
123 changes: 80 additions & 43 deletions profile/src/main/kotlin/com/imashnake/animite/profile/ui/MediaTrackingList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
Expand All @@ -24,6 +25,8 @@
import androidx.compose.material.icons.rounded.Check
import androidx.compose.material3.ExperimentalMaterial3ExpressiveApi
import androidx.compose.material3.Icon
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.LinearWavyProgressIndicator
import androidx.compose.material3.MaterialShapes
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
Expand All @@ -39,13 +42,13 @@
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.graphicsLayer
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.hapticfeedback.HapticFeedbackType
import androidx.compose.ui.hapticfeedback.HapticFeedbackType.Companion.ToggleOff
import androidx.compose.ui.hapticfeedback.HapticFeedbackType.Companion.ToggleOn
import androidx.compose.ui.platform.LocalHapticFeedback
import androidx.compose.ui.res.dimensionResource
import androidx.compose.ui.res.pluralStringResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.res.vectorResource
import androidx.compose.ui.text.font.FontWeight
Expand Down Expand Up @@ -141,6 +144,7 @@
.background(MaterialTheme.colorScheme.background)
)
MediaTrackingItem(
listName = namedList.name.sanitize(),
item = namedList.list[it],
onClick = { id, title ->
onNavigateToMediaItem(
Expand Down Expand Up @@ -352,6 +356,7 @@
@OptIn(ExperimentalMaterial3ExpressiveApi::class)
@Composable
private fun MediaTrackingItem(
listName: User.ListNames,
item: Media.Tracking,
onClick: (Int, String?) -> Unit,
modifier: Modifier = Modifier
Expand All @@ -367,61 +372,93 @@
)

Column(
Modifier.padding(
horizontal = LocalPaddings.current.large / 2,
vertical = LocalPaddings.current.small
)
verticalArrangement = Arrangement.SpaceBetween,
modifier = Modifier
.fillMaxHeight()
.padding(
start = LocalPaddings.current.large / 2,
end = LocalPaddings.current.large / 2,
top = LocalPaddings.current.small
)
) {
Text(
text = item.title.orEmpty(),
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.bodyMedium,
maxLines = 1
)
Column(verticalArrangement = Arrangement.spacedBy(LocalPaddings.current.tiny)) {
Text(
text = item.title.orEmpty(),
color = MaterialTheme.colorScheme.onBackground,
style = MaterialTheme.typography.bodyMedium,
maxLines = 1
)

Spacer(Modifier.size(LocalPaddings.current.medium))
Row(verticalAlignment = Alignment.CenterVertically) {
item.format?.let {
Text(
text = stringResource(it.res),
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.labelSmall,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
}

Row(verticalAlignment = Alignment.CenterVertically) {
item.format?.let {
Text(
text = stringResource(it.res),
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.labelSmall,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)
}
if (item.season != null && item.format != null) {
Divider(shape = MaterialShapes.Triangle.toShape())
}

if (item.season != null && item.format != null) {
Divider(shape = MaterialShapes.Triangle.toShape())
item.season?.let {
Text(
text = stringResource(it.res) +
" ${item.seasonYear?.toString().orEmpty()}",
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.labelSmall,
maxLines = 1
)
}
}
}

item.season?.let {
Text(
text = stringResource(it.res) +
" ${item.seasonYear?.toString().orEmpty()}",
color = MaterialTheme.colorScheme.onSurfaceVariant,
style = MaterialTheme.typography.labelSmall,
maxLines = 1
)
}
val progress = item.progress
val segments = item.segments ?: if (progress == 0) 1 else progress

if (item.episodes != null && item.season != null) {
Divider(shape = MaterialShapes.Triangle.toShape())
}
if (segments != null && progress != null) {
val formattedProgress = progress
.takeUnless { listName == User.ListNames.COMPLETED }
?.let { "$it/$segments" }
?: "$segments"

item.episodes?.let {
Row(
horizontalArrangement = Arrangement.spacedBy(LocalPaddings.current.small),
verticalAlignment = Alignment.CenterVertically
) {
Text(
text = pluralStringResource(
id = R.plurals.ep_count,
count = it,
formatArgs = arrayOf(it)
),
color = MaterialTheme.colorScheme.onSurfaceVariant,
text = formattedProgress,
color = MaterialTheme.colorScheme.primary.copy(alpha = 0.7f),
style = MaterialTheme.typography.labelSmall,
maxLines = 1,
overflow = TextOverflow.Ellipsis
)

when (listName) {

Check warning

Code scanning / detekt

Braces do not comply with the specified policy Warning

Inconsistent braces, make sure all branches either have or don't have braces.
User.ListNames.WATCHING,
User.ListNames.REWATCHING,
User.ListNames.READING,
User.ListNames.REREADING -> {
LinearWavyProgressIndicator(
progress = { progress.toFloat() / segments },
amplitude = { progress ->
if (progress <= 0.1f || progress >= 0.95f) 0f else 0.5f
},
waveSpeed = 15.dp,
modifier = Modifier
.fillMaxWidth()
.graphicsLayer { alpha = 0.5f }

Check warning

Code scanning / detekt

Report magic numbers. Magic number is a numeric literal that is not defined as a constant and hence it's unclear what the purpose of this number is. It's better to declare such numbers as constants and give them a proper name. By default, -1, 0, 1, and 2 are not considered to be magic numbers. Warning

This expression contains a magic number. Consider defining it to a well named constant.
)
}

else -> LinearProgressIndicator(
progress = { progress.toFloat() / segments },
modifier = Modifier.fillMaxWidth().graphicsLayer { alpha = 0.5f }

Check warning

Code scanning / detekt

Report magic numbers. Magic number is a numeric literal that is not defined as a constant and hence it's unclear what the purpose of this number is. It's better to declare such numbers as constants and give them a proper name. By default, -1, 0, 1, and 2 are not considered to be magic numbers. Warning

This expression contains a magic number. Consider defining it to a well named constant.
)
}
}
}
}
Expand Down
Loading