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

Compare commits

base: Lucas:v0.5.0
Branches Tags
Lucas:main Lucas:develop
Lucas:v0.6.0 Lucas:v0.5.2 Lucas:v0.5.1 Lucas:v0.5.0 Lucas:v0.4.0 Lucas:v0.3.0 Lucas:v0.2.0 Lucas:v0.1.0
...
compare: Lucas:v0.5.1
Branches Tags
Lucas:main Lucas:develop
Lucas:v0.6.0 Lucas:v0.5.2 Lucas:v0.5.1 Lucas:v0.5.0 Lucas:v0.4.0 Lucas:v0.3.0 Lucas:v0.2.0 Lucas:v0.1.0

1 Commits
v0.5.0 ... v0.5.1

Author SHA1 Message Date
lucasroyerdev
f4be7a90eb fix: revert switching button to regular validate/back/return buttons, migrate to Java click listeners 2026-01-20 12:31:31 +01:00
5 changed files with 89 additions and 96 deletions
Expand all files Collapse all files

4
app/build.gradle
View File

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

14
app/src/main/java/com/stock/pignon/CartViewHelper.java
View File

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

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

42
app/src/main/res/layout/activity_main.xml
View File

@@ -1,12 +1,13 @@
<?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">
<FrameLayout
android:background="#ffffff"
android:baselineAligned="false"> <FrameLayout
android:id="@+id/contentFrame"
android:layout_width="0dp"
android:layout_height="match_parent"
@@ -17,9 +18,9 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingLeft="20dp">
<LinearLayout
android:paddingStart="20dp"
android:paddingEnd="20dp"
tools:ignore="RtlSymmetry"> <LinearLayout
android:id="@+id/categoriesLayout"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@@ -31,27 +32,40 @@
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:scaleType="fitCenter" />
</LinearLayout>
android:scaleType="fitCenter"
android:contentDescription="@string/app_name" /> </LinearLayout>
<LinearLayout
<FrameLayout
android:id="@+id/categoryItemsLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:visibility="gone"
android:padding="10dp">
android:visibility="gone">
<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:padding="10dp">
<GridLayout
android:id="@+id/gridPieces"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:columnCount="4" />
</ScrollView>
</LinearLayout>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btnBackFromCategory"
android:layout_width="200dp"
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" />

21
app/src/main/res/layout/partial_cart.xml
View File

@@ -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"
android:layout_marginEnd="5dp"
android:onClick="emptyCart"/>
app:backgroundTint="#E53935"
android:layout_marginEnd="5dp"/>
<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"
android:layout_marginStart="5dp"
android:onClick="validateCart"/>
app:backgroundTint="#43A047"
android:layout_marginStart="5dp"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>