Skip to content

Fix showing "null" for no career start/end dates #802

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
damontecres merged 1 commit into from
Jun 24, 2026
Merged

Fix showing "null" for no career start/end dates #802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions app/src/main/java/com/github/damontecres/stashapp/PerformerDetailsFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import com.github.damontecres.stashapp.util.StashCoroutineExceptionHandler
import com.github.damontecres.stashapp.util.StashGlide
import com.github.damontecres.stashapp.util.ageInYears
import com.github.damontecres.stashapp.util.showSetRatingToast
import com.github.damontecres.stashapp.views.careerString
import com.github.damontecres.stashapp.views.models.PerformerViewModel
import com.github.damontecres.stashapp.views.parseTimeToString
import kotlinx.coroutines.launch
Expand Down Expand Up @@ -119,10 +120,9 @@ class PerformerDetailsFragment : DetailsFragment() {

addRow(R.string.stashapp_tattoos, perf.tattoos)
addRow(R.string.stashapp_piercings, perf.piercings)
addRow(
R.string.stashapp_career_length,
listOf(perf.career_start, perf.career_end).joinToString(" - "),
)
perf.careerString?.let {
addRow(R.string.stashapp_career_length, it)
}
addRow(R.string.stashapp_created_at, parseTimeToString(perf.created_at))
addRow(R.string.stashapp_updated_at, parseTimeToString(perf.updated_at))

Expand Down
12 changes: 4 additions & 8 deletions .../main/java/com/github/damontecres/stashapp/ui/components/main/MainPagePerformerDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.runtime.Composable
import androidx.compose.runtime.remember
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.alpha
Expand All @@ -32,6 +31,7 @@ import com.github.damontecres.stashapp.ui.components.TitleValueText
import com.github.damontecres.stashapp.util.isNotNullOrBlank
import com.github.damontecres.stashapp.util.listOfNotNullOrBlank
import com.github.damontecres.stashapp.util.yearsBetween
import com.github.damontecres.stashapp.views.careerString
import kotlin.math.floor
import kotlin.math.round
import kotlin.math.roundToInt
Expand Down Expand Up @@ -167,15 +167,11 @@ fun MainPagePerformerDetails(
modifier = Modifier.widthIn(max = 64.dp),
)
}
if (perf.career_start.isNotNullOrBlank()) {
val career = perf.careerString
career?.let {
TitleValueText(
stringResource(R.string.stashapp_career_length),
remember(perf) {
listOf(
perf.career_start,
perf.career_end,
).joinToString(" - ")
},
it,
)
}
if (perf.penis_length != null) {
Expand Down
15 changes: 8 additions & 7 deletions app/src/main/java/com/github/damontecres/stashapp/ui/pages/PerformerPage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ import com.github.damontecres.stashapp.util.ageInYears
import com.github.damontecres.stashapp.util.getUiTabs
import com.github.damontecres.stashapp.util.isNotNullOrBlank
import com.github.damontecres.stashapp.util.showSetRatingToast
import com.github.damontecres.stashapp.views.careerString
import kotlinx.coroutines.launch
import kotlin.math.floor
import kotlin.math.round
Expand Down Expand Up @@ -556,6 +557,13 @@ fun PerformerDetails(
}
}
add(TableRow.from(context, R.string.stashapp_death_date, perf.death_date))
add(
TableRow.from(
context,
R.string.stashapp_career_length,
perf.careerString,
),
)
add(
TableRow.from(context, R.string.stashapp_country, perf.country) {
navigateTo(
Expand Down Expand Up @@ -637,13 +645,6 @@ fun PerformerDetails(
add(TableRow.from(context, R.string.stashapp_tattoos, perf.tattoos))
add(TableRow.from(context, R.string.stashapp_piercings, perf.piercings))
}
add(
TableRow.from(
context,
R.string.stashapp_career_length,
listOf(perf.career_start, perf.career_end).joinToString(" - "),
),
)
}.filterNotNull()
}
ItemDetails(
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/com/github/damontecres/stashapp/views/Formatting.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import com.github.damontecres.stashapp.R
import com.github.damontecres.stashapp.StashApplication
import com.github.damontecres.stashapp.api.fragment.FullMarkerData
import com.github.damontecres.stashapp.api.fragment.MarkerData
import com.github.damontecres.stashapp.api.fragment.PerformerData
import com.github.damontecres.stashapp.api.type.CircumcisedEnum
import com.github.damontecres.stashapp.api.type.CriterionModifier
import com.github.damontecres.stashapp.util.StashServer
Expand Down Expand Up @@ -200,3 +201,12 @@ val MarkerData.formatSeconds: String
} else {
seconds.toInt().seconds.toString()
}

val PerformerData.careerString: String?
get() =
when {
career_start != null && career_end != null -> "$career_start - $career_end"
career_start != null -> "$career_start - "
career_end != null -> "- $career_end"
else -> null
}
Loading