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

feat: add online editor, work in progress

Browse Source
This commit is contained in:
lucasroyerdev
2026-01-30 19:48:30 +01:00
parent e274352f98
commit ebb10ed61b
9 changed files with 621 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

244
app/src/main/assets/editor.html Normal file
View File

@@ -0,0 +1,244 @@
<!DOCTYPE html>
<html>
<head>
<meta charset="UTF-8">
<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: 70%;
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 action="/save_editor" method="POST">
{{GENERATED_CONTENT}}
<div class="actions-bar">
<button type="button" class="btn-back" onclick="window.location.href= '/'">← Retour </button>
<button type="button" class="btn-cancel" onclick="handleCancel(event)">✖ Tout annuler</button>
<button type="button" class="btn-cat" onclick="addCategory()">+ Catégorie</button>
<input type="submit" value="💾 Enregistrer tout" class="btn-save" style="position:static; transform:none;">
</div>
</form>
<script>
function addRow(cat) {
var t = document.getElementById('table-' + cat);
var r = t.insertRow(-1);
var id = Date.now();
r.innerHTML = '<td><input type="file" id="f_' + id + '" style="display:none" onchange="uImg(this)">' +
'<button type="button" class="link-mod" onclick="document.getElementById(\'f_' + id + '\').click()">Ajouter</button>' +
'<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(el) {
var f = el.files[0];
if (!f) return;
var row = el.parentNode.parentNode;
var id = f.name.split('.').slice(0, -1).join('.');
row.querySelector('input[type="hidden"]').value = id;
var fd = new FormData();
fd.append('images', f);
fetch('/upload_images', { method: 'POST', body: fd }).then(function () { alert('Image envoyée : ' + id); });
}
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 + '">' +
' <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' });
}
</script>
</body>

3
app/src/main/assets/index.html
View File

@@ -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>

4
app/src/main/java/com/stock/pignon/CartItem.java
View File

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

23
app/src/main/java/com/stock/pignon/CartManager.java
View File

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

19
app/src/main/java/com/stock/pignon/Category.java
View File

@@ -14,12 +14,21 @@ 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; }
// Avoid crash if json isn't readable
public List<Item> getItems() {
return items != null ? items : new ArrayList<>();
}
public List<Item> getItems() { return items != null ? items : new ArrayList<>(); }
}

280
app/src/main/java/com/stock/pignon/ControlServer.java
View File

@@ -3,6 +3,7 @@ package com.stock.pignon;
import android.content.Context;
import android.os.Environment;
import android.util.Log;
import fi.iki.elonen.NanoHTTPD;
import java.io.File;
@@ -11,15 +12,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.LinkedHashMap;
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 +38,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 +63,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 +87,233 @@ 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 for assets
DataLoader.loadData();
// Create an html string to fill the template
StringBuilder html = new StringBuilder();
// Browse map : 'id' for categories name, 'items' for items list
for (Map.Entry<String, List<Item>> section : DataLoader.getAllSections().entrySet()) {
String id = section.getKey();
List<Item> items = section.getValue();
// For each category, render a HTML card
html.append(renderCategorySection(id, items));
}
return getHtml("editor.html").replace("{{GENERATED_CONTENT}}", html.toString());
}
/**
* Generate HTML section for each category
*/
private String renderCategorySection(String id, List<Item> items) {
StringBuilder sb = new StringBuilder();
sb.append("<div class='card'>");
sb.append("<h2>");
if ("global".equals(id)) {
sb.append("Articles globaux");
// Hidden input to mark cat for server
sb.append("<input type='hidden' name='cat|").append(id).append("|name' value='global'>");
} else {
// Copy H2 theme
sb.append("<input type='text' name='cat|").append(id).append("|name' ")
.append("value=\"").append(id).append("\" ")
.append("style='font-size: 1.5rem; font-weight: bold; border: none; background: transparent; color: #555; width: auto; max-width: 70%; border-bottom: 1px dashed #ccc;'>");
// Delete category button
sb.append(" <button type='button' class='btn-del' style='vertical-align: middle; margin-left: 10px;' ")
.append("onclick=\"if(confirm('Supprimer cette catégorie et tous ses articles ?')) this.closest('.card').remove()\">×</button>");
}
sb.append("</h2>");
// Build table
sb.append("<table id='table-").append(id).append("'>");
sb.append("<tr><th>Image</th><th>Nom</th><th>Prix Min</th><th>Prix Max</th><th></th></tr>");
for (Item item : items) {
sb.append(renderItemRow(id, item));
}
sb.append("</table>");
// Button to add item in this category
sb.append("<button type='button' class='btn-add' onclick=\"addRow('").append(id).append("')\">+ Ajouter article</button>");
sb.append("</div>");
return sb.toString();
}
/**
* Generate HTML row for each item
*/
private String renderItemRow(String catName, Item item) {
String prefix = "item|" + catName + "|" + item.getName();
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");
}
}
private Response handleSaveEditor(IHTTPSession session) {
try {
// NanoHTTPD reads post request : copy all data then sort parameters
Map<String, String> files = new HashMap<>();
session.parseBody(files);
Map<String, List<String>> params = session.getParameters();
// Temp struct for modified categories
// Key is category is, value is item list
Map<String, List<Item>> categoriesMap = new LinkedHashMap<>();
// Map id and categories names
Map<String, String> categoryNames = new HashMap<>();
// Identify categories with "cat|id123|name"
for (Map.Entry<String, List<String>> paramEntry : params.entrySet()) {
String key = paramEntry.getKey();
if (key.startsWith("cat|") && key.endsWith("|name")) {
String[] parts = key.split("\\|");
String catId = parts[1];
String catName = paramEntry.getValue().get(0);
// Create category only if it doesn't exist already
if (!categoriesMap.containsKey(catId)) {
categoriesMap.put(catId, new ArrayList<>());
categoryNames.put(catId, catName);
}
}
}
// Group field for each items
// Key = "catId|itemId", Value = "name, min, max, img""
Map<String, Map<String, String>> itemDataCollector = new LinkedHashMap<>();
for (String key : params.keySet()) {
if (key.startsWith("item|") || key.startsWith("new|")) {
String[] parts = key.split("\\|"); // [type, catId, itemId, field]
String catId = parts[1];
String itemId = parts[2];
String field = parts[3];
List<String> values = params.get(key);
String value = (values != null && !values.isEmpty()) ? values.get(0) : "";
String fullId = catId + "|" + itemId;
Map<String, String> itemFields = itemDataCollector.get(fullId);
if (itemFields == null) {
itemFields = new HashMap<>();
itemDataCollector.put(fullId, itemFields);
}
itemFields.put(field, value);
}
}
for (Map.Entry<String, Map<String, String>> entry : itemDataCollector.entrySet()) {
String catId = entry.getKey().split("\\|")[0];
Map<String, String> fields = entry.getValue();
String name = fields.get("name");
if (name == null) name = "Sans nom";
String img = fields.get("img");
if (img == null) img = "";
int min = 0;
int max = 0;
try {
String minStr = fields.get("min");
if (minStr != null) min = Integer.parseInt(minStr);
String maxStr = fields.get("max");
if (maxStr != null) max = Integer.parseInt(maxStr);
} catch (Exception e) {
// If error, keep 0
}
Item item = new Item(name, img, min, max);
List<Item> categoryItems = categoriesMap.get(catId);
if (categoryItems != null) {
categoryItems.add(item);
}
}
// Stop to use cat ID and replace with cat name
Map<String, List<Item>> finalData = new LinkedHashMap<>();
for (String catId : categoriesMap.keySet()) {
String realName = categoryNames.get(catId);
finalData.put(realName, categoriesMap.get(catId));
}
// Save data to disk in JSON format
DataLoader.saveData(finalData);
return newFixedLengthResponse("✅ Catalogue enregistré ! <a href='/'>Retour</a>");
} catch (Exception e) {
Log.e("ControlServer", "Erreur lors de la sauvegarde", e);
return newFixedLengthResponse("❌ Erreur : " + e.getMessage());
}
}
// 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 +327,7 @@ public class ControlServer extends NanoHTTPD {
}
}
// Soon deprecated with online editor
/**
* Manage multiple images sent by remote.
*/
@@ -122,17 +343,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 +373,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 +432,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);
}
}
}
}

75
app/src/main/java/com/stock/pignon/DataLoader.java
View File

@@ -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,71 @@ 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;
}
// 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(Map<String, List<Item>> sections) throws Exception {
File dir = new File(Environment.getExternalStorageDirectory(), EXTERNAL_DIR);
File jsonFile = new File(dir, PIECES_FILE);
// To respect original format, we use the same format as GSON
List<Item> globalList = sections.get("global");
if (globalList == null) {
globalList = new ArrayList<>();
}
CategoriesWrapper wrapper = new CategoriesWrapper();
wrapper.globalItems = globalList;
wrapper.categories = new ArrayList<>();
// Fill each category
for (Map.Entry<String, List<Item>> entry : sections.entrySet()) {
if (!"global".equals(entry.getKey())) {
wrapper.categories.add(new Category(entry.getKey(), entry.getValue()));
}
}
// Convert to pretty JSON, human readable
Gson gson = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping().create();
String jsonString = gson.toJson(wrapper);
// Write to disk
try (FileOutputStream fos = new FileOutputStream(jsonFile);
OutputStreamWriter writer = new OutputStreamWriter(fos, "UTF-8")) {
writer.write(jsonString);
writer.flush();
}
// Update app cache
cachedGlobals = wrapper.globalItems;
cachedCategories = wrapper.categories;
}
}

15
app/src/main/java/com/stock/pignon/Item.java
View File

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

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

@@ -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";