Repository navigation
ADFA-4783: Clone Receive — inline confirm panel + dark-theme notice contrast - #228
Merged
Merged
Conversation
… in dark theme 1) Replace the transfer-confirm AlertDialog with an inline panel in the Receive card: when the state is CONFIRM, the progress bar is hidden and a panel shows the size/space message + the replace warning + Continue / Cancel. Cancel aborts the probe, Continue starts the pull. Removed showReceiveConfirm + confirmDialog; onTransferState no longer pops a dialog for CONFIRM (rendered inline), keeping the success/failed/aborted terminal dialogs. 2) Dark-theme contrast: the "This replaces your K2Go library" notice has a fixed light-pink background, but its body text used k2go_ink, which flips to near-white in night → unreadable. Pin the body to a new fixed-dark color (k2go_notice_ink). Related to ADFA-4725.
…creet link
Match the Send side's minimalist fallback: the paste toggle was a full
button (k2go_getmore_bg, BodyLarge); now it's a plain teal text link
('Scan didn't work? Enter code as text'), same as Send's 'Show code as
text'. Drops the now-redundant 'Camera not working?' note above it.
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.
Two polish items on the Clone Receive screen.
Inline confirm instead of a floating dialog. The transfer confirm ("Update System — you are about to download X … Do you want to start?") popped as an AlertDialog over the "Calculating what to copy…" bar. It's now an inline panel in the Receive card: on the CONFIRM state the progress bar is hidden and the panel shows the size/space message + the replace warning + Continue / Cancel. Cancel aborts the probe; Continue starts the pull. Removed
showReceiveConfirm+confirmDialog;onTransferStateno longer pops a dialog for CONFIRM (rendered inline). Success/failed/aborted terminal dialogs are unchanged.Dark-theme contrast of the "This replaces your K2Go library" notice. The notice has a fixed light-pink background, but its body text used
k2go_ink, which flips to near-white in the night theme → unreadable. The body is pinned to a new fixed-dark color (k2go_notice_ink) that reads on the pink in both themes. Title and "!" already use clay (non-flipping).Scope: layout + CloneFragment + one color. Related to ADFA-4725. Compiles via CI.