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: back to home after cart validation

Browse Source
This commit is contained in:
lucasroyerdev
2026-01-19 13:23:08 +01:00
parent 7bea2fa9cf
commit 7b53f8407c
4 changed files with 22 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/com/stock/pignon/CartActionHelper.java
View File

@@ -183,16 +183,17 @@ public class CartActionHelper {
.create();
merciDialog.show();
new Handler().postDelayed(() -> {
// Close dialog
merciDialog.dismiss();
// Go to home if not already
if (!(activity instanceof MainActivity)) {
Intent intent = new Intent(activity, MainActivity.class);
if (activity instanceof MainActivity) {
MainActivity main = (MainActivity) activity;
// Go to home if not already
main.showHome();
// Clear the backstack so the user can't "go back" to a validated cart
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP);
activity.startActivity(intent);
GridLayout grid = main.findViewById(R.id.gridPieces);
refreshGridQuantities(grid);
}
}, 2000);
}

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

@@ -85,6 +85,14 @@ public class MainActivity extends AppCompatActivity {
getSupportActionBar().setTitle(" 🚲 Atelier du Pignon - Gestion du stock à prix libre");
}
// Get app version
String versionName = "";
try {
versionName = "App v" + getPackageManager().getPackageInfo(getPackageName(), 0).versionName;
} catch (Exception e) {
versionName = ""; // Fallback
}
// Launch server
server = new ControlServer(8080);
try {
@@ -93,12 +101,12 @@ public class MainActivity extends AppCompatActivity {
// On met l'URL directement dans le sous-titre de l'ActionBar
if (getSupportActionBar() != null) {
getSupportActionBar().setSubtitle("🟢 Server online : " + url);
getSupportActionBar().setSubtitle("Serveur en ligne : " + url + " - " + versionName);
}
Log.i(TAG, "Server started on : " + url);
} catch (IOException e) {
if (getSupportActionBar() != null) {
getSupportActionBar().setSubtitle("🔴 Server error : port 8080 busy");
getSupportActionBar().setSubtitle("Erreur serveur" + " - " + versionName);
}
}
}
@@ -258,7 +266,7 @@ public class MainActivity extends AppCompatActivity {
CartViewHelper.updateCartView(cartList, this);
}
private void showHome() {
public void showHome() {
categoryItemsLayout.setVisibility(View.GONE);
homeLayout.setVisibility(View.VISIBLE);
}