From efd69c3aa86a55f88aee87e39a1308f770f9849b Mon Sep 17 00:00:00 2001 From: nekotoro Date: Thu, 22 Jan 2026 20:54:47 +0100 Subject: [PATCH] mxhx fiddling --- src/model/AppModelLocator.hx | 1 + src/model/Constants.hx | 1 - src/view/RiderCardDrawer.hx | 13 +++++++----- src/view/RiderCardDrawer.mxhx | 39 +++++++++++++++++++++++++---------- 4 files changed, 37 insertions(+), 17 deletions(-) diff --git a/src/model/AppModelLocator.hx b/src/model/AppModelLocator.hx index 178912c..e8e2478 100644 --- a/src/model/AppModelLocator.hx +++ b/src/model/AppModelLocator.hx @@ -1,5 +1,6 @@ package model; +import bindx.IBindable; import view.RidersList; import vo.RiderVO; import feathers.data.ArrayCollection; diff --git a/src/model/Constants.hx b/src/model/Constants.hx index 074f2a5..4a39a83 100644 --- a/src/model/Constants.hx +++ b/src/model/Constants.hx @@ -33,7 +33,6 @@ class Constants { public static final MONTSERRAT_REGULAR_400:String = "Montserrat Regular"; public static final MONTSERRAT_MEDIUM_500:String = "Montserrat Medium"; public static final MONTSERRAT_BOLD_700:String = "Montserrat Bold"; - public static final HIGH_SPIRITED:String = "HighSpirited"; // Fonts sizes public static final FONT_SIZE_10:Int = 10; diff --git a/src/view/RiderCardDrawer.hx b/src/view/RiderCardDrawer.hx index a07ebf0..da5f95e 100644 --- a/src/view/RiderCardDrawer.hx +++ b/src/view/RiderCardDrawer.hx @@ -1,5 +1,8 @@ package view; +import ui.LPTCTheme; +import model.String.Strings; +import feathers.text.TextFormat; import openfl.Assets; import feathers.controls.ScrollContainer; import feathers.controls.Drawer; @@ -13,7 +16,7 @@ import t9.util.ColorTraces.*; class RiderCardDrawer extends Drawer { public static final CLOSE:String = "close"; public static final OPEN:String = "open"; - + private var appModel:AppModelLocator; public function new() { @@ -49,15 +52,15 @@ class RiderCardDrawer extends Drawer { // profile picture ppal.source = Constants.PROFIL_PICTURES_PATH_512 + appModel.selectedRider.uid + ".jpg"; - firstNameLabel.text = AppModelLocator.getInstance().selectedRider.firstName; + /*firstNameLabel.text = AppModelLocator.getInstance().selectedRider.firstName; nameLabel.text = AppModelLocator.getInstance().selectedRider.name; - + creditLabel.text = Strings.RCD_S1;*/ openDrawer(); } // update remaining credit label and progress bar - /*private function updateCreditUIElments(pFromValue:Dynamic, pToValue:Dynamic) { + private function updateCreditUIElments(pFromValue:Dynamic, pToValue:Dynamic) { creditLabel.text = Strings.RCD_S1 + Std.string(pToValue); @@ -71,5 +74,5 @@ class RiderCardDrawer extends Drawer { creditProgressBar.variant = LPTCTheme.H_PROGRESS_BAR_VARIANT_INFO; } creditProgressBar.value = pToValue; - }*/ + } } diff --git a/src/view/RiderCardDrawer.mxhx b/src/view/RiderCardDrawer.mxhx index 45f7fad..2859b96 100644 --- a/src/view/RiderCardDrawer.mxhx +++ b/src/view/RiderCardDrawer.mxhx @@ -3,6 +3,7 @@ xmlns:f="https://ns.feathersui.com/mxhx" xmlns:components="components.*"> + - - - + - + + + + - - - + @@ -42,9 +43,10 @@ paddingTop="0" paddingRight="0" paddingBottom="0" - embedFonts="true"> + embedFonts="true" + text="{appModel.selectedRider.firstName}"> - + @@ -55,10 +57,25 @@ paddingBottom="0" embedFonts="true"> - + - + + + + + + + + + +