fix: revert switching button to regular validate/back/return buttons, migrate to Java click listeners

app/build.gradle

@@ -10,8 +10,8 @@ android {
         applicationId "com.stock.pignon"
         minSdkVersion 17
         targetSdkVersion 36
-        versionCode 5
+        versionCode 6
-        versionName "0.5.0"
+        versionName "0.5.1"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

app/src/main/java/com/stock/pignon/CartViewHelper.java

@@ -22,16 +22,9 @@ import java.util.List;
 public class CartViewHelper {
 
     /**
-     * Short version for app resume : update without changing validate/back button state
+     * Refreshes cart UI by synchronizing the visual list with the current CartManager state
      */
     public static void updateCartView(LinearLayout cartList, Context context) {
-        updateCartView(cartList, context, false, false);
-    }
-
-    /**
-     * Full version with validate/back button management
-     */
-    public static void updateCartView(LinearLayout cartList, Context context, boolean updateButton, boolean isHome) {
         if (cartList == null) return;
 
         // Clean item lists
@@ -60,11 +53,6 @@ public class CartViewHelper {
             }
             updateTotalDisplay(context, totalMin, totalMax);
         }
-
-        // Update validate/back button
-        if (updateButton && context instanceof MainActivity) {
-            ((MainActivity) context).updateActionButton(isHome);
-        }
     }
 
     /**

app/src/main/java/com/stock/pignon/MainActivity.java

@@ -12,6 +12,7 @@ import android.widget.Button;
 import android.widget.GridLayout;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.FrameLayout;
 import android.widget.TextView;
 import android.os.Environment;
 import java.io.File;
@@ -35,7 +36,7 @@ public class MainActivity extends AppCompatActivity {
     // UI components
     private LinearLayout cartList;
     private LinearLayout homeLayout;
-    private LinearLayout categoryItemsLayout;
+    private FrameLayout categoryItemsLayout;
     private LinearLayout categoriesLayout;
     private GridLayout gridPieces;
     private ImageView mainImage;
@@ -93,7 +94,7 @@ public class MainActivity extends AppCompatActivity {
             server.start();
             String url = "http://" + getDeviceIP() + ":8080";
 
-            // On met l'URL directement dans le sous-titre de l'ActionBar
+            // Print URL in action bar for user
             if (getSupportActionBar() != null) {
                 getSupportActionBar().setSubtitle("Serveur en ligne : " + url + " - " + versionName);
             }
@@ -103,6 +104,24 @@ public class MainActivity extends AppCompatActivity {
                 getSupportActionBar().setSubtitle("Erreur serveur" + " - " + versionName);
             }
         }
+
+        // Back button (blue)
+        Button btnBack = findViewById(R.id.btnBackFromCategory);
+        if (btnBack != null) {
+            btnBack.setOnClickListener(v -> showHome());
+        }
+
+        // Empty button (red)
+        Button btnClear = findViewById(R.id.clearCartBtn);
+        if (btnClear != null) {
+            btnClear.setOnClickListener(v -> CartActionHelper.emptyCart(cartList, this));
+        }
+
+        // Validate button (green)
+        Button btnValidate = findViewById(R.id.validateCartBtn);
+        if (btnValidate != null) {
+            btnValidate.setOnClickListener(v -> CartActionHelper.validateCart(cartList, this));
+        }
     }
 
     @Override
@@ -194,8 +213,6 @@ public class MainActivity extends AppCompatActivity {
         homeLayout.setVisibility(View.GONE);
         categoryItemsLayout.setVisibility(View.VISIBLE);
 
-        updateActionButton(false);
-
         gridPieces.removeAllViews();
 
         // Calculate item width for a 4-column grid
@@ -265,8 +282,6 @@ public class MainActivity extends AppCompatActivity {
     public void showHome() {
         categoryItemsLayout.setVisibility(View.GONE);
         homeLayout.setVisibility(View.VISIBLE);
-
-        updateActionButton(true);
     }
 
     private void loadMainImage() {
@@ -274,31 +289,6 @@ public class MainActivity extends AppCompatActivity {
         ImageLoader.loadImage(mainImage, "_velo", 800,800);
     }
 
-    public void emptyCart(View view) {
-        CartActionHelper.emptyCart(cartList, this);
-    }
-
-    public void validateCart(View view) {
-        CartActionHelper.validateCart(cartList, this);
-    }
-
-    public void updateActionButton(boolean isHome) {
-        Button btn = findViewById(R.id.validateCartBtn);
-        if (btn == null) return;
-
-        if (isHome) {
-            // Home mode : validate button
-            btn.setText(getString(R.string.cart_validate_btn));
-            btn.setBackgroundColor(Color.parseColor("#43A047")); // Vert
-            btn.setOnClickListener(v -> validateCart(v));
-        } else {
-            // Category mode : back button
-            btn.setText(getString(R.string.cart_back_btn));
-            btn.setBackgroundColor(Color.parseColor("#1E88E5")); // Bleu
-            btn.setOnClickListener(v -> showHome());
-        }
-    }
-
     private int dpToPx(int dp) {
         return (int) TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_DIP, dp, getResources().getDisplayMetrics());
     }

app/src/main/res/layout/activity_main.xml

@@ -1,58 +1,72 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  activity_main.xml -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="horizontal"
-    android:background="#ffffff">
+    android:background="#ffffff"
+    android:baselineAligned="false"> <FrameLayout
+    android:id="@+id/contentFrame"
+    android:layout_width="0dp"
+    android:layout_height="match_parent"
+    android:layout_weight="1">
+
+    <LinearLayout
+        android:id="@+id/homeLayout"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="horizontal"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        tools:ignore="RtlSymmetry"> <LinearLayout
+        android:id="@+id/categoriesLayout"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        android:gravity="center_vertical"/>
+
+        <ImageView
+            android:id="@+id/mainImage"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:scaleType="fitCenter"
+            android:contentDescription="@string/app_name" /> </LinearLayout>
 
     <FrameLayout
-        android:id="@+id/contentFrame"
+        android:id="@+id/categoryItemsLayout"
-        android:layout_width="0dp"
+        android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1">
+        android:visibility="gone">
 
-        <LinearLayout
+        <ScrollView
-            android:id="@+id/homeLayout"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:orientation="horizontal"
-            android:paddingLeft="20dp">
-
-            <LinearLayout
-                android:id="@+id/categoriesLayout"
-                android:layout_width="wrap_content"
-                android:layout_height="match_parent"
-                android:orientation="vertical"
-                android:gravity="center_vertical"/>
-
-            <ImageView
-                android:id="@+id/mainImage"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:scaleType="fitCenter" />
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/categoryItemsLayout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical"
-            android:visibility="gone"
             android:padding="10dp">
-
+            <GridLayout
-            <ScrollView
+                android:id="@+id/gridPieces"
                 android:layout_width="match_parent"
-                android:layout_height="match_parent">
+                android:layout_height="wrap_content"
-                <GridLayout
+                android:columnCount="4" />
-                    android:id="@+id/gridPieces"
+        </ScrollView>
-                    android:layout_width="match_parent"
+
-                    android:layout_height="wrap_content"
+        <androidx.appcompat.widget.AppCompatButton
-                    android:columnCount="4" />
+            android:id="@+id/btnBackFromCategory"
-            </ScrollView>
+            android:layout_width="200dp"
-        </LinearLayout>
+            android:layout_height="70dp"
+            android:layout_gravity="bottom|start"
+            android:layout_margin="20dp"
+            android:text="@string/cart_back_btn"
+            android:textSize="20sp"
+            android:textStyle="bold"
+            android:textColor="#FFFFFF"
+            app:backgroundTint="#1E88E5"
+            android:elevation="8dp"
+            tools:targetApi="l" />
     </FrameLayout>
+</FrameLayout>
 
     <include layout="@layout/partial_cart" />
 

app/src/main/res/layout/partial_cart.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--  partial_panier.xml -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/cartContainer"
     android:layout_width="350dp"
     android:layout_height="match_parent"
@@ -56,29 +57,29 @@
             android:orientation="horizontal"
             android:weightSum="2">
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/clearCartBtn"
                 android:layout_width="0dp"
                 android:layout_weight="1"
-                android:layout_height="60dp"
+                android:layout_height="70dp"
                 android:text="@string/cart_empty_btn"
                 android:textSize="18sp"
+                android:textStyle="bold"
                 android:textColor="#FFFFFF"
-                android:background="#E53935"
+                app:backgroundTint="#E53935"
-                android:layout_marginEnd="5dp"
+                android:layout_marginEnd="5dp"/>
-                android:onClick="emptyCart"/>
 
-            <Button
+            <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/validateCartBtn"
                 android:layout_width="0dp"
                 android:layout_weight="1"
-                android:layout_height="60dp"
+                android:layout_height="70dp"
                 android:text="@string/cart_validate_btn"
                 android:textSize="18sp"
+                android:textStyle="bold"
                 android:textColor="#FFFFFF"
-                android:background="#43A047"
+                app:backgroundTint="#43A047"
-                android:layout_marginStart="5dp"
+                android:layout_marginStart="5dp"/>
-                android:onClick="validateCart"/>
         </LinearLayout>
     </LinearLayout>
 </LinearLayout>