Using muted federated names. (#1368)

* Using muted federated names. - Also replaces overflowing text with simple marquees. - Fixes #1364 * A few simplifications. * A few updates. * Remove material1 LocalContentColor. (#1366) * Fixing comment bottom margin. Fixes #1365 (#1367) * Switch blurNSFW and postActionBarMode to use enums. (#1369) - Fixed some naming. - Also cleaned up imports. - Fixes #1352 * Dont show comment content when its deleted or removed. (#1371) - Fixes #1335 * Use medium padding. * A few more fixes. * A few more fixes. * Addressing comments
LemmyNet · Feb 12, 2024 · 8c9c615 · 8c9c615
1 parent 818f008
commit 8c9c615
Show file tree

Hide file tree

Showing 21 changed files with 231 additions and 116 deletions.
diff --git a/app/src/main/java/com/jerboa/Constants.kt b/app/src/main/java/com/jerboa/Constants.kt
@@ -3,3 +3,4 @@ package com.jerboa
 const val DEBOUNCE_DELAY = 1000L
 const val MAX_POST_TITLE_LENGTH = 200
 const val DEFAULT_FONT_SIZE = 16
+const val INSTANCE_FONT_SIZE = 9
diff --git a/app/src/main/java/com/jerboa/MainActivity.kt b/app/src/main/java/com/jerboa/MainActivity.kt
@@ -382,6 +382,7 @@ class MainActivity : AppCompatActivity() {
                             blurNSFW = appSettings.blurNSFW.toEnum(),
                             drawerState = drawerState,
                             followList = siteViewModel.getFollowList(),
+                            showAvatar = siteViewModel.showAvatar(),
                         )
                     }
 

diff --git a/app/src/main/java/com/jerboa/Utils.kt b/app/src/main/java/com/jerboa/Utils.kt
@@ -54,6 +54,7 @@ import coil.imageLoader
 import com.jerboa.api.API
 import com.jerboa.api.ApiState
 import com.jerboa.datatypes.BanFromCommunityData
+import com.jerboa.datatypes.getDisplayName
 import com.jerboa.db.APP_SETTINGS_DEFAULT
 import com.jerboa.db.entity.AppSettings
 import com.jerboa.ui.components.common.Route
@@ -457,10 +458,10 @@ fun personNameShown(
     person: Person,
     federatedName: Boolean = false,
 ): String {
+    val name = person.getDisplayName()
     return if (!federatedName) {
-        person.display_name ?: person.name
+        name
     } else {
-        val name = person.display_name ?: person.name
         if (person.local) {
             name
         } else {
@@ -469,6 +470,9 @@ fun personNameShown(
     }
 }
 
+/**
+ * Warning, do not use this for links and such, only for messages
+ */
 fun communityNameShown(community: Community): String {
     return if (community.local) {
         community.title

diff --git a/app/src/main/java/com/jerboa/datatypes/SampleData.kt b/app/src/main/java/com/jerboa/datatypes/SampleData.kt
@@ -186,7 +186,7 @@ val samplePerson2 =
         updated = "2021-10-11T07:14:53.548707",
         actor_id = "https://lemmy.ml/u/homeless",
         bio = null,
-        local = true,
+        local = false,
         banner = null,
         deleted = false,
         matrix_user_id = null,
@@ -242,6 +242,8 @@ val sampleCommunity =
         posting_restricted_to_mods = false,
     )
 
+val sampleCommunityFederated = sampleCommunity.copy(local = false)
+
 val samplePostAggregates =
     PostAggregates(
         post_id = 135129,

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/CommentNode.kt
@@ -325,6 +325,7 @@ fun LazyListScope.commentNodeItem(
                                     onCommunityClick = onCommunityClick,
                                     onPostClick = onPostClick,
                                     blurNSFW = blurNSFW,
+                                    showAvatar = showAvatar,
                                 )
                             }
                             CommentNodeHeader(
@@ -695,6 +696,7 @@ fun PostAndCommunityContextHeader(
     onCommunityClick: (community: Community) -> Unit,
     onPostClick: (postId: PostId) -> Unit,
     blurNSFW: BlurNSFW,
+    showAvatar: Boolean,
 ) {
     Column(
         modifier = Modifier.padding(top = LARGE_PADDING),
@@ -713,6 +715,7 @@ fun PostAndCommunityContextHeader(
                 onClick = onCommunityClick,
                 showDefaultIcon = false,
                 blurNSFW = blurNSFW,
+                showAvatar = showAvatar,
             )
         }
     }
@@ -727,6 +730,7 @@ fun PostAndCommunityContextHeaderPreview() {
         onCommunityClick = {},
         onPostClick = {},
         blurNSFW = BlurNSFW.NSFW,
+        showAvatar = true,
     )
 }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/mentionnode/CommentMentionNode.kt
@@ -287,6 +287,7 @@ fun CommentMentionNode(
             onCommunityClick = onCommunityClick,
             onPostClick = onPostClick,
             blurNSFW = blurNSFW,
+            showAvatar = showAvatar,
         )
         CommentMentionNodeHeader(
             personMentionView = personMentionView,

diff --git a/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt b/app/src/main/java/com/jerboa/ui/components/comment/replynode/CommentReplyNode.kt
@@ -267,6 +267,7 @@ fun CommentReplyNodeInbox(
             onCommunityClick = onCommunityClick,
             onPostClick = onPostClick,
             blurNSFW = blurNSFW,
+            showAvatar = showAvatar,
         )
         CommentReplyNodeHeader(
             commentReplyView = commentReplyView,

diff --git a/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt b/app/src/main/java/com/jerboa/ui/components/common/AppBars.kt
@@ -441,14 +441,15 @@ fun ActionBarButtonAndBadge(
 
 @Composable
 fun DotSpacer(
-    padding: Dp = SMALL_PADDING,
+    modifier: Modifier = Modifier,
+    padding: Dp = 0.dp,
     style: TextStyle = MaterialTheme.typography.bodyMedium,
 ) {
     Text(
         text = stringResource(R.string.app_bars_dot_spacer),
         style = style,
         color = MaterialTheme.colorScheme.onBackground.muted,
-        modifier = Modifier.padding(horizontal = padding),
+        modifier = modifier.padding(horizontal = padding),
     )
 }
 

diff --git a/app/src/main/java/com/jerboa/ui/components/common/TextBadge.kt b/app/src/main/java/com/jerboa/ui/components/common/TextBadge.kt
@@ -1,19 +1,28 @@
 package com.jerboa.ui.components.common
 
+import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.background
+import androidx.compose.foundation.basicMarquee
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.remember
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.buildAnnotatedString
+import androidx.compose.ui.text.withStyle
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.jerboa.INSTANCE_FONT_SIZE
+import com.jerboa.hostName
+import com.jerboa.ui.theme.muted
 
+@OptIn(ExperimentalFoundationApi::class)
 @Composable
 fun TextBadge(
     text: String,
@@ -33,12 +42,61 @@ fun TextBadge(
         Text(
             text = text,
             style = textStyle,
-            overflow = TextOverflow.Clip,
             maxLines = 1,
             color = textColor,
             modifier =
                 Modifier
-                    .padding(horizontalTextPadding.dp, verticalTextPadding.dp),
+                    .padding(horizontalTextPadding.dp, verticalTextPadding.dp)
+                    .basicMarquee(),
         )
     }
 }
+
+/**
+ * Displays activitypub items (communities, users), with a smaller @instance shown
+ */
+@OptIn(ExperimentalFoundationApi::class)
+@Composable
+fun ItemAndInstanceTitle(
+    modifier: Modifier = Modifier,
+    title: String,
+    actorId: String?,
+    local: Boolean,
+    itemColor: Color = MaterialTheme.colorScheme.primary,
+    itemStyle: TextStyle = MaterialTheme.typography.bodyMedium,
+    instanceColor: Color = MaterialTheme.colorScheme.onSurface.muted,
+    instanceStyle: TextStyle = MaterialTheme.typography.bodySmall.copy(
+        fontSize = INSTANCE_FONT_SIZE.sp,
+    ),
+) {
+    val text = remember(title, local, itemColor) {
+        val serverStr = if (!local && actorId != null) {
+            "@${hostName(actorId)}"
+        } else {
+            null
+        }
+
+        buildAnnotatedString {
+            withStyle(
+                style = itemStyle.toSpanStyle().copy(color = itemColor),
+            ) {
+                append(title)
+            }
+            serverStr?.let { server ->
+                withStyle(
+                    style = instanceStyle.toSpanStyle().copy(
+                        color = instanceColor,
+                    ),
+                ) {
+                    append(server)
+                }
+            }
+        }
+    }
+
+    Text(
+        text = text,
+        maxLines = 1,
+        modifier = modifier.basicMarquee(),
+    )
+}
diff --git a/app/src/main/java/com/jerboa/ui/components/common/TimeAgo.kt b/app/src/main/java/com/jerboa/ui/components/common/TimeAgo.kt
@@ -36,6 +36,7 @@ import java.util.Date
 @Composable
 fun TimeAgo(
     published: String,
+    modifier: Modifier = Modifier,
     updated: String? = null,
     precedingString: String? = null,
     longTimeFormat: Boolean = false,
@@ -52,7 +53,7 @@ fun TimeAgo(
             stringResource(R.string.time_ago_ago, it, publishedPretty)
         } ?: run { publishedPretty }
 
-    Row {
+    Row(modifier = modifier) {
         Text(
             text = afterPreceding,
             color = MaterialTheme.colorScheme.onBackground.muted,
@@ -106,7 +107,10 @@ fun dateStringToPretty(
 @Preview
 @Composable
 fun TimeAgoPreview() {
-    TimeAgo(samplePerson.published, samplePerson.updated)
+    TimeAgo(
+        published = samplePerson.published,
+        updated = samplePerson.updated,
+    )
 }
 
 @Composable
@@ -134,7 +138,7 @@ fun ScoreAndTime(
                 fontSize = MaterialTheme.typography.bodyMedium.fontSize.times(1.3),
             )
         }
-        DotSpacer(0.dp, MaterialTheme.typography.bodyMedium)
+        DotSpacer(style = MaterialTheme.typography.bodyMedium)
         TimeAgo(published = published, updated = updated)
     }
 }