feat: manage color change and upgrade save_data method with List instead of map

feat: online editor fully working, add/remove item/category
feat: add online editor, work in progress
2026-05-10 11:02:26 +00:00 · 2026-02-01 11:36:24 +01:00 · 2026-01-31 15:15:58 +01:00 · 2026-01-31 13:08:09 +01:00
10 changed files with 710 additions and 45 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,8 +10,8 @@ android {
        applicationId "com.stock.pignon"
        minSdkVersion 17
        targetSdkVersion 36
-        versionCode 7
-        versionName "0.5.2"
+        versionCode 8
+        versionName "0.6.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
    }
--- a/app/src/main/assets/editor.html
+++ b/app/src/main/assets/editor.html
@@ -0,0 +1,316 @@
+<!DOCTYPE html>
+<html lang="fr">
+
+<head>
+    <meta charset="UTF-8">
+    <title>Éditeur de Catalogue</title>
+    <style>
+        body {
+            font-family: sans-serif;
+            padding: 20px;
+            background: #eee;
+            margin-bottom: 100px;
+        }
+
+        .card {
+            background: white;
+            padding: 20px;
+            margin-bottom: 30px;
+            border-radius: 10px;
+            box-shadow: 0 4px 6px rgba(0, 0, 0, 0.1);
+        }
+
+        table {
+            width: 100%;
+            border-collapse: collapse;
+        }
+
+        th,
+        td {
+            padding: 10px;
+            border-bottom: 1px solid #ddd;
+            text-align: left;
+        }
+
+        input[type='text'],
+        input[type='number'] {
+            padding: 8px;
+            border: 1px solid #ccc;
+            border-radius: 4px;
+            width: 100%;
+            box-sizing: border-box;
+        }
+
+        .img-p {
+            width: 60px;
+            height: 60px;
+            object-fit: cover;
+            background: #f0f0f0;
+            border-radius: 5px;
+        }
+
+        .btn-add {
+            background: #0049AF;
+            color: white;
+            border: none;
+            padding: 10px 20px;
+            cursor: pointer;
+            margin-top: 10px;
+            border-radius: 5px;
+            font-weight: bold;
+        }
+
+        .btn-save {
+            background: #2E7D32;
+            color: white;
+            padding: 15px 30px;
+            border: none;
+            border-radius: 50px;
+            cursor: pointer;
+            font-size: 18px;
+            font-weight: bold;
+            position: fixed;
+            bottom: 30px;
+            left: 50%;
+            transform: translateX(-50%);
+            z-index: 1000;
+            box-shadow: 0 4px 15px rgba(0, 0, 0, 0.4);
+            width: auto;
+            white-space: nowrap;
+        }
+
+        .btn-del {
+            background: #d32f2f;
+            color: white;
+            border: none;
+            border-radius: 4px;
+            cursor: pointer;
+            padding: 5px 10px;
+        }
+
+        .link-mod {
+            background: none;
+            border: none;
+            color: #0049AF;
+            text-decoration: underline;
+            cursor: pointer;
+            padding: 0;
+            font-size: 12px;
+            appearance: none;
+            -webkit-appearance: none;
+            outline: none;
+        }
+
+        .actions-bar {
+            position: fixed;
+            bottom: 30px;
+            left: 50%;
+            transform: translateX(-50%);
+            z-index: 1000;
+            display: flex;
+            gap: 15px;
+        }
+
+        .btn-cancel {
+            background: #F54927;
+            color: white;
+            padding: 15px 30px;
+            border: none;
+            border-radius: 50px;
+            cursor: pointer;
+            font-size: 18px;
+            font-weight: bold;
+            box-shadow: 0 4px 15px rgba(0, 0, 0, 0.3);
+            white-space: nowrap;
+        }
+
+        .btn-cat {
+            background: #0049AF;
+            color: white;
+            padding: 15px 25px;
+            border: none;
+            border-radius: 50px;
+            cursor: pointer;
+            font-size: 18px;
+            font-weight: bold;
+            box-shadow: 0 4px 15px rgba(0, 0, 0, 0.3);
+        }
+
+        .btn-back {
+            background: #000000;
+            color: white;
+            padding: 15px 25px;
+            border: none;
+            border-radius: 50px;
+            cursor: pointer;
+            font-size: 18px;
+            font-weight: bold;
+            box-shadow: 0 4px 15px rgba(0, 0, 0, 0.3);
+        }
+
+        .input-h2 {
+            font-size: 1.5rem !important;
+            font-weight: bold !important;
+            border: none !important;
+            background: transparent !important;
+            color: #555 !important;
+            width: auto;
+            max-width: 20%;
+            border-bottom: 1px dashed #ccc !important;
+            outline: none;
+        }
+
+        .input-h2:focus {
+            border-bottom: 2px solid #0049AF;
+            color: #0049AF;
+        }
+    </style>
+</head>
+
+<body>
+    <h1>Éditeur de Catalogue</h1>
+    <form id="editor-form" accept-charset="UTF-8">
+
+        {{GENERATED_CONTENT}}
+
+        <div class="actions-bar">
+            <button type="button" class="btn-back" onclick="window.location.href= '/'">← Retour </button>
+            <button type="button" class="btn-cat" onclick="addCategory()">+ Catégorie</button>
+            <button type="button" onclick="sendData()" class="btn-save" style="position:static; transform:none;">💾
+                Enregistrer tout</button>
+            <button type="button" class="btn-cancel" onclick="handleCancel(event)">✖ Tout annuler</button>
+        </div>
+    </form>
+
+    <script>
+        function addRow(cat) {
+            var t = document.getElementById('table-' + cat);
+            var r = t.insertRow(-1);
+            var id = Date.now();
+        
+            r.innerHTML = '<td>' +
+                '<img src="" class="img-p" onerror="this.src=\'https://placehold.co/60?text=?\'" style="display:block; margin-bottom:5px;">' +
+                '<input type="file" accept=".jpg,.png" style="font-size:10px; width:70px" onchange="uImg(this)">' +
+                '<input type="hidden" name="new|' + cat + '|' + id + '|img" value="">' + 
+                '</td>' +
+                '<td><input type="text" name="new|' + cat + '|' + id + '|name" placeholder="Nom..." required></td>' +
+                '<td><input type="number" name="new|' + cat + '|' + id + '|min" value="0" min="0" required></td>' +
+                '<td><input type="number" name="new|' + cat + '|' + id + '|max" value="0" min="0" required></td>' +
+                '<td><button type="button" class="btn-del" onclick="var l=this.parentNode.parentNode; l.parentNode.removeChild(l);">×</button></td>';
+        }
+
+        function uImg(element) {
+            var f = element.files[0];
+            if (!f) return;
+            
+            var td = element.parentNode;
+            var imgTag = td.querySelector('.img-p');
+            var hiddenInput = td.querySelector('input[type="hidden"]');
+            
+            var reader = new FileReader();
+            reader.onload = function(e) {
+                imgTag.src = e.target.result;
+                hiddenInput.value = e.target.result;
+            };
+            reader.readAsDataURL(f);
+        }
+
+        function handleCancel(e) {
+            // Avoid form to wait for data to send
+            if (e) e.preventDefault();
+
+            if (confirm("Attention : toutes vos modifications seront perdues. Continuer ?")) {
+                // Random URL parameters ?t= to force browser to forget previous data
+                window.location.href = "/edit?t=" + Date.now();
+            }
+        }
+
+        function addCategory() {
+            var name = prompt("Nom de la nouvelle catégorie ?");
+            if (!name || name.trim() === "") return;
+
+            // Temp ID
+            var tempId = "newcat_" + Date.now();
+
+            var container = document.createElement('div');
+            container.className = 'card';
+            container.innerHTML =
+                '<h2>' +
+                '<input type="text" class="input-h2" name="cat|' + tempId + '|name" value="' + name + '">' +
+                '<div style="display:inline-block; vertical-align:middle; margin: 0 15px;">' +
+                '<small>Fond:</small><br><input type="color" name="cat|' + tempId + '|bgColor" value="#0049AF" style="width:30px; height:25px; border:none; cursor:pointer;">' +
+                '</div>' +
+                '<div style="display:inline-block; vertical-align:middle; margin-right:15px;">' +
+                '<small>Texte:</small><br><input type="color" name="cat|' + tempId + '|textColor" value="#FFFFFF" style="width:30px; height:25px; border:none; cursor:pointer;">' +
+                '</div>' +
+                ' <button type="button" class="btn-del" onclick="if(confirm(\'Supprimer cette catégorie ?\')) this.closest(\'.card\').remove()">×</button>' +
+                '</h2>' +
+                '<table id="table-' + tempId + '">' +
+                '<tr><th>Image</th><th>Nom</th><th>Prix Min</th><th>Prix Max</th><th></th></tr>' +
+                '</table>' +
+                '<button type="button" class="btn-add" onclick="addRow(\'' + tempId + '\')">+ Ajouter article</button>';
+
+            var form = document.querySelector('form');
+            var actionBar = document.querySelector('.actions-bar');
+            form.insertBefore(container, actionBar);
+
+            container.scrollIntoView({ behavior: 'smooth' });
+        }
+
+        function sendData() {
+            const form = document.getElementById('editor-form');
+            const data = {
+                cat_order_list: "",
+                items: {}
+            };
+
+            // Browse showed categories
+            const catOrder = [];
+            document.querySelectorAll('.card').forEach((card, catIdx) => {
+                let techId = card.querySelector('input[name^="cat|"]')?.name.split('|')[1] || "c" + catIdx; // c0, c1 but avoid globals
+                catOrder.push(techId);
+
+                const catInput = card.querySelector('input[name$="|name"]');
+                const bgInput = card.querySelector('input[name$="|bgColor"]');
+                const textInput = card.querySelector('input[name$="|textColor"]');
+                if (!catInput) return;
+
+                data.items["cat|" + techId + "|name"] = catInput.value;
+                data.items["cat|" + techId + "|bgColor"] = bgInput ? bgInput.value : "#0049AF";
+                data.items["cat|" + techId + "|textColor"] = textInput ? textInput.value : "#FFFFFF";
+
+                // Browse each line
+                card.querySelectorAll('table tr').forEach((row, itemIdx) => {
+                    if (itemIdx === 0) return; // Skip title line (th)
+                    const realIdx = itemIdx - 1; // Start at 0
+                    row.querySelectorAll('input').forEach(input => {
+                        const parts = input.name.split('|');
+                        if (parts.length >= 4) {
+                            // parts[0] = "item" ou "new", parts[3] = "name" ou "min" ou "max"
+                            const finalKey = "item|" + techId + "|" + realIdx + "|" + parts[3];
+                            data.items[finalKey] = input.value;
+                        }
+                    });
+                });
+            });
+
+            data.cat_order_list = catOrder.join(',');
+
+            // Create new clean struct : cat|c0|name, item|c0|0|name...
+            fetch('/save_editor', {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json; charset=UTF-8' },
+                body: JSON.stringify(data)
+            })
+                .then(r => {
+                    if (r.ok) {
+                        alert("✅ Enregistré !");
+                        window.location.reload(); // Optionnel : rafraîchit pour voir le résultat propre
+                    } else {
+                        alert("❌ Erreur serveur");
+                    }
+                })
+                .catch(() => alert("❌ Erreur réseau"));
+        }
+    </script>
+</body>
--- a/app/src/main/assets/index.html
+++ b/app/src/main/assets/index.html
@@ -43,6 +43,9 @@
        <input type='file' name='images' accept='image/*' multiple><br>
        <input type='submit' value='Envoyer les images' class='btn'>
    </form>
+</div><div class='card'>
+    <h3>Modifier dans le navigateur</h3>
+    <p><a href='/edit' class='btn'>Editeur en ligne</a></p>
 </div>
 </body>
 </html>
--- a/app/src/main/java/com/stock/pignon/CartItem.java
+++ b/app/src/main/java/com/stock/pignon/CartItem.java
@@ -20,8 +20,10 @@ public class CartItem {
    public int getMinPrice() { return minPrice; }
    public int getMaxPrice() { return maxPrice; }
    public int getQuantity() { return quantity; }
-    public void setQuantity(int quantity) { this.quantity = quantity; }
    public int getTotalMin() { return minPrice * quantity; }
    public int getTotalMax() { return maxPrice * quantity; }
    public String getImageFile() { return imageFile; }
+
+    // Setters
+    public void setQuantity(int quantity) { this.quantity = quantity; }
 }
--- a/app/src/main/java/com/stock/pignon/CartManager.java
+++ b/app/src/main/java/com/stock/pignon/CartManager.java
@@ -8,10 +8,14 @@ public class CartManager {
    // Unified and global list for whole application
    private static final List<CartItem> items = new ArrayList<>();

-    // Private constructor: utility class, it should not be instantiated
+    /**
+     * Private constructor: utility class, it should not be instantiated
+     */
    private CartManager() {}

-    //  Returns the direct reference to the list to save memory on older devices
+    /**
+     * Returns the direct reference to the list to save memory on older devices
+     */
    public static List<CartItem> getItems() {
        return items;
    }
@@ -25,7 +29,9 @@ public class CartManager {
        return null;
    }

-    // Logic for adding, updating or removing items based on quantity, prevents duplicate entries
+    /**
+     * Logic for adding, updating or removing items based on quantity, prevents duplicate entries
+     */
    public static void addOrUpdateItem(String name, int minPrice, int maxPrice, int quantity, String imageFile) {
        CartItem current = getItemByName(name);

@@ -40,20 +46,27 @@ public class CartManager {
        }
    }

-    // Range-based pricing
-
+    /**
+     * Range-based pricing
+     */
    public static int getGlobalTotalMin() {
        int total = 0;
        for (CartItem item : items) total += item.getTotalMin();
        return total;
    }

+    /**
+     * Range-based pricing
+     */
    public static int getGlobalTotalMax() {
        int total = 0;
        for (CartItem item : items) total += item.getTotalMax();
        return total;
    }

+    /**
+     * Remove item from cart
+     */
    public static void clear() {
        items.clear();
    }
--- a/app/src/main/java/com/stock/pignon/Category.java
+++ b/app/src/main/java/com/stock/pignon/Category.java
@@ -14,12 +14,25 @@ public class Category {
    @SuppressWarnings("unused")
    private List<Item> items;

+    // Empty constructor for GSON
+    public Category() {}
+
+    // Full constructor for online editor
+    public Category(String name, List<Item> items) {
+        this.name = name;
+        this.items = items;
+        // Default colors
+        this.bgColor = "#0049AF";
+        this.textColor = "#FFFFFF";
+    }
+
+    // Getters
    public String getName() { return name; }
    public String getBgColor() { return bgColor; }
    public String getTextColor() { return textColor; }
+    public List<Item> getItems() { return items != null ? items : new ArrayList<>(); }

-    // Avoid crash if json isn't readable
-    public List<Item> getItems() {
-        return items != null ? items : new ArrayList<>();
-    }
+    // Setters
+    public void setBgColor(String bgColor) { this.bgColor = bgColor; }
+    public void setTextColor(String textColor) { this.textColor = textColor; }
 }
--- a/app/src/main/java/com/stock/pignon/ControlServer.java
+++ b/app/src/main/java/com/stock/pignon/ControlServer.java
@@ -3,6 +3,8 @@ package com.stock.pignon;

 import android.content.Context;
 import android.os.Environment;
+import android.util.Log;
+import org.json.JSONObject;

 import fi.iki.elonen.NanoHTTPD;
 import java.io.File;
@@ -11,15 +13,17 @@ import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.HashMap;
-import java.util.Map;
+
 import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.HashMap;
 import java.util.Scanner;

 /**
 * Create a web server to remote management of app assets.
+ * Inherit what is needed to build a web server from NanoHTTPD
 */
-// Inherit what is needed to build a web server
 public class ControlServer extends NanoHTTPD {

    private final Context context;
@@ -35,17 +39,23 @@ public class ControlServer extends NanoHTTPD {
    }

    /**
-     * Main method which receive remote request
+     * Main method which manage requests
     */
    @Override
    public Response serve(IHTTPSession session) {
        // Get requested address
        String uri = session.getUri();

+        if (uri.startsWith("/img_view/")) {
+            return serveImage(uri.replace("/img_view/", ""));
+        }
+
        if (session.getMethod() == Method.GET) {
            switch (uri) {
+                // Soon deprecated with online editor
                case "/download_input":
                    return downloadFile(Config.INPUT_JSON_NAME);
+                // Soon deprecated with online editor
                case "/output_json":
                    return viewFile(Config.OUTPUT_JSON_NAME);
                case "/download_output_json":
@@ -54,17 +64,23 @@ public class ControlServer extends NanoHTTPD {
                    return viewFile(Config.OUTPUT_CSV_NAME);
                case "/download_output_csv":
                    return downloadFile(Config.OUTPUT_CSV_NAME);
+                case "/edit":
+                    return newFixedLengthResponse(fillEditor());
                case "/":
-                    return newFixedLengthResponse(getHome());
+                    return newFixedLengthResponse(getHtml("index.html"));
            }
        }

        if (session.getMethod() == Method.POST) {
            switch (uri) {
+                // Soon deprecated with online editor
                case "/upload_json":
                    return handleJsonUpload(session);
+                // Soon deprecated with online editor
                case "/upload_images":
                    return handleImagesUpload(session);
+                case "/save_editor":
+                    return handleSaveEditor(session);
            }
        }

@@ -72,28 +88,247 @@ public class ControlServer extends NanoHTTPD {
    }

    /**
-     * HTML UI for users
+     * Read from asset and return html file
     */
-    private String getHome() {
+    private String getHtml(String file) {
        try {
-            InputStream is = context.getAssets().open("index.html");
+            InputStream is = context.getAssets().open(file);
+            // Scanner html file from the beginning with "\\A"
            Scanner s = new Scanner(is, "UTF-8").useDelimiter("\\A");
            String html = s.hasNext() ? s.next() : "";
            is.close();
            return html;
        } catch (IOException e) {
-            return "<html><body>❌ Erreur de chargement du template</body></html>";
+            return "<html><body>❌ Erreur de chargement de la page</body></html>";
        }
    }

+    /**
+     * Read from asset and return html file
+     */
+    private String fillEditor() {
+        // Get data from assets
+        DataLoader.loadData();
+        // Create an html string to fill the template
+        StringBuilder html = new StringBuilder();
+        // Save categories order
+        List<String> orderList = new ArrayList<>();
+
+        // Globals
+        String globalId = "global";
+        Category globalCat = new Category("global", DataLoader.getGlobalItems());
+        html.append(renderCategorySection(globalId, globalCat));
+        orderList.add(globalId);
+
+        // Browser categories
+        int index = 0;
+        for (Category cat : DataLoader.getCategories()) {
+            // cat_0, cat_1...
+            String techId = "cat_" + index;
+
+            html.append(renderCategorySection(techId, cat));
+            orderList.add(techId);
+
+            index++;
+        }
+
+        String orderField = "<input type='hidden' name='cat_order_list' value='" +
+                android.text.TextUtils.join(",", orderList) + "'>";
+
+        return getHtml("editor.html").replace("{{GENERATED_CONTENT}}", html + orderField);
+    }
+
+    /**
+     * Generate HTML section for each category
+     */
+    private String renderCategorySection(String techId, Category cat) {
+        String displayName = cat.getName();
+        List<Item> items = cat.getItems();
+        StringBuilder sb = new StringBuilder();
+
+        sb.append("<div class='card'>");
+        sb.append("<h2>");
+
+        if ("global".equals(displayName)) {
+            sb.append("Articles globaux");
+            sb.append("<input type='hidden' name='cat|global|name' value='global'>");
+            techId = "global";
+        } else {
+            // Nom
+            sb.append("<input type='text' name='cat|").append(techId).append("|name' value=\"").append(displayName).append("\" class='input-h2'>");
+
+            // Couleur de Fond (on utilise cat.getBgColor())
+            sb.append("<div style='display:inline-block; vertical-align:middle; margin-right:15px;'>");
+            sb.append("<div style='font-weight: bold; font-size: 0.7em; padding-bottom: 5px;'>Fond</div>");
+            sb.append("<input type='color' name='cat|").append(techId).append("|bgColor' value='").append(cat.getBgColor()).append("' style='width:30px; height:25px; border:none; cursor:pointer;'>");
+            sb.append("</div>");
+
+            // Couleur de Texte (on utilise cat.getTextColor())
+            sb.append("<div style='display:inline-block; vertical-align:middle; margin-right:15px;'>");
+            sb.append("<div style='font-weight: bold; font-size: 0.7em; padding-bottom: 5px;'>Texte</div>");
+            sb.append("<input type='color' name='cat|").append(techId).append("|textColor' value='").append(cat.getTextColor()).append("' style='width:30px; height:25px; border:none; cursor:pointer;'>");
+            sb.append("</div>");
+
+            // Bouton supprimer
+            sb.append(" <button type='button' class='btn-del' style='vertical-align: middle; margin-left: 10px;' ")
+                    .append("onclick=\"if(confirm('Supprimer cette catégorie?')) this.closest('.card').remove()\">×</button>");
+        }
+        sb.append("</h2>");
+
+        // Build table
+        sb.append("<table id='table-").append(techId).append("'>");
+        sb.append("<tr><th>Image</th><th>Nom</th><th>Prix Min</th><th>Prix Max</th></tr>");
+
+        int rowIdx = 0;
+        for (Item item : items) {
+            sb.append(renderItemRow(techId, item, rowIdx++));
+        }
+
+        sb.append("</table>");
+
+        // Button to add item in this category
+        sb.append("<button type='button' class='btn-add' onclick=\"addRow('").append(techId).append("')\">+ Ajouter article</button>");
+        sb.append("</div>");
+
+        return sb.toString();
+    }
+
+    /**
+     * Generate HTML row for each item
+     */
+    private String renderItemRow(String techId, Item item, int idx) {
+        String prefix = "item|" + techId + "|" + idx;
+        return "<tr>" +
+                "<td><img src='/img_view/" + item.getImage() + "' class='img-p' onerror=\"this.src='https://placehold.co/60?text=?'\">" +
+                "<br><input type='file' accept='.jpg,.png' style='font-size:10px; width:70px' onchange='uImg(this)'>" +
+                "<input type='hidden' name='" + prefix + "|img' value='" + item.getImage() + "'></td>" +
+                "<td><input type='text' name='" + prefix + "|name' value=\"" + item.getName() + "\"></td>" +
+                "<td><input type='number' name='" + prefix + "|min' value='" + item.getMinPrice() + "'></td>" +
+                "<td><input type='number' name='" + prefix + "|max' value='" + item.getMaxPrice() + "'></td>" +
+                // Retro JS compatibility
+                "<td><button type='button' class='btn-del' onclick='var r=this.parentNode.parentNode; r.parentNode.removeChild(r);'>×</button></td>" +
+                "</tr>";
+    }
+
+    private Response serveImage(String filename) {
+        File imgJpg = new File(imagesDir, filename + ".jpg");
+        File imgPng = new File(imagesDir, filename + ".png");
+        File file = imgJpg.exists() ? imgJpg : (imgPng.exists() ? imgPng : null);
+
+        if (file == null || !file.exists()) return newFixedLengthResponse(Response.Status.NOT_FOUND, "text/plain", "No image");
+
+        try {
+            Response res = newChunkedResponse(Response.Status.OK, "image/jpeg", new FileInputStream(file));
+            // Avoid cache if user change image
+            res.addHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+            res.addHeader("Pragma", "no-cache");
+            res.addHeader("Expires", "0");
+            return res;
+        } catch (IOException e) {
+            return newFixedLengthResponse("Error");
+        }
+    }
+
+    /**
+     * Receive JSON and update cache and storage catalog
+     */
+    private Response handleSaveEditor(IHTTPSession session) {
+        try {
+            // NanoHTTPD read request
+            Map<String, String> files = new HashMap<>();
+            session.parseBody(files);
+
+            String jsonStr = files.get("postData");
+            if (jsonStr == null || jsonStr.isEmpty()) {
+                return newFixedLengthResponse(Response.Status.BAD_REQUEST, MIME_PLAINTEXT, "Données vides");
+            }
+
+            JSONObject fullJson = new JSONObject(jsonStr);
+            // Get items
+            JSONObject allFields = fullJson.getJSONObject("items");
+            // Get categories order
+            String[] orderedIds = fullJson.getString("cat_order_list").split(",");
+
+            List<Category> finalData = new ArrayList<>(); 
+
+            // For each category
+            for (String techId : orderedIds) {
+                String catNameKey = "cat|" + techId + "|name";
+                // Does it exist
+                if (!allFields.has(catNameKey)) continue;
+                
+                String name = allFields.getString(catNameKey);
+                List<Item> itemsInCategory = new ArrayList<>();
+
+                // Browse and create items
+                int i = 0;
+                while (true) {
+                    String itemBase = "item|" + techId + "|" + i + "|";
+                    // On vérifie si l'item suivant existe (via son champ name)
+                    if (!allFields.has(itemBase + "name")) break;
+
+                    // Manage image
+                    String imgVal = allFields.optString(itemBase + "img", "");
+                    if (imgVal.startsWith("data:image")) {
+                        try {
+                            String newImgName = "img_" + System.currentTimeMillis() + "_" + i;
+                            String base64Data = imgVal.split(",")[1];
+                            byte[] decoded = android.util.Base64.decode(base64Data, android.util.Base64.DEFAULT);
+                            
+                            File imageFile = new File(imagesDir, newImgName + ".jpg");
+                            try (FileOutputStream fos = new FileOutputStream(imageFile)) {
+                                fos.write(decoded);
+                            }
+                            imgVal = newImgName; // Replace base64 with name of created jpg file
+                        } catch (Exception e) { Log.e("ControlServer", "Img Error", e); }
+                    }
+
+                    itemsInCategory.add(new Item(
+                        // Mandatory
+                        allFields.getString(itemBase + "name"),
+                        // Not mandatory
+                        imgVal,
+                        parseSafely(allFields.optString(itemBase + "min", "0")),
+                        parseSafely(allFields.optString(itemBase + "max", "0"))
+                    ));
+                    i++;
+                }
+
+                // Create category with items and colors
+                Category cat = new Category(name, itemsInCategory);
+                cat.setBgColor(allFields.optString("cat|" + techId + "|bgColor", "#0049AF"));
+                cat.setTextColor(allFields.optString("cat|" + techId + "|textColor", "#FFFFFF"));
+                finalData.add(cat);
+            }
+
+            DataLoader.saveData(finalData);
+            return newFixedLengthResponse(Response.Status.OK, MIME_PLAINTEXT, "OK");
+
+        } catch (Exception e) {
+            Log.e("ControlServer", "Erreur save", e);
+            return newFixedLengthResponse(Response.Status.INTERNAL_ERROR, MIME_PLAINTEXT, "Erreur");
+        }
+    }
+
+    private int parseSafely(String val) {
+        if (val == null) return 0;
+        try {
+            return Integer.parseInt(val.trim());
+        } catch (Exception e) {
+            return 0;
+        }
+    }
+
+    // Soon deprecated with online editor
    /**
     * Manage JSON sent by remote.
     */
    private Response handleJsonUpload(IHTTPSession session) {
        Map<String, String> tmpFiles = new HashMap<>();
        try {
+            // NanoHTTPD stores loaded file in temp file
            session.parseBody(tmpFiles);
-            // NanoHTTPD stocke le fichier avec le nom du champ HTML (json_file)
+            // tmpFiles map stores file name and path to tmp folder
            String tmpPath = tmpFiles.get("json_file");
            if (tmpPath == null) return newFixedLengthResponse("❌ Aucun fichier reçu.");

@@ -107,6 +342,7 @@ public class ControlServer extends NanoHTTPD {
        }
    }

+    // Soon deprecated with online editor
    /**
     * Manage multiple images sent by remote.
     */
@@ -122,17 +358,17 @@ public class ControlServer extends NanoHTTPD {

            int count = 0;

-            // On parcourt les fichiers temporaires créés par NanoHTTPD
+            // Browse temp files created by NanoHTTPD
            for (Map.Entry<String, String> entry : tmpFiles.entrySet()) {
-                // NanoHTTPD indexe les envois multiples (images, images1, images2...)
+                // Manage multiple files uppload
                if (entry.getKey().startsWith("images")) {
                    String tmpPath = entry.getValue();

-                    // Récupération sécurisée des paramètres pour obtenir le nom original
+                    // Get file name
                    List<String> params = session.getParameters().get(entry.getKey());

                    if (params != null && !params.isEmpty()) {
-                        // Nettoyage du nom de fichier (pour ne garder que "image.jpg" sans le chemin PC)
+                        // Clean file name to remove path, only keep image.jpg or image.png
                        String originalName = new File(params.get(0)).getName();

                        File src = new File(tmpPath);
@@ -152,6 +388,22 @@ public class ControlServer extends NanoHTTPD {
        }
    }

+    // Soon deprecated with online editor
+    /**
+     * Utility method to copy file byte per byte.
+     * Not always possible to simply move a file on Android.
+     */
+    private void copyFile(File src, File dst) throws IOException {
+        try (InputStream in = new FileInputStream(src);
+             OutputStream out = new FileOutputStream(dst)) {
+            byte[] buf = new byte[1024];
+            int len;
+            while ((len = in.read(buf)) > 0) {
+                out.write(buf, 0, len);
+            }
+        }
+    }
+
    /**
     * Prepare file and offer as download
     */
@@ -195,19 +447,4 @@ public class ControlServer extends NanoHTTPD {
            return newFixedLengthResponse("❌ Erreur de lecture.");
        }
    }
-
-    /**
-     * Utility method to copy file byte per byte.
-     * Not always possible to simply move a file on Android.
-     */
-    private void copyFile(File src, File dst) throws IOException {
-        try (InputStream in = new FileInputStream(src);
-             OutputStream out = new FileOutputStream(dst)) {
-            byte[] buf = new byte[1024];
-            int len;
-            while ((len = in.read(buf)) > 0) {
-                out.write(buf, 0, len);
-            }
-        }
-    }
 }
--- a/app/src/main/java/com/stock/pignon/DataLoader.java
+++ b/app/src/main/java/com/stock/pignon/DataLoader.java
@@ -4,11 +4,16 @@ package com.stock.pignon;
 import android.os.Environment;
 import android.util.Log;
 import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStreamReader;
-import java.util.ArrayList;
+import java.io.FileOutputStream;
+import java.io.OutputStreamWriter;
 import java.util.List;
+import java.util.ArrayList;
+import java.util.Map;
+import java.util.LinkedHashMap;

 public class DataLoader {
    private static final String TAG = "DataLoader"; // For readable logs
@@ -20,6 +25,9 @@ public class DataLoader {
    private static List<Item> cachedGlobals = new ArrayList<>();


+    /**
+     * Get data from input JSON PIECES_FILE
+     */
    public static void loadData() {
        File dir = new File(Environment.getExternalStorageDirectory(), EXTERNAL_DIR);
        File jsonFile = new File(dir, PIECES_FILE);
@@ -56,7 +64,10 @@ public class DataLoader {
        }
    }

-    // Compromise between CPU usage and memory usage : keep cache raw data and combinate global and specific items at call
+    /**
+     * Create a merge list with global items and items from a specified category for main activity
+     * Compromise between CPU usage and memory usage : keep cache raw data and combinate global and specific items at call
+     */
    public static List<Item> getItemsForCategory(String categoryName) {

        // Add global items
@@ -72,13 +83,68 @@ public class DataLoader {
        return combinedList;
    }

+    /**
+     * To fill online editor, create a map with all items sorted by category
+     */
+    public static Map<String, List<Item>> getAllSections() {
+        // LinkedHashMap remember item order instead of HashMap
+        Map<String, List<Item>> sections = new LinkedHashMap<>();
+        sections.put("global", cachedGlobals);
+        for (Category cat : cachedCategories) {
+            sections.put(cat.getName(), cat.getItems());
+        }
+        return sections;
+    }
+
+    /**
+     * Create a web server to remote management of app assets.
+     */
    public static List<Category> getCategories() {
        return cachedCategories;
    }
+    public static List<Item> getGlobalItems() {
+        return cachedGlobals;
+    }

-    // Internal class for Gson
+    /**
+     * Internal class for GSON
+     */
    private static class CategoriesWrapper {
        List<Item> globalItems;
        List<Category> categories;
    }
+
+    /**
+     * Write JSON from online editor data
+     */
+    public static void saveData(List<Category> categoriesList) throws Exception {
+        CategoriesWrapper wrapper = new CategoriesWrapper();
+        wrapper.categories = new ArrayList<>();
+        wrapper.globalItems = new ArrayList<>();
+
+        // Browse category
+        for (Category cat : categoriesList) {
+            if ("global".equals(cat.getName())) {
+                wrapper.globalItems = cat.getItems();
+            } else {
+                wrapper.categories.add(cat);
+            }
+        }
+
+        // Create JSON
+        Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
+        String jsonString = gson.toJson(wrapper);
+
+        File dir = new File(Environment.getExternalStorageDirectory(), Config.EXTERNAL_DIR_NAME);
+        File jsonFile = new File(dir, Config.INPUT_JSON_NAME);
+
+        // Write JSON
+        try (OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(jsonFile), "UTF-8")) {
+            writer.write(jsonString);
+        }
+
+        // Update app cache
+        cachedGlobals = wrapper.globalItems;
+        cachedCategories = wrapper.categories;
+    }
 }
--- a/app/src/main/java/com/stock/pignon/Item.java
+++ b/app/src/main/java/com/stock/pignon/Item.java
@@ -14,9 +14,24 @@ public class Item {
    // Empty constructor for GSON
    public Item() {}

+    // Full constructor for online editor
+    public Item(String name, String image, int minPrice, int maxPrice) {
+        this.name = name;
+        this.image = image;
+        this.minPrice = minPrice;
+        this.maxPrice = maxPrice;
+    }
+
+    // Getters
    public String getName() { return name; }
    public int getMinPrice() { return minPrice; }
    public int getMaxPrice() { return maxPrice; }
    public String getImage() { return image; }
+
+    // Setters
+    public void setName(String name) { this.name = name; }
+    public void setMinPrice(int minPrice) { this.minPrice = minPrice; }
+    public void setMaxPrice(int maxPrice) { this.maxPrice = maxPrice; }
+    public void setImage(String image) { this.image = image; }
 }

--- a/app/src/main/java/com/stock/pignon/MainActivity.java
+++ b/app/src/main/java/com/stock/pignon/MainActivity.java
@@ -89,7 +89,7 @@ public class MainActivity extends AppCompatActivity {
        }

        // Launch server
-        server = new ControlServer(8080);
+        server = new ControlServer(this,8080);
        try {
            server.start();
            String url = "http://" + getDeviceIP() + ":8080";
Author	SHA1	Message	Date
lucasroyerdev	0dbe47ad3b	feat: manage color change and upgrade save_data method with List instead of map	2026-02-01 11:36:24 +01:00
lucasroyerdev	1df2d95586	feat: online editor fully working, add/remove item/category	2026-01-31 15:15:58 +01:00
lucasroyerdev	ebb10ed61b	feat: add online editor, work in progress	2026-01-31 13:08:09 +01:00