Skip to content
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.

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

Using muted federated names. #1368

Merged
merged 13 commits into from
Feb 12, 2024
Prev Previous commit
Next Next commit
A few simplifications.
dessalines committed Feb 10, 2024
commit b3f8087ceb1f27ff6735f3186d585f4b9e9e19dd
4 changes: 2 additions & 2 deletions app/src/main/java/com/jerboa/Utils.kt
Original file line number Diff line number Diff line change
@@ -458,10 +458,10 @@ fun personNameShown(
person: Person,
federatedName: Boolean = false,
): String {
val name = person.getDisplayName()
return if (!federatedName) {
person.getDisplayName()
name
} else {
val name = person.getDisplayName()
if (person.local) {
name
} else {
Original file line number Diff line number Diff line change
@@ -37,11 +37,9 @@ import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import com.jerboa.R
import com.jerboa.datatypes.data
import com.jerboa.datatypes.getDisplayName
import com.jerboa.datatypes.samplePersonView
import com.jerboa.feat.openMatrix
import com.jerboa.ui.components.common.DotSpacer
import com.jerboa.ui.components.common.ItemAndInstanceTitle
import com.jerboa.ui.components.common.LargerCircularIcon
import com.jerboa.ui.components.common.MenuItem
import com.jerboa.ui.components.common.MyMarkdownText
@@ -98,11 +96,8 @@ fun PersonProfileTopSection(
modifier = Modifier.padding(MEDIUM_PADDING),
verticalArrangement = Arrangement.spacedBy(MEDIUM_PADDING),
) {
ItemAndInstanceTitle(
title = personView.person.getDisplayName(),
actorId = personView.person.actor_id,
local = personView.person.local,
color = MaterialTheme.colorScheme.tertiary,
PersonName(
person = personView.person,
style = MaterialTheme.typography.titleLarge,
)

Original file line number Diff line number Diff line change
@@ -12,6 +12,7 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.tooling.preview.Preview
import com.jerboa.R
import com.jerboa.datatypes.getDisplayName
@@ -28,9 +29,9 @@ import it.vercruysse.lemmyapi.v0x19.datatypes.PersonId
fun PersonName(
person: Person,
color: Color = MaterialTheme.colorScheme.tertiary,
style: TextStyle = MaterialTheme.typography.bodyMedium,
isPostCreator: Boolean = false,
) {
val style = MaterialTheme.typography.bodyMedium
val name = person.getDisplayName()

if (isPostCreator) {