Merge pull request #539 from appdevforall/feat/K2GO-385-dialog-consolidation

K2GO-385 feat(ui): finish the BrandDialog consolidation — checkbox slot, Stop-update collapse, app button system

Author: luisguzman-adfa

controller/app/src/main/java/org/appdevforall/k2go/redesign/BackupJobFragment.java

@@ -351,52 +351,22 @@ private void showBackupCancelDialog() {
      */
     private void showDestructiveCancelDialog() {
         if (!isAdded()) return;
-        final float density = getResources().getDisplayMetrics().density;
-        // ADFA-5339 pattern: a MaterialCheckBox as a dialog's custom view sits flush-left; a holder padded by
-        // dialogPreferredPadding (the title/message inset) with the checkbox's own left padding at 0 lines it
-        // up with the text above.
-        final com.google.android.material.checkbox.MaterialCheckBox box =
-                new com.google.android.material.checkbox.MaterialCheckBox(requireContext());
-        box.setText(R.string.k2go_br_cancel_extract_ack);
-        box.setCompoundDrawablePadding(Math.round(8 * density));
-        final int pad = dialogContentPadding();
-        final android.widget.FrameLayout holder = new android.widget.FrameLayout(requireContext());
-        holder.setPadding(pad, Math.round(8 * density), pad, 0);
-        holder.addView(box);
-        final androidx.appcompat.app.AlertDialog d =
-                new com.google.android.material.dialog.MaterialAlertDialogBuilder(requireContext())
-                        .setTitle(R.string.k2go_br_cancel_title)
-                        .setMessage(R.string.k2go_br_cancel_extract_body)
-                        .setView(holder)
-                        .setPositiveButton(R.string.k2go_br_cancel_confirm, null)   // click set below to gate dismiss
-                        .setNegativeButton(R.string.k2go_br_cancel_keep, null)
-                        .show();
-        final android.widget.Button confirm = d.getButton(androidx.appcompat.app.AlertDialog.BUTTON_POSITIVE);
-        confirm.setTextColor(ContextCompat.getColor(requireContext(), R.color.btn_danger));   // same red as BrandDialog DESTRUCTIVE
-        // K2GO-384: keep the button ENABLED and validate on click -- an inert disabled button gives no
-        // feedback; a snackbar tells the user why nothing happened until they acknowledge.
-        confirm.setOnClickListener(v -> {
-            if (!box.isChecked()) {
-                Snackbars.make(requireActivity().findViewById(android.R.id.content),
-                        R.string.k2go_br_cancel_extract_need_ack).show();
-                return;
-            }
-            // K2GO-384: the destructive kill ends as FAILED with the "damaged" message (non-empty), so the
-            // terminal shows -- the user sees "the next launch will start recovery" (no CANCELLED short-circuit).
-            if (cancel != null) cancel.setEnabled(false);
-            sendToService(DeepOpService.ACTION_FORCE_CANCEL);
-            d.dismiss();
-        });
-    }
-
-    /** The dialog's horizontal content inset (title/message use it); a custom view must match it to line up
-     *  (ADFA-5339). */
-    private int dialogContentPadding() {
-        android.util.TypedValue tv = new android.util.TypedValue();
-        if (requireContext().getTheme().resolveAttribute(androidx.appcompat.R.attr.dialogPreferredPadding, tv, true)) {
-            return android.util.TypedValue.complexToDimensionPixelSize(tv.data, getResources().getDisplayMetrics());
-        }
-        return Math.round(24 * getResources().getDisplayMetrics().density);   // Material default
+        // K2GO-384: a checkbox-gated destructive confirm. The acknowledgement is required (the shared dialog
+        // blocks the RED confirm and shows the inline "please tick" note until it is checked); the red comes
+        // from BrandDialog's DESTRUCTIVE role.
+        new BrandDialog(requireContext())
+                .setTitle(R.string.k2go_br_cancel_title)
+                .setMessage(R.string.k2go_br_cancel_extract_body)
+                .setCheckbox(R.string.k2go_br_cancel_extract_ack, false)
+                .requireCheckbox(R.string.k2go_br_cancel_extract_need_ack)
+                .setDestructive(R.string.k2go_br_cancel_confirm, checked -> {
+                    // K2GO-384: the destructive kill ends as FAILED with the "damaged" message (non-empty), so
+                    // the terminal shows -- the user sees "the next launch will start recovery".
+                    if (cancel != null) cancel.setEnabled(false);
+                    sendToService(DeepOpService.ACTION_FORCE_CANCEL);
+                })
+                .setNegative(R.string.k2go_br_cancel_keep, null)
+                .show();
     }
 
     /** K2GO-384: Cancel is shown while the current pass is cancellable (PAUSABLE copy or ABORTABLE

controller/app/src/main/java/org/appdevforall/k2go/redesign/DashboardCancelConfirmActivity.java

@@ -20,9 +20,7 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.content.ContextCompat;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
-import org.appdevforall.k2go.R;
+import org.appdevforall.k2go.ui.dialog.BrandDialog;
 
 public final class DashboardCancelConfirmActivity extends AppCompatActivity {
 
@@ -31,16 +29,11 @@ public final class DashboardCancelConfirmActivity extends AppCompatActivity {
         // If the update already ended between tapping the notification and getting here, there is
         // nothing to cancel — just close without a dialog.
         if (!DashboardRebuildService.isRunning()) { finish(); return; }
-        new MaterialAlertDialogBuilder(this)
-                .setTitle(R.string.k2go_dash_cancel_confirm_title)
-                .setMessage(R.string.k2go_dash_cancel_confirm_msg)
-                .setNegativeButton(R.string.k2go_dash_cancel_confirm_keep, (d, w) -> finish())
-                .setPositiveButton(R.string.k2go_dash_cancel_confirm_stop, (d, w) -> {
-                    ContextCompat.startForegroundService(this, new Intent(this, DashboardRebuildService.class)
-                            .setAction(DashboardRebuildService.ACTION_CANCEL));
-                    finish();
-                })
-                .setOnCancelListener(d -> finish())   // tap-outside / back = keep updating
-                .show();
+        BrandDialog.Handle h = DashboardCancelDialog.show(this, () ->
+                ContextCompat.startForegroundService(getApplicationContext(),
+                        new Intent(getApplicationContext(), DashboardRebuildService.class)
+                                .setAction(DashboardRebuildService.ACTION_CANCEL)));
+        // Any dismissal — Stop, Keep updating, Back or a scrim tap — closes this windowless activity.
+        h.getDialog().setOnDismissListener(d -> finish());
     }
 }

controller/app/src/main/java/org/appdevforall/k2go/redesign/DashboardCancelDialog.java

@@ -0,0 +1,36 @@
+/*
+ * ============================================================================
+ * Name        : DashboardCancelDialog.java
+ * Author      : AppDevForAll
+ * Copyright   : Copyright (c) 2026 AppDevForAll
+ * Description : K2GO-385. The one "Stop the update?" confirm, shared by the in-card Cancel
+ *               (DashboardDetailFragment) and the notification path (DashboardCancelConfirmActivity)
+ *               so the same dialog is not built twice. Only the stop action differs, so it is passed
+ *               in; the dialog itself lives here once.
+ * ============================================================================
+ */
+package org.appdevforall.k2go.redesign;
+
+import android.content.Context;
+
+import org.appdevforall.k2go.R;
+import org.appdevforall.k2go.ui.dialog.BrandDialog;
+
+public final class DashboardCancelDialog {
+
+    private DashboardCancelDialog() {}
+
+    /**
+     * Show the shared "Stop the update?" confirm. {@code onStop} runs only on a positive answer;
+     * "Keep updating", Back and a scrim tap all just dismiss. Returns the {@link BrandDialog.Handle}
+     * so the notification activity can close itself on any dismissal.
+     */
+    public static BrandDialog.Handle show(Context ctx, Runnable onStop) {
+        return new BrandDialog(ctx)
+                .setTitle(R.string.k2go_dash_cancel_confirm_title)
+                .setMessage(R.string.k2go_dash_cancel_confirm_msg)
+                .setDestructive(R.string.k2go_dash_cancel_confirm_stop, () -> onStop.run())
+                .setNegative(R.string.k2go_dash_cancel_confirm_keep, null)
+                .show();
+    }
+}

controller/app/src/main/java/org/appdevforall/k2go/redesign/DashboardDetailFragment.java

@@ -332,12 +332,7 @@ private View buildUpdatingRow(Button rebuildBtn) {
     private void onCancelUpdate() {
         // ADFA-5339: stopping a live update is worth a confirm — the swap may be seconds away, and a
         // stray tap shouldn't abandon it. Only on a positive answer do we signal the server.
-        new com.google.android.material.dialog.MaterialAlertDialogBuilder(requireContext())
-                .setTitle(R.string.k2go_dash_cancel_confirm_title)
-                .setMessage(R.string.k2go_dash_cancel_confirm_msg)
-                .setNegativeButton(R.string.k2go_dash_cancel_confirm_keep, null)
-                .setPositiveButton(R.string.k2go_dash_cancel_confirm_stop, (d, w) -> signalCancel())
-                .show();
+        DashboardCancelDialog.show(requireContext(), this::signalCancel);
     }
 
     private void signalCancel() {

controller/app/src/main/java/org/appdevforall/k2go/redesign/DashboardRebuild.java

@@ -32,11 +32,10 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
-import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-
 import org.appdevforall.k2go.R;
 import org.appdevforall.k2go.install.presentation.InstallService;
 import org.appdevforall.k2go.system.domain.Operation;
+import org.appdevforall.k2go.ui.dialog.BrandDialog;
 import org.appdevforall.k2go.util.AppExecutors;
 import org.appdevforall.k2go.util.Snackbars;
 
@@ -59,41 +58,20 @@ public static void confirmAndStart(@NonNull Fragment host, @NonNull View anchor,
         }
         // ADFA-5339: a versionless "Update the Website" checkbox (default on) rides on the confirm. It
         // refreshes the served landing page in the same run — a SEPARATE, unversioned artifact, so it
-        // carries no version label. Built in code to leave the shared dialog usage untouched.
-        final com.google.android.material.checkbox.MaterialCheckBox siteBox =
-                new com.google.android.material.checkbox.MaterialCheckBox(ctx);
-        siteBox.setText(R.string.k2go_dash_update_site);
-        siteBox.setChecked(true);
-        siteBox.setCompoundDrawablePadding(Math.round(8 * ctx.getResources().getDisplayMetrics().density));
-        // Align the checkbox's left edge with the dialog's title/message, which are inset by
-        // dialogPreferredPadding — the custom view otherwise sits flush left. A container carries that
-        // inset so the checkbox's own left padding stays 0 and the box lines up with the text above.
-        int pad = dialogPadding(ctx);
-        android.widget.FrameLayout holder = new android.widget.FrameLayout(ctx);
-        holder.setPadding(pad, Math.round(8 * ctx.getResources().getDisplayMetrics().density), pad, 0);
-        holder.addView(siteBox);
+        // carries no version label.
         // ADFA-5339: the confirm matches the primary action — "Update" when a newer build exists,
         // "Rebuild" for a manual re-apply — so the dialog can't say "Rebuild" over an "Update" button.
-        new MaterialAlertDialogBuilder(ctx)
+        new BrandDialog(ctx)
                 .setTitle(updateAvailable ? R.string.k2go_dash_update_confirm_title
                                           : R.string.k2go_dash_rebuild_confirm_title)
                 .setMessage(R.string.k2go_dash_rebuild_confirm_msg)
-                .setView(holder)
-                .setNegativeButton(android.R.string.cancel, null)
-                .setPositiveButton(updateAvailable ? R.string.k2go_dash_update : R.string.k2go_dash_rebuild,
-                        (d, w) -> start(host, anchor, siteBox.isChecked()))
+                .setCheckbox(R.string.k2go_dash_update_site, true)
+                .setPositive(updateAvailable ? R.string.k2go_dash_update : R.string.k2go_dash_rebuild,
+                        BrandDialog.Role.PRIMARY, checked -> start(host, anchor, checked))
+                .setNegative(android.R.string.cancel, null)
                 .show();
     }
 
-    /** The dialog's horizontal content inset (title/message use it); the custom view must match it. */
-    private static int dialogPadding(Context ctx) {
-        android.util.TypedValue tv = new android.util.TypedValue();
-        if (ctx.getTheme().resolveAttribute(androidx.appcompat.R.attr.dialogPreferredPadding, tv, true)) {
-            return android.util.TypedValue.complexToDimensionPixelSize(tv.data, ctx.getResources().getDisplayMetrics());
-        }
-        return Math.round(24 * ctx.getResources().getDisplayMetrics().density);   // Material default
-    }
-
     /** ADFA-5051: route by the installed dash-node version. >= 1.2.0 updates live over REST; older
      *  installs take the proot rebuild once as a bridge to 1.2.0. The version read hits disk, so it
      *  runs off the main thread; the routing itself is posted back to the UI. */