Merge pull request #542 from appdevforall/refactor/K2GO-385-pill-roles-detail

K2GO-385 refactor(ui): metadata tags + status badges in the detail screens (PR3b)

Author: luisguzman-adfa

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

@@ -45,7 +45,7 @@ public class DashboardDetailFragment extends Fragment {
 
     private final Handler main = new Handler(Looper.getMainLooper());
     private ViewGroup chips;   // FlowLayout in XML — typed as ViewGroup so it wraps chips to 2 lines
-    private TextView statusChip;   // ADFA-5026: live "Up to date / Update available" pill (restyled in place)
+    private LinearLayout statusChip;   // K2GO-385 (PR3): live status badge (dot+text), restyled in place
     private TextView versionChip;  // ADFA-5051: "v<version>" chip, updated in place after a live update
     private Button rebuild;        // de-emphasized when already on the latest
     private TextView rebuildHint;  // "no rebuild needed" note, shown only when on the latest
@@ -103,13 +103,16 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         ((TextView) root.findViewById(R.id.k2go_moddet_desc)).setText(R.string.k2go_dash_detail_desc);
 
         // Meta chips, in order: version (prepended live) | update status (live) | REST API | System core.
-        // ADFA-5026: the status chip starts at index 0 so that when the version chip prepends at 0 it
-        // lands right after the version. "Runs offline" is replaced by the update-status pill.
         chips = root.findViewById(R.id.k2go_moddet_chips);
-        statusChip = K2GoChip.create(requireContext(), getString(R.string.k2go_dash_chip_checking), R.color.k2go_muted);
-        chips.addView(statusChip);
-        chips.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_dash_chip_rest), R.color.k2go_teal));
-        chips.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_dash_chip_core), R.color.k2go_teal));
+        // K2GO-385 (PR3): the live lifecycle state is a status badge (dot+text, semantic) on its OWN line
+        // below the metadata; version / REST API / System core are neutral metadata tags in the chip row
+        // (colour there is noise -- the metadata colour rule). The version chip prepends to the chip row.
+        ViewGroup statusRow = root.findViewById(R.id.k2go_moddet_status);
+        statusRow.setVisibility(View.VISIBLE);
+        statusChip = K2GoStatusBadge.create(requireContext(), getString(R.string.k2go_dash_chip_checking), R.color.k2go_muted);
+        statusRow.addView(statusChip);
+        chips.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_dash_chip_rest)));
+        chips.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_dash_chip_core)));
         fetchVersionChip();
 
         ((TextView) root.findViewById(R.id.k2go_moddet_includes_body)).setText(R.string.k2go_dash_includes);
@@ -188,13 +191,13 @@ private void applyCardState(DashboardCardState s) {
         if (statusChip != null) {
             switch (s.kind()) {
                 case OFFLINE:
-                    K2GoChip.style(statusChip, getString(R.string.k2go_dash_no_connection), R.color.k2go_muted); break;
+                    K2GoStatusBadge.style(statusChip, getString(R.string.k2go_dash_no_connection), R.color.k2go_muted); break;
                 case CHECKING:
-                    K2GoChip.style(statusChip, getString(R.string.k2go_dash_chip_checking), R.color.k2go_muted); break;
+                    K2GoStatusBadge.style(statusChip, getString(R.string.k2go_dash_chip_checking), R.color.k2go_muted); break;
                 case UP_TO_DATE:
-                    K2GoChip.style(statusChip, getString(R.string.k2go_dash_chip_uptodate), R.color.k2go_leaf); break;
+                    K2GoStatusBadge.style(statusChip, getString(R.string.k2go_dash_chip_uptodate), R.color.k2go_leaf); break;
                 case UPDATE_AVAILABLE:
-                    K2GoChip.style(statusChip, getString(R.string.k2go_dash_chip_update), R.color.k2go_amber); break;
+                    K2GoStatusBadge.style(statusChip, getString(R.string.k2go_dash_chip_update), R.color.k2go_amber_text); break;   // K2GO-385: amber_text (AA) + consistent with the other amber statuses
             }
             statusChip.setVisibility(View.VISIBLE);
         }
@@ -418,10 +421,10 @@ private void fetchVersionChip() {
             main.post(() -> {
                 if (!isAdded() || chips == null || ver == null) return;
                 if (versionChip == null) {
-                    versionChip = K2GoChip.create(requireContext(), "v" + ver, R.color.k2go_teal);
+                    versionChip = K2GoChip.create(requireContext(), "v" + ver);
                     chips.addView(versionChip, 0);
                 } else {
-                    K2GoChip.style(versionChip, "v" + ver, R.color.k2go_teal);
+                    K2GoChip.style(versionChip, "v" + ver);
                 }
             });
         });

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

@@ -3,10 +3,13 @@
  * Name        : K2GoChip.java
  * Author      : AppDevForAll
  * Copyright   : Copyright (c) 2026 AppDevForAll
- * Description : K2GO-385. The shared outlined status/meta chip, so the same small pill is defined
- *               ONCE instead of being copied per fragment. A transparent, rounded, colored-outline
- *               Material 3 LabelMedium pill (ADFA-4958 §5.4: a filled teal-on-teal chip was
- *               invisible, hence the outline). Pure UI; no domain/data dependencies.
+ * Description : K2GO-385. The shared metadata TAG (pill-roles design decision, PR3): a quiet,
+ *               read-only, non-interactive label for facts -- version, size, "REST API", "System
+ *               core" -- and coloured trait badges that carry valence ("Runs offline" = leaf). An
+ *               8dp-corner, monospace, transparent-outline Material 3 tag; the 8dp corner + mono +
+ *               no-dot mark it as data, distinct from the dot+text status (K2GoStatusBadge) and the
+ *               stadium action button. Colour is neutral by default, semantic only for valence
+ *               (the metadata colour rule). Pure UI; no domain/data dependencies.
  * ============================================================================
  */
 package org.appdevforall.k2go.redesign;
@@ -20,10 +23,26 @@
 import androidx.annotation.ColorRes;
 import androidx.core.content.ContextCompat;
 
+import org.appdevforall.k2go.R;
+
 public final class K2GoChip {
 
     private K2GoChip() {}
 
+    /** The neutral tag colour. Metadata is neutral by default (the metadata colour rule); pass an
+     *  explicit colour to the 3-arg overloads only for a valence trait (e.g. leaf "Runs offline"). */
+    @ColorRes private static final int NEUTRAL = R.color.k2go_muted;
+
+    /** A neutral metadata tag (version, size, "REST API", "System core") -- the common case. */
+    public static TextView create(Context context, CharSequence text) {
+        return create(context, text, NEUTRAL);
+    }
+
+    /** Re-apply a neutral metadata tag's text/colour in place. */
+    public static void style(TextView chip, CharSequence text) {
+        style(chip, text, NEUTRAL);
+    }
+
     /**
      * Build a chip laid out for a horizontal meta-chip row: WRAP content, an 8dp end margin, and
      * the shared outline applied. Callers add it to a {@link LinearLayout} row.
@@ -32,6 +51,7 @@ public static TextView create(Context context, CharSequence text, @ColorRes int
         float d = context.getResources().getDisplayMetrics().density;
         TextView t = new TextView(context);
         t.setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_LabelMedium);
+        t.setTypeface(android.graphics.Typeface.MONOSPACE);   // reads as a quiet data tag (the "mono" cue)
         int hp = Math.round(10 * d), vp = Math.round(5 * d);
         t.setPadding(hp, vp, hp, vp);
         LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
@@ -54,7 +74,7 @@ public static void style(TextView chip, CharSequence text, @ColorRes int colorRe
         GradientDrawable bg = new GradientDrawable();
         bg.setShape(GradientDrawable.RECTANGLE);
         bg.setColor(Color.TRANSPARENT);
-        bg.setCornerRadius(11 * d);
+        bg.setCornerRadius(8 * d);   // metadata tag corner (was 11dp) -- 8dp signals "tag", not a stadium pill
         bg.setStroke(Math.max(1, Math.round(1.4f * d)), color);
         chip.setBackground(bg);
     }

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

@@ -50,6 +50,13 @@ public static LinearLayout create(Context context, CharSequence text, @ColorRes
         label.setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_LabelMedium);
         badge.addView(label);
 
+        // Self-space for a horizontal chip/flow row (8dp end gap, like K2GoChip); a caller that needs a
+        // different margin passes its own LayoutParams to addView, which overrides this.
+        LinearLayout.LayoutParams lp = new LinearLayout.LayoutParams(
+                LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT);
+        lp.rightMargin = Math.round(8 * d);
+        badge.setLayoutParams(lp);
+
         style(badge, text, colorRes);
         return badge;
     }

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

@@ -70,9 +70,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         String sizeText = (sizeRes != 0) ? getString(sizeRes)
                 : (bytes >= 0) ? "\u2248 " + org.appdevforall.k2go.util.ByteFormatter.toHuman(bytes)
                 : "\u2248 NA";
-        chips.addView(K2GoChip.create(requireContext(), sizeText, R.color.k2go_teal));
+        // K2GO-385 (PR3): size / version are neutral metadata tags (colour is noise); "Runs offline" is a
+        // leaf trait (a capability that carries valence). The lifecycle status below is a dot+text badge.
+        chips.addView(K2GoChip.create(requireContext(), sizeText));
         String ver = ModuleCards.version(c.key());
-        if (ver != null) chips.addView(K2GoChip.create(requireContext(), "v" + ver, R.color.k2go_teal));
+        if (ver != null) chips.addView(K2GoChip.create(requireContext(), "v" + ver));
         chips.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_mod_runs_offline), R.color.k2go_leaf));
         if (ModuleCards.isDemo(c.key())) chips.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_mod_demo), R.color.k2go_amber_text));   // ADFA-4958
 
@@ -97,7 +99,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         // than start visible, because showing them and then taking them away is how a user ends
         // up tapping one in the gap.
         final Button installNowBtn = root.findViewById(R.id.k2go_moddet_install_now);
-        final ViewGroup chipRow = chips;
+        final ViewGroup statusRow = root.findViewById(R.id.k2go_moddet_status);
         installNowBtn.setVisibility(View.GONE);
 
         Button schedule = root.findViewById(R.id.k2go_moddet_schedule);
@@ -123,7 +125,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                 if (!isAdded()) return;
                 if (verdict == org.appdevforall.k2go.system.domain.SystemVerdict.State.NO_SYSTEM
                         || verdict == org.appdevforall.k2go.system.domain.SystemVerdict.State.DAMAGED) {
-                    chipRow.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_state_no_system), R.color.k2go_amber_text));
+                    addStatus(statusRow, K2GoStatusBadge.create(requireContext(), getString(R.string.k2go_state_no_system), R.color.k2go_amber_text));
                     installNowBtn.setText(R.string.k2go_home_recover);
                     installNowBtn.setOnClickListener(v -> SetupLibraryActivity.recover(requireContext()));
                     installNowBtn.setVisibility(View.VISIBLE);
@@ -134,11 +136,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                         || verdict == org.appdevforall.k2go.system.domain.SystemVerdict.State.CLONE_SHARING) {
                     // ADFA-5312: a system op is in progress — the system is present but mid-setup and the
                     // server is down. Don't offer Install or Recover into it; just say it's busy.
-                    chipRow.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_home_installing), R.color.k2go_amber_text));
+                    addStatus(statusRow, K2GoStatusBadge.create(requireContext(), getString(R.string.k2go_home_installing), R.color.k2go_amber_text));
                     return;
                 }
                 if (isInstalled) {
-                    chipRow.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_mod_phase_done), R.color.k2go_leaf));
+                    addStatus(statusRow, K2GoStatusBadge.create(requireContext(), getString(R.string.k2go_mod_phase_done), R.color.k2go_leaf));
                     return;   // nothing to offer: a module cannot be uninstalled or reinstalled here
                 }
                 // ADFA-4898: this module's runrole failed in the last finished batch — the SAME per-module
@@ -151,7 +153,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                 // Retry then bounces to the hub, which observes the queue live; this detail is a one-shot
                 // snapshot (no observer) and would otherwise sit on a stale "Couldn't install".
                 if (org.appdevforall.k2go.install.presentation.ModuleQueueRepository.get().current().didFail(c.key())) {
-                    chipRow.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_mod_phase_failed), R.color.k2go_clay));
+                    addStatus(statusRow, K2GoStatusBadge.create(requireContext(), getString(R.string.k2go_mod_phase_failed), R.color.k2go_clay));
                     schedule.setText(R.string.k2go_home_retry);
                     // Shared, busy-gated retry (same action the live progress card fires). On a real start,
                     // land on the install index — the same destination as a normal install (openModuleIndex)
@@ -170,7 +172,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
                     return;
                 }
                 if (unknown) {
-                    chipRow.addView(K2GoChip.create(requireContext(), getString(R.string.k2go_state_no_answer),
+                    addStatus(statusRow, K2GoStatusBadge.create(requireContext(), getString(R.string.k2go_state_no_answer),
                             R.color.k2go_amber_text));
                     return;   // no grounds to offer work either way
                 }
@@ -206,4 +208,11 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         return root;
     }
 
+    /** K2GO-385 (PR3): a lifecycle status badge goes on its own row (k2go_moddet_status), which stays
+     *  GONE until one is added -- so a dot+text status never shares the boxed-metadata chip row. */
+    private static void addStatus(ViewGroup row, View badge) {
+        row.setVisibility(View.VISIBLE);
+        row.addView(badge);
+    }
+
 }

controller/app/src/main/res/layout/fragment_k2go_module_detail.xml

@@ -66,6 +66,16 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="12dp" />
 
+            <!-- K2GO-385 (PR3): the lifecycle status sits on its OWN line below the metadata tags, so a
+                 dot+text status badge never shares a row (and a centre axis) with the boxed metadata tags.
+                 GONE until a status is added (some module states show none). -->
+            <org.appdevforall.k2go.redesign.FlowLayout
+                android:id="@+id/k2go_moddet_status"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="8dp"
+                android:visibility="gone" />
+
             <TextView
                 android:id="@+id/k2go_moddet_desc"
                 android:layout_width="match_parent"