From d48c1e5b81e409b7091cc3a8056c35c6b4aa75e6 Mon Sep 17 00:00:00 2001 From: Luis Guzman Date: Fri, 13 Nov 2026 18:30:49 -0600 Subject: [PATCH 01/11] K2GO-578 feat(contentexchange): share and receive the invite as text 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). --- .../presentation/ContentManagerFragment.java | 41 +++++++++++- .../presentation/ContentShareFragment.java | 24 +++++++ .../k2go/redesign/CloneFragment.java | 51 ++++----------- .../appdevforall/k2go/redesign/CodeText.java | 64 +++++++++++++++++++ .../src/main/res/drawable/k2go_field_bg.xml | 8 +++ .../main/res/layout/fragment_k2go_clone.xml | 38 +---------- .../layout/fragment_k2go_content_manager.xml | 3 + .../layout/fragment_k2go_content_share.xml | 3 + .../main/res/layout/view_k2go_code_paste.xml | 22 +++++++ .../main/res/layout/view_k2go_code_text.xml | 29 +++++++++ controller/app/ui-type-scale-baseline.txt | 2 - 11 files changed, 209 insertions(+), 76 deletions(-) create mode 100644 controller/app/src/main/java/org/appdevforall/k2go/redesign/CodeText.java create mode 100644 controller/app/src/main/res/drawable/k2go_field_bg.xml create mode 100644 controller/app/src/main/res/layout/view_k2go_code_paste.xml create mode 100644 controller/app/src/main/res/layout/view_k2go_code_text.xml diff --git a/controller/app/src/main/java/org/appdevforall/k2go/contentexchange/presentation/ContentManagerFragment.java b/controller/app/src/main/java/org/appdevforall/k2go/contentexchange/presentation/ContentManagerFragment.java index 497d15bae..4e77da318 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/contentexchange/presentation/ContentManagerFragment.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/contentexchange/presentation/ContentManagerFragment.java @@ -22,6 +22,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.EditText; import android.widget.TextView; import androidx.activity.result.ActivityResultLauncher; @@ -45,6 +46,7 @@ import org.appdevforall.k2go.contentexchange.domain.StorageStatus; import org.appdevforall.k2go.hotspot.HotspotPermissions; import org.appdevforall.k2go.hotspot.LocalHotspotManager; +import org.appdevforall.k2go.redesign.CodeText; import org.appdevforall.k2go.storage.StorageProbe; import org.appdevforall.k2go.ui.dialog.BrandDialog; import org.appdevforall.k2go.util.ByteFormatter; @@ -74,6 +76,10 @@ public class ContentManagerFragment extends Fragment { private Button exportButton; private Button importButton; private Button receiveButton; + private TextView showPaste; + private View pasteBlock; + private EditText paste; + private boolean pasteExpanded; private Button deleteButton; private Button shareButton; @@ -120,6 +126,15 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c exportButton.setOnClickListener(v -> onExportClicked()); importButton.setOnClickListener(v -> onImportClicked()); receiveButton.setOnClickListener(v -> onReceiveClicked()); + showPaste = root.findViewById(R.id.k2go_code_showpaste); + pasteBlock = root.findViewById(R.id.k2go_code_pasteblock); + paste = root.findViewById(R.id.k2go_code_paste); + showPaste.setOnClickListener(v -> { + pasteExpanded = !pasteExpanded; + renderPaste(); + }); + root.findViewById(R.id.k2go_code_use).setOnClickListener(v -> onPasteUsed()); + renderPaste(); deleteButton.setEnabled(true); deleteButton.setOnClickListener(v -> onDeleteClicked()); shareButton.setEnabled(true); @@ -357,7 +372,31 @@ private void onReceiveClicked() { inviteScan.launch(o); } - /** The scanner returned. Null means the user cancelled; a non-invite or invalid QR is rejected. */ + /** The paste link: "Scan didn't work? Enter the code as text" opens the paste field. */ + private void renderPaste() { + showPaste.setVisibility(View.VISIBLE); + CodeText.setExpandChevron(showPaste, pasteExpanded, R.color.k2go_teal); + pasteBlock.setVisibility(pasteExpanded ? View.VISIBLE : View.GONE); + } + + /** "Use this code": the pasted invite takes the same path as a scanned one. */ + private void onPasteUsed() { + String text = paste.getText().toString().trim(); + if (text.isEmpty()) { + String msg = getString(R.string.k2go_clone_toast_paste_first); + Snackbar.make(requireView(), msg, SnackbarDuration.millisForText(msg)).show(); + return; + } + if (ContentImportService.session().isRunning()) { + showImportProgress(); + return; + } + LocalHotspotManager.get().stop(); // same reason as onReceiveClicked + onInviteScanned(text); + } + + /** The scanner returned (or a code was pasted). Null means the user cancelled; a non-invite or + * invalid code is rejected. */ private void onInviteScanned(@Nullable String contents) { if (!isAdded() || contents == null) { return; diff --git a/controller/app/src/main/java/org/appdevforall/k2go/contentexchange/presentation/ContentShareFragment.java b/controller/app/src/main/java/org/appdevforall/k2go/contentexchange/presentation/ContentShareFragment.java index 7e3aa75eb..60388aff6 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/contentexchange/presentation/ContentShareFragment.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/contentexchange/presentation/ContentShareFragment.java @@ -28,6 +28,7 @@ import org.appdevforall.k2go.hotspot.HotspotPermissions; import org.appdevforall.k2go.hotspot.LocalHotspotManager; import org.appdevforall.k2go.hotspot.data.ApAddressResolver; +import org.appdevforall.k2go.redesign.CodeText; import org.appdevforall.k2go.redesign.QrSection; import org.appdevforall.k2go.redesign.SegmentedTabs; import org.appdevforall.k2go.sync.transport.NetworkStateLiveData; @@ -41,6 +42,11 @@ public class ContentShareFragment extends Fragment { private View receiveRoot; private QrSection secJoin; private QrSection secReceive; + private View codeLabel; + private View codeBlock; + private TextView codeText; + /** The invite shown as text; Copy / Share hand out this exact payload. */ + private String invitePayload = ""; private View transportRow; private TextView transportHotspot; private TextView transportWifi; @@ -77,6 +83,12 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c ((TextView) receiveRoot.findViewById(R.id.sec_badge)).setText("2"); ((TextView) receiveRoot.findViewById(R.id.sec_title)).setText(R.string.k2go_cx_share_step_receive); + codeLabel = root.findViewById(R.id.k2go_code_label); + codeBlock = root.findViewById(R.id.k2go_code_block); + codeText = root.findViewById(R.id.k2go_code_text); + root.findViewById(R.id.k2go_code_copy).setOnClickListener(v -> CodeText.copy(v, invitePayload)); + root.findViewById(R.id.k2go_code_share).setOnClickListener(v -> CodeText.share(requireContext(), invitePayload)); + transportRow = root.findViewById(R.id.k2go_cxs_transport); transportHotspot = root.findViewById(R.id.k2go_cxs_transport_hotspot); transportWifi = root.findViewById(R.id.k2go_cxs_transport_wifi); @@ -179,6 +191,7 @@ private void renderInvite() { } transportRow.setVisibility(View.GONE); waiting.setVisibility(View.GONE); + showInviteText(null); return; } @@ -230,6 +243,16 @@ private void renderInvite() { secReceive.setFallback(requireContext(), null); waiting.setVisibility(View.VISIBLE); } + showInviteText(invite); + } + + /** Show the invite as copyable text under the QR, or hide the block when there is no invite. */ + private void showInviteText(@Nullable String invite) { + invitePayload = invite != null ? invite : ""; + codeText.setText(invitePayload); + int vis = invite != null ? View.VISIBLE : View.GONE; + codeLabel.setVisibility(vis); + codeBlock.setVisibility(vis); } /** Pick the address the receive QR carries and repaint the strip (Connect/Clone mode pattern). */ @@ -251,6 +274,7 @@ private void showStatus(String text) { receiveRoot.setVisibility(View.GONE); transportRow.setVisibility(View.GONE); waiting.setVisibility(View.GONE); + showInviteText(null); } private void showSections() { diff --git a/controller/app/src/main/java/org/appdevforall/k2go/redesign/CloneFragment.java b/controller/app/src/main/java/org/appdevforall/k2go/redesign/CloneFragment.java index 760e3f791..236053fea 100644 --- a/controller/app/src/main/java/org/appdevforall/k2go/redesign/CloneFragment.java +++ b/controller/app/src/main/java/org/appdevforall/k2go/redesign/CloneFragment.java @@ -1,7 +1,5 @@ package org.appdevforall.k2go.redesign; -import android.content.ClipData; -import android.content.ClipboardManager; import android.content.Context; import android.content.Intent; import android.graphics.Color; @@ -224,8 +222,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c sizeContent = v.findViewById(R.id.k2go_clone_size_content); sizeTotal = v.findViewById(R.id.k2go_clone_size_total); receiveBox = v.findViewById(R.id.k2go_clone_receive_box); - paste = v.findViewById(R.id.k2go_clone_paste); - receiveStart = v.findViewById(R.id.k2go_clone_receive_start); + paste = v.findViewById(R.id.k2go_code_paste); + receiveStart = v.findViewById(R.id.k2go_code_use); rcvSteps = v.findViewById(R.id.k2go_rcv_steps); rcvCaption = v.findViewById(R.id.k2go_rcv_caption); rcvIntro = v.findViewById(R.id.k2go_rcv_intro); @@ -235,8 +233,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c rcvSkip = v.findViewById(R.id.k2go_rcv_skip); rcvSkipHint = v.findViewById(R.id.k2go_rcv_skiphint); rcvCamNote = v.findViewById(R.id.k2go_rcv_camnote); - rcvShowPaste = v.findViewById(R.id.k2go_rcv_showpaste); - pasteBlock = v.findViewById(R.id.k2go_rcv_pasteblock); + rcvShowPaste = v.findViewById(R.id.k2go_code_showpaste); + pasteBlock = v.findViewById(R.id.k2go_code_pasteblock); rcvIncompat = v.findViewById(R.id.k2go_rcv_incompat); incompatWhy = v.findViewById(R.id.k2go_rcv_incompat_why); incompatWhyText = v.findViewById(R.id.k2go_rcv_incompat_whytext); @@ -282,11 +280,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c confirmFresh = v.findViewById(R.id.k2go_rcv_confirm_fresh); v.findViewById(R.id.k2go_rcv_confirm_go).setOnClickListener(x -> startReceiveTransfer()); v.findViewById(R.id.k2go_rcv_confirm_cancel).setOnClickListener(x -> { syncVm.cancelProbe(); renderReceive(); }); - showcode = v.findViewById(R.id.k2go_clone_showcode); - codeblock = v.findViewById(R.id.k2go_clone_codeblock); - codetext = v.findViewById(R.id.k2go_clone_codetext); - copyBtn = v.findViewById(R.id.k2go_clone_copy); - shareBtn = v.findViewById(R.id.k2go_clone_share); + showcode = v.findViewById(R.id.k2go_code_label); + codeblock = v.findViewById(R.id.k2go_code_block); + codetext = v.findViewById(R.id.k2go_code_text); + copyBtn = v.findViewById(R.id.k2go_code_copy); + shareBtn = v.findViewById(R.id.k2go_code_share); // ADFA-5154: the Get-app QR lives inline on Page 1 (secGetApp); "Can't scan? Share another way" // hands the installed APK to the Android share sheet. v.findViewById(R.id.k2go_sendapp_share).setOnClickListener(x -> shareApkViaSheet()); @@ -306,15 +304,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c render(); }); // ADFA-5236: no reveal toggle — the code is shown always under a fixed label (see showCodeAsText). - copyBtn.setOnClickListener(x -> { - ClipboardManager cm = (ClipboardManager) requireContext().getSystemService(Context.CLIPBOARD_SERVICE); - if (cm != null) cm.setPrimaryClip(ClipData.newPlainText("K2Go transfer code", currentPayload)); - Toast.makeText(requireContext(), getString(R.string.k2go_clone_toast_code_copied), Toast.LENGTH_SHORT).show(); - }); - shareBtn.setOnClickListener(x -> { - Intent i = new Intent(Intent.ACTION_SEND).setType("text/plain").putExtra(Intent.EXTRA_TEXT, currentPayload); - startActivity(Intent.createChooser(i, getString(R.string.k2go_clone_chooser_send_code))); - }); + copyBtn.setOnClickListener(x -> CodeText.copy(x, currentPayload)); + shareBtn.setOnClickListener(x -> CodeText.share(requireContext(), currentPayload)); receiveStart.setOnClickListener(x -> onReceiveStart()); cancel.setOnClickListener(x -> onReceiveCancel()); @@ -1150,10 +1141,10 @@ private void renderReceive() { rcvIncompat.setVisibility(View.VISIBLE); incompatWhyText.setVisibility(incompatWhyOpen ? View.VISIBLE : View.GONE); incompatWhy.setText(R.string.k2go_clone_why_incompat); - setExpandChevron(incompatWhy, incompatWhyOpen, R.color.k2go_warn_ink); + CodeText.setExpandChevron(incompatWhy, incompatWhyOpen, R.color.k2go_warn_ink); incompatTechText.setVisibility(incompatTechOpen ? View.VISIBLE : View.GONE); incompatTech.setText(R.string.k2go_clone_technical_details); - setExpandChevron(incompatTech, incompatTechOpen, R.color.k2go_muted); + CodeText.setExpandChevron(incompatTech, incompatTechOpen, R.color.k2go_muted); incompatTechText.setText(getString(R.string.k2go_clone_tech_arch, bitsLabel(archBits()), bitsLabel(incompatHostBits))); return; } @@ -1176,25 +1167,11 @@ private void renderReceive() { rcvCamNote.setVisibility(View.GONE); rcvShowPaste.setVisibility(atJoin ? View.GONE : View.VISIBLE); rcvShowPaste.setText(R.string.k2go_clone_scan_enter_text); - setExpandChevron(rcvShowPaste, pasteExpanded, R.color.k2go_teal); + CodeText.setExpandChevron(rcvShowPaste, pasteExpanded, R.color.k2go_teal); pasteBlock.setVisibility((!atJoin && pasteExpanded) ? View.VISIBLE : View.GONE); renderExitZone(); // ADFA-5155: the success-exit status band at the bottom of step 2 } - /** ADFA-5304: Material 3 expand/collapse affordance — one trailing icon that toggles state - * (expand_more when closed, expand_less when open), tinted to the row's role colour. */ - private void setExpandChevron(android.widget.TextView tv, boolean open, int colorRes) { - android.graphics.drawable.Drawable d = androidx.core.content.ContextCompat.getDrawable( - requireContext(), open ? R.drawable.ic_expand_less : R.drawable.ic_expand_more); - if (d != null) { - d = d.mutate(); - androidx.core.graphics.drawable.DrawableCompat.setTint(d, - androidx.core.content.ContextCompat.getColor(requireContext(), colorRes)); - } - tv.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, d, null); - tv.setCompoundDrawablePadding((int) (6 * getResources().getDisplayMetrics().density)); - } - // ---------------------------------------------------------- ADFA-5155: success-exit service wait /** The status band under step 2: "starting services…" -> (if slow) offer a re-scan -> "Opening…" countdown. */ diff --git a/controller/app/src/main/java/org/appdevforall/k2go/redesign/CodeText.java b/controller/app/src/main/java/org/appdevforall/k2go/redesign/CodeText.java new file mode 100644 index 000000000..10164dc07 --- /dev/null +++ b/controller/app/src/main/java/org/appdevforall/k2go/redesign/CodeText.java @@ -0,0 +1,64 @@ +/* + * ============================================================================ + * Name : CodeText.java + * Author : AppDevForAll + * Copyright : Copyright (c) 2026 AppDevForAll + * Description : The "code as text" path shared by Clone and Content Exchange: copy or share the + * sender's QR payload, and the expand chevron of the receiver's paste link. + * Binds the views of view_k2go_code_text / view_k2go_code_paste. + * ============================================================================ + */ +package org.appdevforall.k2go.redesign; + +import android.content.ClipData; +import android.content.ClipboardManager; +import android.content.Context; +import android.content.Intent; +import android.graphics.drawable.Drawable; +import android.view.View; +import android.widget.TextView; + +import androidx.core.content.ContextCompat; +import androidx.core.graphics.drawable.DrawableCompat; + +import com.google.android.material.snackbar.Snackbar; + +import org.appdevforall.k2go.R; +import org.appdevforall.k2go.util.SnackbarDuration; + +public final class CodeText { + + private CodeText() { + } + + /** Copy the payload to the clipboard and confirm with a snackbar on {@code anchor}. */ + public static void copy(View anchor, String payload) { + Context ctx = anchor.getContext(); + ClipboardManager cm = (ClipboardManager) ctx.getSystemService(Context.CLIPBOARD_SERVICE); + if (cm != null) { + cm.setPrimaryClip(ClipData.newPlainText("K2Go transfer code", payload)); + } + String msg = ctx.getString(R.string.k2go_clone_toast_code_copied); + Snackbar.make(anchor, msg, SnackbarDuration.millisForText(msg)).show(); + } + + /** Hand the payload to the Android share sheet (chat, email, a remote session). */ + public static void share(Context ctx, String payload) { + Intent i = new Intent(Intent.ACTION_SEND).setType("text/plain").putExtra(Intent.EXTRA_TEXT, payload); + ctx.startActivity(Intent.createChooser(i, ctx.getString(R.string.k2go_clone_chooser_send_code))); + } + + /** ADFA-5304: Material 3 expand/collapse affordance (the paste link and Clone's other disclosure + * rows): one trailing icon, expand_more when closed and expand_less when open, tinted to the + * row's role colour. */ + public static void setExpandChevron(TextView tv, boolean open, int colorRes) { + Context ctx = tv.getContext(); + Drawable d = ContextCompat.getDrawable(ctx, open ? R.drawable.ic_expand_less : R.drawable.ic_expand_more); + if (d != null) { + d = d.mutate(); + DrawableCompat.setTint(d, ContextCompat.getColor(ctx, colorRes)); + } + tv.setCompoundDrawablesRelativeWithIntrinsicBounds(null, null, d, null); + tv.setCompoundDrawablePadding((int) (6 * ctx.getResources().getDisplayMetrics().density)); + } +} diff --git a/controller/app/src/main/res/drawable/k2go_field_bg.xml b/controller/app/src/main/res/drawable/k2go_field_bg.xml new file mode 100644 index 000000000..dabaadcb7 --- /dev/null +++ b/controller/app/src/main/res/drawable/k2go_field_bg.xml @@ -0,0 +1,8 @@ + + + + + + + diff --git a/controller/app/src/main/res/layout/fragment_k2go_clone.xml b/controller/app/src/main/res/layout/fragment_k2go_clone.xml index b6920429a..41eb76a42 100644 --- a/controller/app/src/main/res/layout/fragment_k2go_clone.xml +++ b/controller/app/src/main/res/layout/fragment_k2go_clone.xml @@ -174,27 +174,7 @@ - - - - - - - - - - + @@ -255,21 +235,7 @@ android:gravity="center" android:layout_marginTop="10dp" android:text="@string/k2go_clone_camera_q" android:textColor="@color/k2go_muted" android:textAppearance="?attr/textAppearanceBodySmall" android:visibility="gone" /> - - - - -