ADFA-4790: Receive confirm size breakdown + compact QR keys#236
Merged
Conversation
- Receive CONFIRM keeps the backend's localized title/message and appends a System/Content split (sizes travel in the QR) plus the replace warning, both via string resources in strings_k2go.xml (translatable=false, picked up by the redesign l10n pass) — no hardcoded English, so it follows the device language like the rest of the redesign UI. - Payload size keys shortened to sb / cb (lighter QR). Cross-version: an older QR (long keys) parses with sizes = 0 (split hidden); the transfer itself is unaffected.
Match the design mockup: the confirm now shows a 'FROM THE OTHER PHONE' card with System / Content / (divider) / Total rows, the pink replace notice, and full-width Continue / Cancel — instead of a single run-on text line. Sizes come from the QR (getPendingCreds); the table hides if the sender didn't send sizes. Mirrors the Send 'SHARING NOW' card styling.
On a fresh install (no local rootfs) there's nothing to overwrite, so the 'This replaces your K2Go library / No undo' warning is misleading. Detect it with rootfsPresent(): if empty, show a benign green 'Nothing to replace' notice; otherwise keep the clay replace warning. New drawable k2go_ok_bg.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Cross-version: an older QR (long keys) parses with sizes = 0 (split hidden); the transfer itself is unaffected.