More static imports

briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/BlogPostItem.kt

@@ -71,8 +71,7 @@ data class BlogCommentItem(
 
     init {
         collectComments(header)
-        // TODO check order
-        _comments.sortBy { it.timestamp }
+        _comments.sortBy { it.timeReceived }
     }
 
     private fun collectComments(header: BlogPostHeader): BlogPostHeader {

briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/BlogPostView.kt

@@ -39,8 +39,8 @@ import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Repeat
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Alignment.Companion.BottomEnd
+import androidx.compose.ui.Alignment.Companion.CenterVertically
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
@@ -61,8 +61,8 @@ import org.briarproject.briar.desktop.ui.HorizontalDivider
 import org.briarproject.briar.desktop.ui.TrustIndicatorShort
 import org.briarproject.briar.desktop.utils.InternationalizationUtils.i18n
 import org.briarproject.briar.desktop.utils.PreviewUtils.preview
-import org.briarproject.briar.desktop.utils.TimeUtils
-import org.briarproject.briar.desktop.utils.UiUtils
+import org.briarproject.briar.desktop.utils.TimeUtils.getFormattedTimestamp
+import org.briarproject.briar.desktop.utils.UiUtils.getContactDisplayName
 import org.briarproject.briar.desktop.utils.getRandomAuthor
 import org.briarproject.briar.desktop.utils.getRandomId
 import org.briarproject.briar.desktop.utils.getRandomString
@@ -130,7 +130,7 @@ private fun BlogPostViewHeader(
     Row(
         modifier = modifier,
         horizontalArrangement = spacedBy(8.dp),
-        verticalAlignment = Alignment.CenterVertically,
+        verticalAlignment = CenterVertically,
     ) {
         Column(
             verticalArrangement = spacedBy(8.dp),
@@ -158,13 +158,13 @@ private fun RepeatAuthorView(item: BlogPost, modifier: Modifier = Modifier) {
     val timestamp = item.timestamp
     Row(
         horizontalArrangement = spacedBy(8.dp),
-        verticalAlignment = Alignment.CenterVertically,
+        verticalAlignment = CenterVertically,
         modifier = modifier,
     ) {
         Row(
             modifier = Modifier.weight(1f),
             horizontalArrangement = spacedBy(8.dp),
-            verticalAlignment = Alignment.CenterVertically,
+            verticalAlignment = CenterVertically,
         ) {
             Box(
                 contentAlignment = BottomEnd,
@@ -183,7 +183,7 @@ private fun RepeatAuthorView(item: BlogPost, modifier: Modifier = Modifier) {
             }
             Text(
                 modifier = Modifier.weight(1f, fill = false),
-                text = UiUtils.getContactDisplayName(author.name, authorInfo.alias),
+                text = getContactDisplayName(author.name, authorInfo.alias),
                 fontWeight = if (authorInfo.status == OURSELVES) FontWeight.Bold else null,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
@@ -191,7 +191,7 @@ private fun RepeatAuthorView(item: BlogPost, modifier: Modifier = Modifier) {
             TrustIndicatorShort(authorInfo.status)
         }
         Text(
-            text = TimeUtils.getFormattedTimestamp(timestamp),
+            text = getFormattedTimestamp(timestamp),
             textAlign = TextAlign.End,
             style = MaterialTheme.typography.caption,
             maxLines = 1,

briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/FeedScreen.kt

@@ -32,13 +32,13 @@ import androidx.compose.foundation.rememberScrollbarAdapter
 import androidx.compose.foundation.selection.selectableGroup
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Alignment
+import androidx.compose.ui.Alignment.Companion.CenterEnd
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import kotlinx.coroutines.delay
 import org.briarproject.bramble.api.sync.MessageId
 import org.briarproject.briar.desktop.conversation.reallyVisibleItemsInfo
-import org.briarproject.briar.desktop.ui.Constants
+import org.briarproject.briar.desktop.ui.Constants.HEADER_SIZE
 import org.briarproject.briar.desktop.ui.isWindowFocused
 import org.briarproject.briar.desktop.utils.PreviewUtils.preview
 import java.time.Instant
@@ -78,7 +78,7 @@ fun FeedScreen(posts: List<BlogPost>, onItemSelected: (BlogPost) -> Unit, modifi
                     item = item,
                     onItemRepeat = onItemSelected,
                     modifier = Modifier
-                        .heightIn(min = Constants.HEADER_SIZE)
+                        .heightIn(min = HEADER_SIZE)
                         .fillMaxWidth()
                         .padding(vertical = 8.dp)
                         .padding(start = 16.dp, end = 8.dp)
@@ -87,7 +87,7 @@ fun FeedScreen(posts: List<BlogPost>, onItemSelected: (BlogPost) -> Unit, modifi
         }
         VerticalScrollbar(
             adapter = rememberScrollbarAdapter(scrollState),
-            modifier = Modifier.align(Alignment.CenterEnd).fillMaxHeight()
+            modifier = Modifier.align(CenterEnd).fillMaxHeight()
         )
         if (isWindowFocused()) {
             // if Briar Desktop currently has focus,

briar-desktop/src/main/kotlin/org/briarproject/briar/desktop/blog/FeedViewModel.kt

@@ -106,9 +106,6 @@ class FeedViewModel @Inject constructor(
     private fun onBlogPostAdded(header: BlogPostHeader, local: Boolean) {
         runOnDbThreadWithTransaction(true) { txn ->
             val item = getItem(txn, header)
-
-            LOG.error { "${item::class.java} ${item.text}" }
-
             txn.attach {
                 _posts.add(item)
                 _posts.sortByDescending { blogPost ->