Skip to content

K2GO-578 feat(contentexchange): Share and Receive screens: invite as text, Receive start screen, pinned Share layout - #784

Merged
luisguzman-adfa merged 11 commits into
mainfrom
feat/K2GO-578-share-receive-screens
Nov 14, 2026
Merged

luisguzman-adfa merged 11 commits into
mainfrom
feat/K2GO-578-share-receive-screens

Conversation

@luisguzman-adfa

Copy link
Copy Markdown
Collaborator

What changes

  • Share shows the invite as text under the QR, with Copy and Share.
  • Receive over Wi-Fi opens its own screen: join the Wi-Fi, then scan or paste the code.
  • Share screen: back arrow, "N selected : size", pinned tabs and Done. Back asks before it stops the share.
  • QRs read "QR Code" / "Open the library" to screen readers instead of the tab name.
  • One shared helper (CodeText) and shared layouts; Clone uses them too.
    • UI changes:
      • New: k2go_cx_share_stop_msg "This stops any copy in progress. The other phone loses its progress and must start again with a new code." (all locales)
      • Share subtitle: "Sharing N items" -> "N selected : " (reuses k2go_cx_selected_fmt)
      • Invite caption: "Then scan this to receive the content." -> Clone's "Ready! Scan to start the transfer" / "Ready! Scan code 2 to start the transfer"
      • Removed: k2go_cx_share_subtitle_fmt, k2go_cx_share_receive_caption
      • Verified in dark mode on the OnePlus 7T; light mode not checked yet.

Why

  • Phones without a working camera, or a remote session, can share.
  • The next Share always uses the current selection.

Steps to QA

  • Baseline: on main, Share shows only a QR; Receive opens the camera; Back, then Share with a new selection, shows the old share.
  • Change: copy the code on the sender, paste it on the receiver: it opens the receive step. Back asks "Stop sharing?". A new selection shows its own size.

Verifications

  • Build, unit tests and lint pass. Device checks on the OnePlus 7T; evidence goes in K2GO-578.

Notes

  • No change to conex-core or dash-node. Share transfer resume (K2GO-577) is not part of this PR.

The Share invite shows as copyable text under its QR, and Receive takes a pasted invite through the same ShareHandshake.decode as a scan. This lets phones without a working camera, or a remote device tunnel, share content. Clone and Content Exchange now use one shared code-as-text block (view_k2go_code_text, view_k2go_code_paste, CodeText).
The scan and the enter-as-text path were squeezed into the Content manager bottom bar. A dedicated start screen, modelled on Clone's Receive, lays out join Wi-Fi, scan, and paste as two steps.
…d code-path helper

Share: back header, count and size, and the transport strip stay at the top; Done stays at the bottom; the invite step is named Share and numbered by the visible steps. CodeText owns the scan options, Wi-Fi settings and the paste block for Clone and Content Exchange; the step header and the bottom bar are one layout and one style.
…ne-code / two-code wording

Drops k2go_cx_share_receive_caption ("Then scan..."), wrong when the Wi-Fi transport shows a single step.
…, not "Clone"

The layout serves Clone, Connect and Share; reuse qr_content_description.
… to screen readers

Connect Wi-Fi QR reads "Open the library" (as its Hotspot twin); Clone transfer QR reads "QR Code".
…"N selected : size" line

Drops the untranslated k2go_cx_share_summary plural and the unused k2go_cx_share_subtitle_fmt.
…e, like Done

A share left running made the next Share reopen it and ignore the new selection.
… screens

No "Ready! Scan" caption while the invite QR is pending; Share size sums the selected items; scanner registered once; shared code layouts on the 4dp grid.
…t stops the share

Reuses Clone's "Stop sharing?" dialog; Back is easy to hit mid-transfer.
…e loses its progress

Resume is not guaranteed for every app yet, so the Share dialog does not reuse Clone's "can start again" text. New string in all locales.
@luisguzman-adfa luisguzman-adfa added the ui change or edit to UI label Nov 14, 2026
@luisguzman-adfa

Copy link
Copy Markdown
Collaborator Author

Light mode verified on the OnePlus 7T: Receive content, Share content and the "Stop sharing?" dialog read correctly. The subtitle format above is "N selected : size" (for example "1 selected : 52 KB").

@luisguzman-adfa
luisguzman-adfa merged commit aec5cce into main Nov 14, 2026
4 checks passed
@luisguzman-adfa
luisguzman-adfa deleted the feat/K2GO-578-share-receive-screens branch November 14, 2026 21:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ui change or edit to UI

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant