callebtc 7025009788
ui: complete the redesign — palette, top bar, composer, About, and a motion pass (#774)
* first pass

* pass 2

* cleanup

* capitalization

* strings

* input bar fixes

* fixes

* notes

* nice

* nicer

* lists

* cleanup

* button

* fixes

* animations

* Fix layout jumpiness in chat and geohash people list

Three separate causes of things moving when they should not:

- Chat lurched whenever a bottom sheet closed. Placement animation is meant
  to soften insertions and removals, but any relayout moves every item --
  a sheet's text field opening the keyboard changes the chat's IME inset,
  and closing it changes it back. Placement animation is now armed only
  briefly around a real change to the message list, so items otherwise
  track the viewport exactly.

- Anon list changed height as participants churned. Rows sized to their
  content, so any reorder could change the card's height; and the card
  sized to the live anon count, which moves constantly in a busy geohash.
  Rows now have an exact height, and a trimmed anon card reserves the full
  capped height regardless of how many are present beyond the cap.

- Anons are now their own trailing section rather than a tail on each of
  "on location" and "teleported in", which had pushed the few recognisable
  names out of view twice over. Self is never grouped as an anon.

Adds 7 tests covering the sectioning and the fixed-length behaviour.

* Group geohash people as People and Anon

Replaces the "on location" / "teleported in" / "anonymous" split with two
sections: peers who announced a nickname, then the anons.

Teleport state was never worth a section of its own -- every row already
carries it as a distinct glyph -- and splitting on it fragmented the short
list people actually read, in a channel where most participants are
anonymous anyway.

Self stays in the People section even when unnamed.

* Key message list state per conversation

Switching channels reused every piece of state in MessagesList, because none
of it was keyed on which conversation was being shown:

- The LazyListState carried the previous channel's scroll offset, so the new
  channel opened at a stale position and then corrected itself.
- hasScrolledToInitialPosition and followIncomingMessages carried over, so a
  channel entered after scrolling up in another one did not land on its
  newest message at all.
- The arrival tracker had never seen the incoming channel's ids, so a
  backlog of six or fewer messages was treated as six simultaneous arrivals
  and each one slid in.
- previousMessageCount carried over, arming placement animation for the
  relayout that the switch itself caused.

All of it is now keyed on a conversationKey derived the same way
displayMessages is. The tracker also detects a list sharing no ids with the
previous one and adopts it silently, which covers /clear and any caller that
does not supply a distinct key.

Adds 4 tests for wholesale replacement, including the case that the burst
cap cannot catch on its own.

* fix location channel layout

* icon

* location sheet

* move location error

* fix location channel lifecycle bug

* remove empty lable

* geist mono

* timestamp no seconds

* new icons

* icons

* cleanup

* mentions

* fix mentions

* grouping of geohash channel list

* colors

* fix mention colors

* Bring private and group chat headers up to the main header's layout

Both conversation headers were built on TopAppBar with a centred title, a
back arrow on the left and everything else crowded into the title slot, at
14sp with 14dp icons. Moving between the timeline and a conversation visibly
shifted the bar's height, insets and type.

Introduces ConversationHeader, built from the main header's own tokens rather
than TopAppBar: same ChatHeaderHeight, same 12/8dp edge insets, leading glyph
in a 44dp slot so it lands exactly where the brand mark does, same -6dp
optical nudge pulling the title toward it, same 17sp label.

- Drops the back button; the close action on the right is the way out.
  Leaving a channel outright already lives on its row in the network sheet,
  so it does not need a second home beside the exit.
- Leading glyph is the transport: globe over the internet, wifi/bluetooth/
  routed on the mesh, matching the main header's channel button.
- Actions are right-aligned and unweighted -- favourite, encryption state,
  close -- so a long title yields space to them instead of pushing them off
  screen.
- Private chat titles use the primary green like every other header label,
  rather than orange for Nostr-reachable peers.

Height and edge insets now belong to each header variant instead of the
ChatFloatingHeader wrapper, which was applying them a second time to the
channel header.

Adds nine spec icons in the existing 20x20 / 1.25-stroke language -- bluetooth,
wifi, routed, close, check, warning, sync, lock_open, envelope -- so the
headers and peer rows no longer mix Material glyphs into the set.

* color
2026-07-27 17:33:11 +02:00

85 lines
3.6 KiB
Kotlin

package com.bitchat.android.ui
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.bitchat.android.model.BitchatMessage
import com.bitchat.android.ui.theme.ChatVisualTokens
/**
* Consecutive-message grouping for the chat surface.
*
* The redesign suppresses the `@sender` label on runs of messages from the same author so the
* eye only has to register a name when the speaker actually changes. The transcript uses one
* consistent item rhythm; new groups get their additional separation from the visible sender
* row's own top padding.
*/
object MessageGrouping {
/** Space above the first message of a group (i.e. one that renders its sender label). */
val NEW_GROUP_SPACING: Dp = ChatVisualTokens.MessageItemSpacing
/** Space above a continuation message inside an existing group. */
val GROUPED_SPACING: Dp = ChatVisualTokens.MessageItemSpacing
/** Gap between the sender label and the first line of the body. */
val SENDER_TO_BODY_SPACING: Dp = ChatVisualTokens.SenderToBodySpacing
/** Top inset inside a visible sender row. */
val SENDER_TOP_PADDING: Dp = ChatVisualTokens.SenderTopPadding
/**
* Messages further apart than this always start a new group, even from the same sender:
* a reply an hour later is a new thought, not a continuation.
*/
const val GROUPING_WINDOW_MS: Long = 5 * 60 * 1000L
private const val SYSTEM_SENDER = "system"
/**
* Whether [current] should be rendered as a continuation of [previous], hiding its sender
* label.
*
* [previous] is the message immediately *before* [current] in chronological order. Note the
* message list renders with `reverseLayout = true`, so callers must be careful to resolve
* the chronological predecessor rather than the visually preceding item.
*/
fun shouldGroup(previous: BitchatMessage?, current: BitchatMessage): Boolean {
if (previous == null) return false
// System/action lines never participate in grouping in either direction: they are
// narration, and folding a real message into them would attribute it to "system".
if (previous.sender == SYSTEM_SENDER || current.sender == SYSTEM_SENDER) return false
// Never group across the public/private boundary or between different channels.
if (previous.isPrivate != current.isPrivate) return false
if (previous.channel != current.channel) return false
if (!isSameSender(previous, current)) return false
val elapsed = current.timestamp.time - previous.timestamp.time
return elapsed in 0..GROUPING_WINDOW_MS
}
/**
* Identity comparison. Peer IDs are authoritative when both messages carry one, because two
* different peers can share a nickname. Falls back to the display name (which includes the
* `#abcd` suffix) when peer IDs are unavailable, e.g. for locally injected messages.
*/
private fun isSameSender(previous: BitchatMessage, current: BitchatMessage): Boolean {
val previousPeerID = previous.senderPeerID
val currentPeerID = current.senderPeerID
return if (previousPeerID != null && currentPeerID != null) {
previousPeerID.equals(currentPeerID, ignoreCase = true)
} else {
previous.sender == current.sender
}
}
/** Top padding for a message given whether it continues the previous author's run. */
fun topSpacingFor(isGrouped: Boolean, isFirstInList: Boolean): Dp = when {
isFirstInList -> 0.dp
isGrouped -> GROUPED_SPACING
else -> NEW_GROUP_SPACING
}
}