diff --git a/assets/data/riders.json b/assets/data/riders.json
index c5735c7..98e5993 100644
--- a/assets/data/riders.json
+++ b/assets/data/riders.json
@@ -1,9 +1,10 @@
[
{
"id": 1,
+ "uid": "4f9b61d5-3747-466c-80de-f307bb6c63d1",
"name": "Dupuy",
"firstName": "Sacha",
- "age": 6,
+ "age": 12,
"lastLessonDate": 1705132800,
"level": 0,
"credit": 15,
@@ -20,9 +21,10 @@
},
{
"id": 2,
+ "uid": "f08674e5-03e1-4cd6-9cb6-eb510df88d61",
"name": "Lefèvre",
- "firstName": "Théo",
- "age": 8,
+ "firstName": "Emma",
+ "age": 15,
"lastLessonDate": 1704873600,
"level": 1,
"credit": 12,
@@ -39,8 +41,9 @@
},
{
"id": 3,
+ "uid": "a169b8f1-1fea-4a09-84e2-19b3d7e98083",
"name": "Bernard",
- "firstName": "Lucas",
+ "firstName": "Lucie",
"age": 10,
"lastLessonDate": 1704797200,
"level": 2,
@@ -58,8 +61,9 @@
},
{
"id": 4,
+ "uid": "92d4a474-54da-4337-910a-b5364239fd45",
"name": "Moreau",
- "firstName": "Jules",
+ "firstName": "Julie",
"age": 12,
"lastLessonDate": 1704700800,
"level": 3,
@@ -77,9 +81,10 @@
},
{
"id": 5,
+ "uid": "fd96e97f-747c-4316-8d43-0da5240abc6b",
"name": "Roux",
"firstName": "Léna",
- "age": 9,
+ "age": 10,
"lastLessonDate": 1704614400,
"level": 1,
"credit": 20,
@@ -96,8 +101,9 @@
},
{
"id": 6,
+ "uid": "3fc0f71e-531e-4c12-8442-e86eb4ebcdab",
"name": "Garnier",
- "firstName": "Maxime",
+ "firstName": "Estelle",
"age": 14,
"lastLessonDate": 1704528000,
"level": 4,
@@ -115,9 +121,10 @@
},
{
"id": 7,
+ "uid": "f3272013-0b87-4c9e-aafc-9edec8ed280f",
"name": "Faure",
"firstName": "Emma",
- "age": 7,
+ "age": 5,
"lastLessonDate": 1704441600,
"level": 0,
"credit": 0,
@@ -134,8 +141,9 @@
},
{
"id": 8,
+ "uid": "0b131632-ba7b-49e6-bd57-b73be26b88a4",
"name": "Marchal",
- "firstName": "Noah",
+ "firstName": "Noémie",
"age": 11,
"lastLessonDate": 1704355200,
"level": 2,
@@ -153,9 +161,10 @@
},
{
"id": 9,
+ "uid": "0b0681f4-8895-4b63-94a8-02dbc933d39d",
"name": "Gauthier",
- "firstName": "Manon",
- "age": 13,
+ "firstName": "Léo",
+ "age": 7,
"lastLessonDate": 1704268800,
"level": 3,
"credit": 6,
@@ -172,9 +181,10 @@
},
{
"id": 10,
+ "uid": "98f17fe3-a656-45c9-b39d-67321a92912b",
"name": "Perrin",
- "firstName": "Alice",
- "age": 5,
+ "firstName": "Ricardo",
+ "age": 16,
"lastLessonDate": 1704182400,
"level": 0,
"credit": -10,
@@ -191,6 +201,7 @@
},
{
"id": 11,
+ "uid": "edf0980a-9941-4f82-a7ac-b92b17456d0f",
"name": "Blanc",
"firstName": "Hugo",
"age": 15,
@@ -210,9 +221,10 @@
},
{
"id": 12,
- "name": "Mercier",
- "firstName": "Chloé",
- "age": 9,
+ "uid": "4ec73195-d431-46e0-8aaf-79b9e0d65f3c",
+ "name": "Kim Jan Bo",
+ "firstName": "Nguam",
+ "age": 17,
"lastLessonDate": 1704009600,
"level": 1,
"credit": 14,
@@ -229,9 +241,10 @@
},
{
"id": 13,
+ "uid": "13f7fcf4-4aca-43a6-8ace-5e4e45e5d4d1",
"name": "Chevalier",
- "firstName": "Camille",
- "age": 12,
+ "firstName": "Joachim",
+ "age": 15,
"lastLessonDate": 1703923200,
"level": 3,
"credit": 7,
@@ -248,6 +261,7 @@
},
{
"id": 14,
+ "uid": "ecb26545-b56f-40f7-9414-aef37ddd96bb",
"name": "Gilles",
"firstName": "Noémie",
"age": 8,
@@ -267,6 +281,7 @@
},
{
"id": 15,
+ "uid": "eca6c30f-5b20-4f02-a192-9c24a55155b7",
"name": "Rousseau",
"firstName": "Malo",
"age": 11,
@@ -286,6 +301,7 @@
},
{
"id": 16,
+ "uid": "df464420-3c7c-40ce-9616-ad57cfc43ace",
"name": "Picard",
"firstName": "Gabriel",
"age": 13,
@@ -305,6 +321,7 @@
},
{
"id": 17,
+ "uid": "444dc6c0-4e39-4d0e-8f07-90fd2be6335f",
"name": "Dupont",
"firstName": "Zoé",
"age": 6,
@@ -324,6 +341,7 @@
},
{
"id": 18,
+ "uid": "3f7610f4-1ef9-4b83-95cd-6f1925896665",
"name": "Vidal",
"firstName": "Ethan",
"age": 14,
@@ -343,6 +361,7 @@
},
{
"id": 19,
+ "uid": "63083e54-928d-4966-aa5b-8045c2372ddb",
"name": "Lemoine",
"firstName": "Arthur",
"age": 10,
@@ -362,9 +381,10 @@
},
{
"id": 20,
+ "uid": "c0fdc5a5-881b-41e5-a6e3-81cd43ccd823",
"name": "Colin",
"firstName": "Louise",
- "age": 9,
+ "age": 14,
"lastLessonDate": 1703318400,
"level": 1,
"credit": 13,
@@ -381,9 +401,10 @@
},
{
"id": 21,
+ "uid": "2f0b4da4-aaba-4598-ab27-02a8be3025ab",
"name": "Aubert",
"firstName": "Mia",
- "age": 7,
+ "age": 3,
"lastLessonDate": 1703232000,
"level": 0,
"credit": 19,
@@ -400,6 +421,7 @@
},
{
"id": 22,
+ "uid": "ee159a3c-644d-4516-9d18-7d94e341bc7e",
"name": "Perrot",
"firstName": "Noah",
"age": 12,
diff --git a/assets/vector/app_icon_1024.svg b/assets/vector/app_icon_1024.svg
new file mode 100644
index 0000000..1dc8604
--- /dev/null
+++ b/assets/vector/app_icon_1024.svg
@@ -0,0 +1,51 @@
+
+
+
diff --git a/project.xml b/project.xml
index 1d9f0db..511d0e5 100644
--- a/project.xml
+++ b/project.xml
@@ -20,9 +20,9 @@
-
+
-
+
@@ -36,8 +36,11 @@
-
-
+
+
+
+
+
diff --git a/src/LPTCManager2026.hx b/src/LPTCManager2026.hx
index 3d4ba45..8792011 100644
--- a/src/LPTCManager2026.hx
+++ b/src/LPTCManager2026.hx
@@ -1,3 +1,5 @@
+import hx.strings.RandomStrings;
+import utils.StringUtils;
import view.RiderCardDrawer;
import openfl.system.Security;
import business.Services;
@@ -37,6 +39,10 @@ class LPTCManager2026 extends Application {
stage.displayState = NORMAL;
stage.scaleMode = NO_SCALE;
+ /*for (i in 0...23){
+ traceYellow(RandomStrings.randomUUIDv4());
+ }*/
+
mainPanel = new MainPanel();
addChild(mainPanel);
diff --git a/src/command/LoadRidersCommand.hx b/src/command/LoadRidersCommand.hx
index 1c6ebd6..c1b59ee 100644
--- a/src/command/LoadRidersCommand.hx
+++ b/src/command/LoadRidersCommand.hx
@@ -35,6 +35,7 @@ class LoadRidersCommand implements ICommand implements IResponder {
var riders:Array = data.map((r:Dynamic) -> {
final id:Int = Std.parseInt(r.id);
+ final uid:String = r.uid;
final name:String = r.name;
final firstName:String = r.firstName;
final age:Int = Std.parseInt(r.age);
@@ -52,7 +53,7 @@ class LoadRidersCommand implements ICommand implements IResponder {
final legalGuardianPhoneNumber:String = r.legalGuardianPhoneNumber;
final legalGuardianEmail:String = r.legalGuardianEmail;
- return new RiderVO(id, name, firstName, age, lastLessonDate, level, credit, address, notes, ffeLicence, ffeLicenceValidityYear,ffeLicenceNumber,legalGuardianName,legalGuardianFirstName,legalGuardianRole,legalGuardianPhoneNumber,legalGuardianEmail);
+ return new RiderVO(id, uid, name, firstName, age, lastLessonDate, level, credit, address, notes, ffeLicence, ffeLicenceValidityYear,ffeLicenceNumber,legalGuardianName,legalGuardianFirstName,legalGuardianRole,legalGuardianPhoneNumber,legalGuardianEmail);
});
model.ridersListDP = new ArrayCollection(riders);
diff --git a/src/components/RidersListRendererAccessory.hx b/src/components/RidersListRendererAccessory.hx
index c0fb8e3..560951e 100644
--- a/src/components/RidersListRendererAccessory.hx
+++ b/src/components/RidersListRendererAccessory.hx
@@ -12,13 +12,10 @@ import feathers.skins.RectangleSkin;
import feathers.controls.LayoutGroup;
class RidersListRendererAccessory extends LayoutGroup {
- private var elementSize:Int;
private var riderCredit:Int;
- public function new(pElementSize:Int = 14, pRiderCredit:Int = 0) {
+ public function new(pRiderCredit:Int = 0) {
super();
-
- elementSize = pElementSize;
riderCredit = pRiderCredit;
}
@@ -28,7 +25,7 @@ class RidersListRendererAccessory extends LayoutGroup {
var l:HorizontalLayout = new HorizontalLayout();
// l.setPadding(Std.int(headerHeight * .1));
l.verticalAlign = MIDDLE;
- l.gap = Std.int(elementSize * .3);
+ l.gap = 10;
layout = l;
backgroundSkin = new RectangleSkin(SolidColor(Constants.PURE_WHITE, 0));
diff --git a/src/components/RoundAvatar.hx b/src/components/RoundAvatar.hx
index c57b0c3..63f3c24 100644
--- a/src/components/RoundAvatar.hx
+++ b/src/components/RoundAvatar.hx
@@ -1,5 +1,6 @@
package components;
+import model.AppModelLocator;
import openfl.display.Bitmap;
import openfl.system.ApplicationDomain;
import openfl.system.LoaderContext;
@@ -24,10 +25,12 @@ import t9.util.ColorTraces.*;
class RoundAvatar extends LayoutGroup {
private var avatarSize:Int;
+ private var riderUID:String;
- public function new(pAvatarSize:Int = 32) {
+ public function new(pAvatarSize:Int = 32, pRiderUID:String) {
super();
avatarSize = pAvatarSize;
+ riderUID = pRiderUID;
}
override private function initialize():Void {
@@ -56,7 +59,8 @@ class RoundAvatar extends LayoutGroup {
mask = m;
var l:Loader = new Loader();
- l.load(new URLRequest("https://lepetittrot.com/lptcm/assets/profile-pictures/pp256/pp_test_256.jpg"));
+ //l.load(new URLRequest("https://lepetittrot.com/lptcm/assets/profile-pictures/pp256/pp_test_256.jpg"));
+ l.load(new URLRequest(Constants.PROFIL_PICTURES_PATH_512 + riderUID + ".jpg"));
l.contentLoaderInfo.addEventListener (Event.COMPLETE, onLoadComplete);
addChild(l);
diff --git a/src/model/Constants.hx b/src/model/Constants.hx
index 630c713..5b96da6 100644
--- a/src/model/Constants.hx
+++ b/src/model/Constants.hx
@@ -4,6 +4,9 @@ import openfl.system.Capabilities;
class Constants {
+ // Paths
+ public static final PROFIL_PICTURES_PATH_512:String = "https://lepetittrot.com/lptcm/assets/profile-pictures/pp512/";
+
// Colors
public static final HERO_COLOR:Int = 0x050EB7;
public static final ACCENT_COLOR1:Int = 0xFF9F1C;
@@ -32,11 +35,12 @@ class Constants {
public static final MONTSERRAT_BOLD_700:String = "MontserratBold700";
// Fonts sizes
- public static final FONT_SIZE_1:Int = Std.int(Capabilities.screenDPI * .15);
- public static final FONT_SIZE_2:Int = Std.int(Capabilities.screenDPI * .2);
- public static final FONT_SIZE_3:Int = Std.int(Capabilities.screenDPI * .25);
- public static final FONT_SIZE_4:Int = Std.int(Capabilities.screenDPI * .3);
- public static final FONT_SIZE_5:Int = Std.int(Capabilities.screenDPI * .5);
+ public static final FONT_SIZE_10:Int = 10;
+ public static final FONT_SIZE_12:Int = 12;
+ public static final FONT_SIZE_14:Int = 14;
+ public static final FONT_SIZE_16:Int = 16;
+ public static final FONT_SIZE_22:Int = 22;
+ public static final FONT_SIZE_26:Int = 26;
// UI Proportions against stage dimmensions
public static final MAIN_HEADER_WIDTH_RATIO:Float = 1;
@@ -47,10 +51,11 @@ class Constants {
public static final CLOSE_DRAWER:String = "closeDrawer";
public static final DRAWER_IS_OPEN:Bool = false;
- // Strings
+ // Text Strings
public static final MENU_ITEM_0_STRING:String = "Cavalier·e·s";
public static final MENU_ITEM_1_STRING:String = "Licences FFE";
public static final RIDERS_LIST_CREDIT_TEXT:String = "Crédit: ";
+ public static final RIDER_CARD_REMAIN_CREDIT_TEXT:String = "Cours restants sur la carte : ";
// UI
// number of rows in RidersList
diff --git a/src/utils/StringUtils.hx b/src/utils/StringUtils.hx
new file mode 100644
index 0000000..a3ce59d
--- /dev/null
+++ b/src/utils/StringUtils.hx
@@ -0,0 +1,37 @@
+package utils;
+
+class StringUtils {
+ /*
+ returns a random string of n characters with Hex chars (0123456789ABCDEF)
+ */
+ static public function getRandomHexString(pStringLength:Int = 8) {
+ {
+ var chars:String = "0123456789abcdef";
+ var rndString:String = "";
+ for (i in 0...pStringLength)
+ rndString += chars.charAt(Math.round(Math.random() * chars.length));
+ return rndString;
+ }
+ }
+
+ /*
+ returns a random string of n characters within ASCII visible chars range (33 ! -> 126 ~)
+ */
+ static public function getRandomStringFromASCII(pStringLength:Int = 8):String {
+ var rndString:String = "";
+ for (i in 0...pStringLength)
+ rndString += String.fromCharCode(Math.round(Math.random() * 93) + 33);
+ return rndString;
+ }
+
+ /*
+ returns a unique id
+ */
+ public static function generateUID():String {
+ var s1:String = StringUtils.getRandomHexString(8);
+ var s2:String = Std.string(Date.now().getTime());
+
+ return s1 + s2.substr(s2.length - 4, 4);
+ }
+
+}
diff --git a/src/view/MainFooter.hx b/src/view/MainFooter.hx
index 34a5397..0b3791a 100644
--- a/src/view/MainFooter.hx
+++ b/src/view/MainFooter.hx
@@ -36,7 +36,7 @@ class MainFooter extends LayoutGroup {
Constants.MAIN_COLOR2,
Constants.HERO_COLOR,
30,
- 14);
+ Constants.FONT_SIZE_14);
btn1.text = Constants.MENU_ITEM_0_STRING;
addChild(btn1);
@@ -44,7 +44,7 @@ class MainFooter extends LayoutGroup {
Constants.MAIN_COLOR2,
Constants.HERO_COLOR,
30,
- 14);
+ Constants.FONT_SIZE_14);
btn2.text = Constants.MENU_ITEM_1_STRING;
addChild(btn2);
diff --git a/src/view/MainHeader.hx b/src/view/MainHeader.hx
index ed0ba4e..10f48ba 100644
--- a/src/view/MainHeader.hx
+++ b/src/view/MainHeader.hx
@@ -1,5 +1,6 @@
package view;
+import haxe.macro.Expr.Constant;
import com.adobe.cairngorm.control.CairngormEvent;
import com.adobe.cairngorm.control.CairngormEventDispatcher;
import components.IconButton;
@@ -62,8 +63,7 @@ class MainHeader extends LayoutGroup {
lbl1 = new Label();
lbl1.text = Constants.MENU_ITEM_0_STRING;
lbl1.embedFonts = true;
- var fnt:Font = Assets.getFont(Constants.MONTSERRAT_MEDIUM_500);
- lbl1.textFormat = new TextFormat(fnt.fontName, Std.int(headerHeight * .3), Constants.MAIN_COLOR3);
+ lbl1.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_MEDIUM_500).fontName, Constants.FONT_SIZE_22, Constants.MAIN_COLOR3);
addChild(lbl1);
}
diff --git a/src/view/RiderCardDrawer.hx b/src/view/RiderCardDrawer.hx
index a014f8e..f39c223 100644
--- a/src/view/RiderCardDrawer.hx
+++ b/src/view/RiderCardDrawer.hx
@@ -1,5 +1,6 @@
package view;
+import feathers.controls.Label;
import feathers.controls.AssetLoader;
import feathers.controls.Button;
import feathers.controls.Drawer;
@@ -28,6 +29,7 @@ class RiderCardDrawer extends Drawer {
private var ppal:AssetLoader;
private var firstNameTextInput:TextInput;
private var nameTextInput:TextInput;
+ private var remainingCreditLabel:Label;
private var closeDrawerButton:Button;
public function new() {
@@ -41,11 +43,16 @@ class RiderCardDrawer extends Drawer {
model = AppModelLocator.getInstance();
overlaySkin = new RectangleSkin(SolidColor(Constants.MAIN_COLOR3, 1));
- pullableEdge = TOP;
+ swipeCloseEnabled = true;
+ //swipeOpenEnabled = false;
+ autoSizeMode = STAGE;
+ pullableEdge = LEFT;
clickOverlayToClose = false;
// main Layout
var mainLaytoutGroup = new LayoutGroup();
+ mainLaytoutGroup.autoSizeMode = STAGE;
+
var mainVerticalLayout = new VerticalLayout();
mainVerticalLayout.setPadding(spacing);
mainVerticalLayout.gap = spacing;
@@ -72,6 +79,7 @@ class RiderCardDrawer extends Drawer {
lg1.backgroundSkin = new RectangleSkin(SolidColor(Constants.MAIN_COLOR1, 0.1));
var vl1:VerticalLayout = new VerticalLayout();
vl1.setPadding(spacing);
+ vl1.gap = -spacing;
vl1.horizontalAlign = JUSTIFY;
lg1.layout = vl1;
mainLaytoutGroup.addChild(lg1);
@@ -80,16 +88,22 @@ class RiderCardDrawer extends Drawer {
firstNameTextInput = new TextInput();
firstNameTextInput.backgroundSkin = null;
firstNameTextInput.embedFonts = true;
- firstNameTextInput.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_BOLD_700).fontName, Constants.FONT_SIZE_5, Constants.MAIN_COLOR1);
+ firstNameTextInput.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_BOLD_700).fontName, Constants.FONT_SIZE_26, Constants.MAIN_COLOR1);
lg1.addChild(firstNameTextInput);
// name label
nameTextInput = new TextInput();
nameTextInput.backgroundSkin = null;
nameTextInput.embedFonts = true;
- nameTextInput.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_MEDIUM_500).fontName, Constants.FONT_SIZE_4, Constants.MAIN_COLOR2);
+ nameTextInput.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_MEDIUM_500).fontName, Constants.FONT_SIZE_22, Constants.MAIN_COLOR2);
lg1.addChild(nameTextInput);
+ // ########################################################################## Remaining credit label
+ remainingCreditLabel = new Label();
+ remainingCreditLabel.embedFonts = true;
+ remainingCreditLabel.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_BOLD_700).fontName, Constants.FONT_SIZE_16, Constants.MAIN_COLOR1);
+ mainLaytoutGroup.addChild(remainingCreditLabel);
+
drawer = mainLaytoutGroup;
}
@@ -99,8 +113,10 @@ class RiderCardDrawer extends Drawer {
public function populateAndShow() {
var rvo:RiderVO = model.selectedRider;
+
// profile picture
ppal.source = "https://lepetittrot.com/lptcm/assets/profile-pictures/pp512/pp_test_512.jpg";
+ ppal.source = Constants.PROFIL_PICTURES_PATH_512 + rvo.uid + ".jpg";
// first name text input
firstNameTextInput.text = rvo.firstName;
@@ -111,7 +127,7 @@ class RiderCardDrawer extends Drawer {
}
});
}
-
+
// name text input
nameTextInput.text = rvo.name;
if (!nameTextInput.hasEventListener(Event.CHANGE)) {
@@ -122,6 +138,9 @@ class RiderCardDrawer extends Drawer {
});
}
+ // remaing credit text
+ remainingCreditLabel.text = Constants.RIDER_CARD_REMAIN_CREDIT_TEXT + Std.string(rvo.credit);
+
openDrawer();
}
diff --git a/src/view/RidersList.hx b/src/view/RidersList.hx
index bbe102b..0c55000 100644
--- a/src/view/RidersList.hx
+++ b/src/view/RidersList.hx
@@ -1,25 +1,21 @@
package view;
-import control.RiderSelectEvent;
-import feathers.events.ListViewEvent;
-import feathers.events.TriggerEvent;
-import feathers.skins.RectangleSkin;
import com.adobe.cairngorm.control.CairngormEventDispatcher;
-import control.AppController;
-import com.adobe.cairngorm.control.CairngormEvent;
import components.RidersListRendererAccessory;
import components.RoundAvatar;
+import control.RiderSelectEvent;
import feathers.controls.ListView;
import feathers.controls.dataRenderers.ItemRenderer;
import feathers.data.ListViewItemState;
import feathers.events.FeathersEvent;
+import feathers.events.ListViewEvent;
+import feathers.skins.RectangleSkin;
import feathers.text.TextFormat;
import feathers.utils.DisplayObjectRecycler;
import model.AppModelLocator;
import model.Constants;
import openfl.Assets;
import openfl.events.Event;
-import openfl.text.Font;
import t9.util.ColorTraces.*;
import vo.RiderVO;
@@ -44,9 +40,8 @@ class RidersList extends ListView {
var itemRenderer = new ItemRenderer();
itemRenderer.height = rowHeight;
- itemRenderer.icon = new RoundAvatar(Std.int(rowHeight * 0.9));
- itemRenderer.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_BOLD_700).fontName, Constants.FONT_SIZE_3, Constants.MAIN_COLOR1);
- itemRenderer.secondaryTextFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_MEDIUM_500).fontName, Constants.FONT_SIZE_2, Constants.MAIN_COLOR2);
+ itemRenderer.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_BOLD_700).fontName, Constants.FONT_SIZE_16, Constants.MAIN_COLOR1);
+ itemRenderer.secondaryTextFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_MEDIUM_500).fontName, Constants.FONT_SIZE_12, Constants.MAIN_COLOR2);
var rs1 = new RectangleSkin(SolidColor(Constants.MAIN_COLOR3, 1), SolidColor(1, Constants.LIST_SEPARATOR_COLOR));
var rs2 = new RectangleSkin(SolidColor(Constants.LIST_SEPARATOR_COLOR, 1), SolidColor(1, Constants.LIST_SEPARATOR_COLOR));
@@ -66,13 +61,10 @@ class RidersList extends ListView {
var rider:RiderVO = cast(state.data, RiderVO);
itemRenderer.text = rider.firstName;
itemRenderer.secondaryText = rider.name;
+
+ itemRenderer.icon = new RoundAvatar(Std.int(rowHeight * 0.9), rider.uid);
- var rlra:RidersListRendererAccessory = new RidersListRendererAccessory(Std.int(rowHeight * 0.8), rider.credit);
- itemRenderer.accessoryView = rlra;
-
- // TODO change this to real image path
- // loader.source = "https://lepetittrot.com/path/to/pp_pictures" + state.data.id + ".jpg";
- // loader.source = "https://testingbot.com/free-online-tools/random-avatar/50?u=" + Uuid.nanoId();
+ itemRenderer.accessoryView = new RidersListRendererAccessory(rider.credit);
};
recycler.reset = (itemRenderer:ItemRenderer, state:ListViewItemState) -> {
diff --git a/src/view/ToolBar.hx b/src/view/ToolBar.hx
index bd6728e..a94ca8f 100644
--- a/src/view/ToolBar.hx
+++ b/src/view/ToolBar.hx
@@ -36,7 +36,7 @@ class ToolBar extends LayoutGroup {
// Layout settings
var l:HorizontalLayout = new HorizontalLayout();
- l.setPadding(Std.int(headerHeight * .1));
+ l.setPadding(10);
l.verticalAlign = MIDDLE;
layout = l;
@@ -47,10 +47,9 @@ class ToolBar extends LayoutGroup {
//lb1.backgroundSkin = new RectangleSkin(SolidColor(Constants.ACCENT_COLOR2, 1));
//lb1.verticalAlign = VerticalAlign.TOP;
- var fnt:Font = Assets.getFont(Constants.MONTSERRAT_MEDIUM_500);
lbl1.text = "Toolbar";
lbl1.embedFonts = true;
- lbl1.textFormat = new TextFormat(fnt.fontName, Std.int(headerHeight * .3), Constants.MAIN_COLOR3);
+ lbl1.textFormat = new TextFormat(Assets.getFont(Constants.MONTSERRAT_MEDIUM_500).fontName, Constants.FONT_SIZE_16, Constants.MAIN_COLOR3);
addChild(lbl1);
}
diff --git a/src/vo/RiderVO.hx b/src/vo/RiderVO.hx
index 21c80c5..164959b 100644
--- a/src/vo/RiderVO.hx
+++ b/src/vo/RiderVO.hx
@@ -1,10 +1,10 @@
package vo;
class RiderVO {
- private static var currentIndex:Int = 0;
// constants for use with Reflect api when updating SelectedRider VO
public static final ID:String = "id";
+ public static final UID:String = "uid";
public static final NAME:String = "name";
public static final FIRST_NAME:String = "firstName";
public static final AGE:String = "age";
@@ -23,6 +23,7 @@ class RiderVO {
public static final LEGAL_GUARDIAN_EMAIL:String = "legalGuardianEmail";
public var id:Int;
+ public var uid:String;
public var name:String;
public var firstName:String;
public var age:Int;
@@ -42,6 +43,7 @@ class RiderVO {
public function new(?pId:Int = 0,
+ ?pUId:String = "",
?pName:String = "",
?pFirstName:String = "",
?pAge:Int = 0,
@@ -59,7 +61,8 @@ class RiderVO {
?pLegalGuardianPhoneNumber:String = "",
?pLegalGuardianEmail:String = "") {
- id = (pId == 0) ? currentIndex++ : pId;
+ id = pId;
+ uid = pUId;
name = pName;
firstName = pFirstName;
age = pAge;