The mixWith canvas-darkening formula only lands well in LIGHT. For DARK / BLACK / SIMPLEX, fall back to secondaryVariant, which UserPicker already uses for the active profile avatar — keeps placeholder avatars consistent across the app on dark themes.
Both rows used Modifier.padding(top = 10.dp) so the tile hugged the bottom of the SectionView card. Switch to padding(vertical = 10.dp) to match the symmetric padding used by ProfileImageSection.
secondary (#8B8786) was too dark. Use background mixed with onBackground at 0.88 — same darkening recipe as canvasColorForCurrentTheme uses with 0.94, applied a step further. On LIGHT this lands near #E1E1E1: 15 units darker than the canvas, matching how the canvas sits 15 darker than white.
UserPickerOptionRow no longer applies extraPadding on desktop, and the Settings row uses default SectionItemView padding instead of its own. Both now match the CARD_ITEM_PADDING used in Settings screens. After the inactive-users avatar grid in the unified card, paint a SectionDivider so it visually separates from Your chat profiles.
secondaryVariant is near-white (#F1F2F6) and disappears against the gray canvas. Use the visible secondary tone instead so default avatars without a photo are legible on both card and canvas backgrounds.
Both Android and desktop portrait now show address, preferences, (desktop: inactive-users grid), profiles, link mobile / use from desktop, and settings inside a single SectionView card. Desktop landscape keeps the side-by-side two-card layout.
LocalInSectionCard is declared in Section.kt which has no package (root package), so it must be imported as 'import LocalInSectionCard', not as 'chat.simplex.common.views.helpers.LocalInSectionCard'.
Desktop background was MaterialTheme.colors.surface (white) so the SectionView cards introduced earlier were invisible. Switch to canvasColorForCurrentTheme() to match Android.
Drop the explicit Divider above the inactive-users grid: split SecondSection into two SectionView cards with the avatar grid between them so the section dividers come from the cards themselves.
Desktop UserPicker doesn't have a canvas background, so white cards on the white surface were invisible and the existing desktop divider above inactive users looked stray next to the SectionItemView mini-dividers.
The summary layouts wrapped Stats / Subscriptions / Sessions inside the outer Server address SectionView, which produced nested cards and pushed the Statistics 'Starting from...' footer inside a card. Unnest them so each section is its own card with proper spacing and the footer renders outside.
InfoRow defaulted to DEFAULT_PADDING (20dp), but card chrome adopted CARD_ITEM_PADDING (15dp) for SectionItemView and InfoRowTwoValues. Inside a card, rows of different kinds visibly jumped left/right. Bring InfoRow and its IndentedInfoRow variant onto the same baseline.
Two changes:
1) Theme.kt LIGHT canvas: 0.97f → 0.94f (#F0F0F0). User wants more
contrast against cards. With Material's default 0.04-alpha hover
(#F5F5F5) this puts hover LIGHTER than canvas by 5 units — unusual
direction but it's the user's call; they'll evaluate visually.
2) ChatListNavLinkView.android: when rendered inside a SectionView card
(e.g. contact list inside NewChatSheet after the forEach-into-card
refactor), use SectionDivider() — same 2dp full-width canvas-color
divider as desktop. Outside a card (main chat list), fall back to
the original Material `Divider(Modifier.padding(horizontal = 8.dp))`
so unchanged for that context.
3) LocalInSectionCard made `internal` so the android-specific file can
read it. Same pattern as LocalAppColors etc.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Fixes from the user's verified list of misplaced footers/spacers:
- ChatInfoView: SimpleX address footer ("You can share this address
with your contacts to let them connect with you.") moved out of the
address SectionView lambda.
- GroupMemberInfoView: same string for member address.
- Appearance: SectionSpacer in the Image-wallpaper branch (after
"Remove image" button) removed — it created 30dp empty padding
inside the THEMES card only when a custom image was selected.
- NotificationsSettingsView: Xiaomi battery-optimization footer
("Xiaomi devices: please enable Autostart...") moved out of the
notifications SectionView lambda (visible only on Xiaomi devices
in Periodic/Service notification mode).
- ConnectMobileView: dropped the 20dp Spacer that sat inside the QR
SectionView after the developer-tools "Share link" row — visible
as extra padding below Share link inside the card.
Same pre-card-chrome pattern as other moves: helpers placed inside
SectionView lambdas before PR #6777 rendered fine when SectionView was
a plain Column; after card chrome they render inside the white card.
Moved them outside so footers read as captions and spacers actually
separate cards.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
User asked for taller settings rows. Bump the default minHeight in
all four SectionItemView family functions from DEFAULT_MIN_SECTION_ITEM_HEIGHT
(50dp) to DEFAULT_MIN_SECTION_ITEM_HEIGHT + 6.dp (56dp).
Scoped to SectionItemView callers only — does not touch the global
DEFAULT_MIN_SECTION_ITEM_HEIGHT constant, so non-section callers
(ChatItemInfoView, ComposeContextProfilePicker, TagListView,
UserPicker) keep the 50dp baseline.
Callers that pass explicit minHeight (e.g. 54dp in GroupChatInfoView
members) are unaffected.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
User feedback: the off-white canvas at 0.95 (#F2F2F2) read as too
dark. Two coordinated changes:
- canvasColorForCurrentTheme LIGHT branch: 0.95f → 0.97f. Canvas now
#F7F7F7 (3% darker than white, was 5%). Still distinct from pure
white card but lighter.
- Drop the custom sectionItemHover Modifier helper (and its hoverable
+ InteractionSource + background machinery). The reason for the
custom hover was that the default Material 0.04-alpha ripple hover
(#F5F5F5 on white card) blended with the old #F2F2F2 canvas. With
the lighter canvas at #F7F7F7 the default hover #F5F5F5 is now
visibly darker than canvas (2 units delta) — visible enough at
Material default without our custom override.
Removed unused MutableInteractionSource and collectIsHoveredAsState
imports.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
sectionItemHover used to show on every row inside a section card. But
rows where the action is an inline control (switch via PreferenceToggle,
dropdown via ExposedDropDownSettingRow) are not "interactive as a row"
— the user has to hit the actual control, not the whole row. Showing
hover on the whole row was misleading.
Add `clickable: Boolean = true` param to sectionItemHover; suppress when
false. SectionItemView and SectionItemViewSpaceBetween pass
`clickable = click != null`. SectionItemViewLongClickable keeps the
default (its click is non-nullable, always interactive).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
UseOnionHosts wrapped its ExposedDropDownSettingRow and a dynamic
SectionTextFooter ("Onion hosts will be used when available." / similar)
in a Column, so when UseOnionHosts was called inside a SectionView
lambda the footer rendered inside the white card.
Split into two composables:
- UseOnionHosts — only the dropdown row (no longer wraps in Column)
- UseOnionHostsDescription — only the dynamic SectionTextFooter,
called separately by the caller
Shared `onionHostsValues` is now a private @Composable val accessible
to both. In SocksProxySettings, UseOnionHostsDescription is now placed
AFTER the SectionView block (alongside the existing
"Disable onion hosts when not supported" caption) so the dynamic
description reads as a caption below the card.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Same pre-card-chrome pattern as elsewhere: two SectionTextFooter calls
("Disable onion hosts when not supported" and the proxy-auth footer)
were inside their SectionView lambdas in SocksProxySettings, so after
the card chrome was added they rendered inside the white cards as
inline content. Move both out so they read as captions below the
corresponding cards.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
UseSocksProxySwitch was a custom Row with hard-coded horizontal padding
of DEFAULT_PADDING (20dp) — but its neighbours on the messages card are
SettingsActionItem rows that go through SectionItemView with the new
CARD_ITEM_PADDING (15dp). 5dp icon misalignment between the SOCKS
toggle row and the rest, plus no auto-divider underneath since it
wasn't a SectionItemView.
Replace the custom Row with SettingsActionItemWithContent — same
icon + label + DefaultSwitch shape, now wrapped in SectionItemView so
it shares padding and auto-divider with siblings.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Your ICE servers screen had its Configure-ICE toggle and the description
text / editor / read-only display all directly in a raw Column with no
card chrome. Wrap the toggle row in SectionView so it reads as a card
matching the iOS-style facelift. The description text and the
TextEditor / read-only Surface stay in the same loose Column below
(they're a form/display block, not a settings row).
Removed the explicit `padding = PaddingValues()` on the
SectionItemViewSpaceBetween — inside SectionView it inherits
CARD_ITEM_PADDING by default which is what we want now.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
0.08 read as too dark on white cards. Original Compose default 0.04
blended with the off-white canvas (#F2F2F2 vs ~#F5F5F5). 0.05 is the
midpoint — still visibly distinct from canvas (~#F2F2F2 canvas vs
~#F3F3F3 hover on white card) but no longer reads as a heavy box.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
sectionItemHover was applied unconditionally inside section cards, so a
disabled row would still show the hover overlay on mouseover —
misleading: the visible interactive feedback contradicts the disabled
state (no click reaction).
Add `enabled: Boolean = true` parameter; the helper now returns `this`
unchanged when `enabled = false`. The 3 SectionItemView family
functions that own a modifier chain pass `enabled = !disabled`.
SectionItemViewWithoutMinPadding inherits through SectionItemView delegation.
Non-clickable info rows (click == null but disabled = false) still get
the hover overlay — that's intentional cursor feedback matching iOS
Settings behavior.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Drop SectionRippleTheme/RippleAlpha/LocalRippleTheme machinery (deprecated
in newer Compose Material, would not compile with the project's warnings-
as-errors policy without DEPRECATION_ERROR suppress, which is a code
smell). Replace with a Modifier.hoverable + Modifier.background pattern —
the modern Compose-native way to apply a hover overlay:
- New private @Composable Modifier.sectionItemHover() that:
- returns Modifier as-is outside SectionView card (LocalInSectionCard = false)
- inside a card, attaches its own MutableInteractionSource via .hoverable()
and paints a transparent or onBackground@0.08-alpha background based on
collectIsHoveredAsState
- Applied alongside .sectionItemDivider() in each SectionItemView modifier
chain. Click ripple keeps coming from Modifier.clickable's own indication
(default ripple, no changes there).
- Drop @file:Suppress deprecation lines; drop SectionRippleTheme object;
drop ripple imports; drop LocalRippleTheme from CompositionLocalProvider
calls in three SectionView variants.
Visual result identical to the previous attempt (hovered row gets a visible
gray overlay on LIGHT canvas), no deprecated APIs, no warnings-as-errors
fight. Click ripple unchanged.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Previous attempt (4bf981a6b) suppressed DEPRECATION but the Compose
library deprecated RippleTheme with level=DeprecationLevel.ERROR, which
requires the DEPRECATION_ERROR suppression key instead. Add both so
either severity is covered.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
`androidx.compose.material.ripple.RippleTheme` and `LocalRippleTheme`
were deprecated in newer Compose Material in favor of the modern
Indication APIs. Our SectionRippleTheme override (a5b199660) hit those
deprecations and the project's Kotlin compiler flags treat warnings as
errors, breaking the build.
Add `@file:Suppress("DEPRECATION")` to Section.kt — narrow file-level
scope. Modern Indication-based ripple migration is a separate, larger
concern; suppress for now so the section hover-alpha override keeps
working.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Same pre-card-chrome pattern: SectionTextFooter and SectionDividerSpaced
were inside the SectionView around DeviceNameField + multicast toggle,
so they rendered inside the white card after PR #6777 — visible as an
extra empty padding below the "Discoverable via local network" toggle
(the SectionDividerSpaced 10dp Spacer inside the card).
Move both outside the SectionView so the footer reads as caption below
the card and the spacer separates this card from the next.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The Create profile action SettingsActionItem at the bottom of the
Create profile screen was loose on canvas. Wrap in SectionView so it
reads as a single-item card matching the iOS-style facelift. The two
SectionTextFooter captions below stay outside the card.
Added missing `import SectionView`.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Three SimpleX address fixes:
- "Your contacts will remain connected" SectionTextFooter moved out of
the DeleteAddressButton SectionView (was rendering inside the card).
- Address settings > welcome message field gets 10dp vertical
contentPadding on its SectionView so the TextEditor doesn't sit flush
against the card top/bottom.
- Address settings > Save action wrapped in its own SectionView so it
reads as a single-item card.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The "Add to list" / "Save list" action button in TagListEditor (opened
from chatlist "+" Add list) was a loose SectionItemView on the canvas
with no card chrome. Wrap in SectionView so it reads as a single-item
card. ChatTagInput stays as a form field above.
Added missing `import SectionView`.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
In Create group and Create public channel screens the action buttons
(Create / Configure relays) and incognito toggle were rendered as loose
SectionItemViews on the gray canvas with no card chrome. Wrap them in
SectionView so they read as a single card matching the iOS-style facelift.
The display-name input above and the descriptive footer below stay
outside the card (text input keeps its own padding, footer reads as
caption).
Added missing `import SectionView` in AddGroupView.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The "Contacts" header was a SectionView with empty content lambda, and
the actual contact rows were rendered as separate LazyColumn items
OUTSIDE the SectionView — so they sat on canvas without card chrome.
Move filteredContactChats.forEachIndexed { ContactListNavLinkView }
INSIDE the SectionView lambda in both OneHandLazyColumn and
NonOneHandLazyColumn so the contacts read as a single card matching
the iOS-style facelift.
Same trade-off as GroupChatInfoView members fix (fa29bb7a): lazy
rendering of contact rows replaced with eager composition inside a
Column. For typical contact lists (<100) imperceptible; very long
lists may compose slower on open.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Same pre-card-chrome pattern as ChatInfoView (fixed in b1a1dad8):
SectionTextFooter("Delete chat messages from your device.") sat inside
the SectionView around ChatTTLOption, so it rendered inside the white
card after PR #6777 added card chrome. Move it out so the caption sits
below the card iOS-style.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The user-selection ExposedDropDownSettingRow at the top of the
servers info screen was rendered loose on the canvas with no card
chrome. Wrap in SectionView so it reads as a card matching the rest
of the screen.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Four small fixes on the same theme-related screens:
- Move "Customize theme" SectionItemView INSIDE the THEMES SectionView
in AppearanceView so it sits in the same card as Color mode / Dark
mode colors with an auto-divider above it.
- Wrap WallpaperPresetSelector (theme slots + chat preview) and the
conditional Remove-image button in CustomizeThemeView with a
SectionView so they read as a card, matching the Appearance themes
card pattern. Add a SectionDividerSpaced after.
- Drop SectionSpacer() that sat between the Wallpaper tint row and the
Sent message row inside WallpaperSetupView — auto-divider on the
Wallpaper tint SectionItemView already provides separation; the
30dp spacer rendered as extra empty padding inside the card.
- Wrap the Reset colors action in a single-item SectionView so it
reads as its own card, matching the export/import card below.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Two layout regressions from earlier facelift commits where slider/item
math assumed DEFAULT_PADDING (20dp) for inner card padding, but the
facelift uses CARD_PADDING (16dp outer) + CARD_ITEM_PADDING (15dp inner)
= 31dp per side instead of 20dp.
- Slider widthIn calc in AppToolbarsSection and MessageShapeSection
used (maxWidth - DEFAULT_PADDING * 2) so the slider was ~22dp wider
than it should be, shrinking the label Box (weight 1f) and clipping
"Transparency" to "Transparenc". Switched to
(CARD_PADDING + CARD_ITEM_PADDING) * 2.
- SettingsActionItemWithContent explicitly passed
PaddingValues(horizontal = DEFAULT_PADDING) to its SectionItemView,
overriding the new CARD_ITEM_PADDING default. That made any row using
SettingsPreferenceItem/SettingsActionItem sit 5dp further inset than
rows using plain SectionItemViewWithoutMinPadding — visible as a left
indent on "Tail" relative to "Corner". Replaced with CARD_ITEM_PADDING
so it matches.
Removed `private` from CARD_PADDING and CARD_ITEM_PADDING in Section.kt
to allow imports from other files (used the same way as SectionView etc.
are imported individually).
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
- "Review conditions" (ConditionsButton — a bare SectionItemView) was
rendered between the operators card and the messages card on the
canvas without card chrome. Move it inside the operators SectionView
lambda after the operator rows, so it shares the card and gets a
2dp auto-divider above it separating it from the operator list.
- "Save servers" (a bare SectionItemView further down) is now wrapped
in its own SectionView so it reads as a single-item card matching
the iOS-style facelift of the rest of the screen.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
The TextEditor (144dp tall input) sat flush against the top and bottom
edges of its containing SectionView card on the New server screen.
Pass padding = PaddingValues(vertical = DEFAULT_PADDING_HALF) to the
SectionView so the field gets 10dp of breathing room top and bottom
inside the card.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
Default Compose Material 1 RippleTheme uses hoveredAlpha=0.04 for LIGHT,
producing a Black·0.04 overlay (~#F5F5F5) on white cards — visually 3
units per channel away from the off-white canvas (~#F2F2F2), so the
hover state blends into the canvas and the row looks unfocused.
Add a section-local SectionRippleTheme that mirrors Material's defaults
for everything except hoveredAlpha on LIGHT (raised to 0.08 → ~#EBEBEB
overlay, ~7 units delta from canvas — visibly distinct). Dark themes
keep Material defaults since their hover contrast is already adequate.
Provided via CompositionLocalProvider in all three SectionView variants
alongside LocalInSectionCard, so it scopes only to section card items.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
8050676b moved sectionItemDivider() AFTER clickable.padding() in the
modifier chain to make the line paint on top of clickable's hover
indication. Side effect: drawBehind then saw the size of the
padding-reduced content area, not the full row, so dividers rendered
15dp ABOVE the actual row bottom (in the middle of the row's bottom
padding zone) instead of at the row edge between adjacent items.
Fix: keep sectionItemDivider() in the modifier val BEFORE clickable/
padding (so size = full row outer bounds) AND switch from drawBehind
to drawWithContent { drawContent(); drawLine(...) } so the line is
painted AFTER the chain's content + hover indication draw. Both
goals satisfied: divider sits at the true row bottom AND paints on
top of hover overlay.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
f922d8fc introduced SectionDivider() call in the themes card but forgot
to add the per-symbol import. SectionView/SectionDividerSpaced etc. in
this codebase are imported individually (Section.kt declares them at
top level, not inside a package), so SectionDivider needs its own
import line.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
SubscriptionsSectionView and SMPSubscriptionsSection both rendered their
InfoRows + control item in a plain Column without card chrome — so on
the Servers info screen the "Message reception" section title sat above
loose rows on the gray canvas (no card), inconsistent with the rest of
the screen. Wrap the inner Column in SectionView so the rows get the
raised iOS-style card look. The custom header Row (title + subscription
status indicator) stays outside the card so the icon stays inline with
the title text.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
another-simple-pixel