remi/GarminHomeAssistant
1
0
Fork 0
mirror of https://github.com/house-of-abbey/GarminHomeAssistant.git synced 2025-10-31 15:48:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed crash when value was int instead of float

Browse Source
This commit is contained in:
thmichel
2025-10-16 13:34:39 +02:00
parent b34291e41f
commit 4348c899ae
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/HomeAssistantNumericMenuItem.mc
View File

@@ -154,7 +154,13 @@ class HomeAssistantNumericMenuItem extends HomeAssistantMenuItem {
} else if(data instanceof Lang.Float) { } else if(data instanceof Lang.Float) {
var f = data as Lang.Float; var f = data as Lang.Float;
setSubLabel(f.format(mFormatString)); setSubLabel(f.format(mFormatString));
} else { } else if(data instanceof Lang.Number) {
var f = data.toFloat() as Lang.Float;
setSubLabel(f.format(mFormatString));
} else if (data instanceof Lang.String){
setSubLabel(data);
}
else {
// The template must return a Float, or the item cannot be formatted locally without error. // The template must return a Float, or the item cannot be formatted locally without error.
setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String); setSubLabel(WatchUi.loadResource($.Rez.Strings.TemplateError) as Lang.String);
} }

2
source/HomeAssistantView.mc
View File

@@ -275,7 +275,7 @@ class HomeAssistantViewDelegate extends WatchUi.Menu2InputDelegate {
var mPickerFactory = new HomeAssistantNumericFactory(haItem.getData()); var mPickerFactory = new HomeAssistantNumericFactory(haItem.getData());
var mPicker = new HomeAssistantNumericPicker(mPickerFactory,haItem);//{:pattern => [mPickerFactory}); var mPicker = new HomeAssistantNumericPicker(mPickerFactory,haItem);
var mPickerDelegate = new HomeAssistantNumericPickerDelegate(mPicker); var mPickerDelegate = new HomeAssistantNumericPickerDelegate(mPicker);
WatchUi.pushView(mPicker,mPickerDelegate,WatchUi.SLIDE_LEFT); WatchUi.pushView(mPicker,mPickerDelegate,WatchUi.SLIDE_LEFT);
} else if (item instanceof HomeAssistantGroupMenuItem) { } else if (item instanceof HomeAssistantGroupMenuItem) {

2
source/factory/HomeAssistantNumericFactory.mc
View File

@@ -65,7 +65,7 @@ class HomeAssistantNumericFactory extends WatchUi.PickerFactory {
public function getDrawable(index as Number, selected as Boolean) as Drawable? { public function getDrawable(index as Number, selected as Boolean) as Drawable? {
var value = getValue(index); var value = getValue(index);
var text = "No item"; var text = "No item";
if (value instanceof Float) { if (value instanceof Lang.Float) {
text = value.format(mFormatString); text = value.format(mFormatString);
} }
return new WatchUi.Text({:text=>text, :color=>Graphics.COLOR_WHITE, return new WatchUi.Text({:text=>text, :color=>Graphics.COLOR_WHITE,