Lucas/stock-pignon
1
0
Fork 0
mirror of https://github.com/lucasroyerdev/stock-pignon.git synced 2026-05-10 11:02:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
lucasroyerdev
2026-01-20 12:31:31 +01:00
parent 2c225f6821
commit f4be7a90eb
5 changed files with 89 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/java/com/stock/pignon/MainActivity.java
View File

@@ -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());
}