Merge pull request #541 from appdevforall/refactor/K2GO-385-pill-roles-modulehub

K2GO-385 refactor(ui): dissolve the overloaded statePill into status badge + action buttons (ModuleHub)

Author: luisguzman-adfa

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

@@ -0,0 +1,72 @@
+/*
+ * ============================================================================
+ * Name        : K2GoStatusBadge.java
+ * Author      : AppDevForAll
+ * Copyright   : Copyright (c) 2026 AppDevForAll
+ * Description : K2GO-385 (PR3). The shared read-only status badge: a semantic-coloured dot + label,
+ *               the pattern LibraryHomeFragment already uses on the home cards. Per the pill-roles
+ *               design decision a lifecycle state (Installed / Not installed / Failed / Scheduled)
+ *               reads as a STATUS — a dot + text, no ripple — distinct on purpose from an action
+ *               button (a tap target) and a metadata tag (neutral facts, see K2GoChip). Built once
+ *               here instead of the overloaded ModuleHubFragment.statePill it replaces. Pure UI; no
+ *               domain/data dependencies.
+ * ============================================================================
+ */
+package org.appdevforall.k2go.redesign;
+
+import android.content.Context;
+import android.graphics.drawable.GradientDrawable;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import androidx.annotation.ColorRes;
+import androidx.core.content.ContextCompat;
+
+public final class K2GoStatusBadge {
+
+    private K2GoStatusBadge() {}
+
+    /**
+     * Build a [dot + text] status badge for a horizontal row: a 9dp semantic-coloured dot, a 6dp
+     * gap, and a Material 3 LabelMedium label in the same colour (dot and text match at AA). Not
+     * clickable — a status, not an action. The caller sets the badge's own LayoutParams via
+     * {@code addView(badge, params)}.
+     */
+    public static LinearLayout create(Context context, CharSequence text, @ColorRes int colorRes) {
+        float d = context.getResources().getDisplayMetrics().density;
+        LinearLayout badge = new LinearLayout(context);
+        badge.setOrientation(LinearLayout.HORIZONTAL);
+        badge.setGravity(Gravity.CENTER_VERTICAL);
+
+        View dot = new View(context);
+        int size = Math.round(9 * d);
+        LinearLayout.LayoutParams dp = new LinearLayout.LayoutParams(size, size);
+        dp.rightMargin = Math.round(6 * d);
+        badge.addView(dot, dp);
+
+        TextView label = new TextView(context);
+        label.setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_LabelMedium);
+        badge.addView(label);
+
+        style(badge, text, colorRes);
+        return badge;
+    }
+
+    /**
+     * (Re)apply the badge's text and semantic colour in place — recolours the dot fill and the
+     * label without rebuilding the view (mirrors {@link K2GoChip#style} for a live-updating status).
+     */
+    public static void style(LinearLayout badge, CharSequence text, @ColorRes int colorRes) {
+        int color = ContextCompat.getColor(badge.getContext(), colorRes);
+        View dot = badge.getChildAt(0);
+        TextView label = (TextView) badge.getChildAt(1);
+        GradientDrawable circle = new GradientDrawable();
+        circle.setShape(GradientDrawable.OVAL);
+        circle.setColor(color);
+        dot.setBackground(circle);
+        label.setText(text);
+        label.setTextColor(color);
+    }
+}

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

@@ -33,6 +33,8 @@
 import androidx.core.content.ContextCompat;
 import androidx.fragment.app.Fragment;
 
+import com.google.android.material.button.MaterialButton;
+
 import org.appdevforall.k2go.R;
 import org.appdevforall.k2go.config.BoxEndpoints;
 import org.appdevforall.k2go.util.AppExecutors;
@@ -98,24 +100,6 @@ public class ModuleHubFragment extends Fragment {
     private LinearLayout host;
     private Button proceed;
 
-    /** ADFA-4958 §5.2: outlined state pill (transparent fill, state-colored 1.4dp stroke, full radius). */
-    private TextView statePill(String text, int colorRes) {
-        int color = ContextCompat.getColor(requireContext(), colorRes);
-        TextView pill = new TextView(requireContext());
-        pill.setText(text);
-        pill.setTextColor(color);
-        pill.setTextAppearance(com.google.android.material.R.style.TextAppearance_Material3_LabelMedium);
-        pill.setPadding(px(10), px(3), px(10), px(3));
-        android.graphics.drawable.GradientDrawable bg = new android.graphics.drawable.GradientDrawable();
-        bg.setShape(android.graphics.drawable.GradientDrawable.RECTANGLE);
-        bg.setColor(android.graphics.Color.TRANSPARENT);
-        bg.setCornerRadius(px(20));
-        int strokeW = Math.max(1, Math.round(1.4f * getResources().getDisplayMetrics().density));
-        bg.setStroke(strokeW, color);
-        pill.setBackground(bg);
-        return pill;
-    }
-
     private int px(int dp) { return Math.round(dp * getResources().getDisplayMetrics().density); }
 
     private static boolean is64Bit() {
@@ -393,8 +377,11 @@ private void addHiddenSection() {
             col.addView(sub);
             row.addView(col, new LinearLayout.LayoutParams(0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f));
 
-            TextView restore = statePill(getString(R.string.k2go_mod_restore), R.color.k2go_teal);   // ADFA-4958 §5.7: outlined teal pill
-            restore.setPadding(px(14), px(6), px(14), px(6));
+            // K2GO-385 (PR3): an action is a real M3 button (filled primary stadium), not an outlined
+            // pill — its shape signals "tappable" (the pill-roles design decision, board §"THE FOUR ROLES").
+            MaterialButton restore = new MaterialButton(
+                    new android.view.ContextThemeWrapper(requireContext(), R.style.ThemeOverlay_K2Go_Button_Filled), null);
+            restore.setText(R.string.k2go_mod_restore);
             restore.setOnClickListener(v -> { HiddenModules.remove(requireContext(), key); buildCards(); });
             row.addView(restore);
             host.addView(row);
@@ -486,7 +473,9 @@ private View cardRow(final ModuleCards.Card c, final boolean isInstalled,
         // already there cannot meaningfully be waiting to be installed, and if a stale wishlist
         // entry survived an install, saying "Scheduled" over it would be the older lie again.
         boolean scheduled = !isInstalled && !unknown && ModuleWishlist.contains(requireContext(), c.key());
-        TextView pill = statePill(
+        // K2GO-385 (PR3): a lifecycle state is a read-only STATUS -- dot + text, semantic colour, no
+        // ripple (the shared K2GoStatusBadge) -- not an outlined pill that reads like a button.
+        LinearLayout pill = K2GoStatusBadge.create(requireContext(),
                 isInstalled ? getString(R.string.k2go_mod_phase_done)
                         : failed ? getString(R.string.k2go_mod_phase_failed)
                                 : unknown ? getString(R.string.k2go_state_no_answer)
@@ -544,8 +533,11 @@ private void addSystemDashboardCard() {
             }
         });
 
-        TextView rebuild = statePill(getString(R.string.k2go_dash_rebuild), R.color.k2go_teal);
-        rebuild.setPadding(px(14), px(6), px(14), px(6));
+        // K2GO-385 (PR3): the Rebuild/Update action is a real M3 button (filled primary stadium), not
+        // an outlined pill. Its label still toggles Rebuild<->Update via DashboardCardStatus below.
+        MaterialButton rebuild = new MaterialButton(
+                new android.view.ContextThemeWrapper(requireContext(), R.style.ThemeOverlay_K2Go_Button_Filled), null);
+        rebuild.setText(R.string.k2go_dash_rebuild);
         // ADFA-5339: the confirm dialog matches the pill — pass the last-known "update available".
         final boolean[] up = {false};
         rebuild.setOnClickListener(v -> DashboardRebuild.confirmAndStart(this, host, up[0]));