Code cleanups

This commit is contained in:
SomeoneOnEarth
2023-12-06 00:51:06 +01:00
parent 6bb9d836ac
commit f5095ac97a
3 changed files with 32 additions and 18 deletions

View File

@ -176,7 +176,7 @@ class HomeAssistantApp extends Application.AppBase {
return mHaMenu!=null; return mHaMenu!=null;
} }
function pushHomeAssistantMenuView(){ function pushHomeAssistantMenuView() as Void{
WatchUi.pushView(mHaMenu, new HomeAssistantViewDelegate(), WatchUi.SLIDE_IMMEDIATE); WatchUi.pushView(mHaMenu, new HomeAssistantViewDelegate(), WatchUi.SLIDE_IMMEDIATE);
} }

View File

@ -18,8 +18,8 @@
// //
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
import Toybox.WatchUi; using Toybox.WatchUi;
import Toybox.Graphics; using Toybox.Graphics;
(:glance) (:glance)
class HomeAssistantGlanceView extends WatchUi.GlanceView { class HomeAssistantGlanceView extends WatchUi.GlanceView {
@ -28,13 +28,7 @@ class HomeAssistantGlanceView extends WatchUi.GlanceView {
GlanceView.initialize(); GlanceView.initialize();
} }
function onShow() { function onUpdate(dc) as Void {
}
function onHide() {
}
function onUpdate(dc) {
GlanceView.onUpdate(dc); GlanceView.onUpdate(dc);
var font = Graphics.FONT_TINY; var font = Graphics.FONT_TINY;

View File

@ -1,6 +1,26 @@
import Toybox.Graphics; //-----------------------------------------------------------------------------------
import Toybox.Lang; //
import Toybox.WatchUi; // Distributed under MIT Licence
// See https://github.com/house-of-abbey/GarminHomeAssistant/blob/main/LICENSE.
//
//-----------------------------------------------------------------------------------
//
// GarminHomeAssistant is a Garmin IQ application written in Monkey C and routinely
// tested on a Venu 2 device. The source code is provided at:
// https://github.com/house-of-abbey/GarminHomeAssistant.
//
// P A Abbey & J D Abbey & SomeoneOnEarth, 5 December 2023
//
//
// Description:
//
// Application root view for GarminHomeAssistant
//
//-----------------------------------------------------------------------------------
using Toybox.Graphics;
using Toybox.Lang;
using Toybox.WatchUi;
class RootView extends WatchUi.View { class RootView extends WatchUi.View {
@ -12,12 +32,12 @@ class RootView extends WatchUi.View {
mApp=app; mApp=app;
} }
function onLayout(dc as Dc) as Void { function onLayout(dc as Graphics.Dc) as Void {
width=dc.getWidth(); width=dc.getWidth();
height=dc.getHeight(); height=dc.getHeight();
} }
function onUpdate(dc as Dc) as Void { function onUpdate(dc as Graphics.Dc) as Void {
dc.setColor(Graphics.COLOR_BLACK,Graphics.COLOR_BLACK); dc.setColor(Graphics.COLOR_BLACK,Graphics.COLOR_BLACK);
dc.clear(); dc.clear();
dc.setColor(Graphics.COLOR_BLUE,Graphics.COLOR_TRANSPARENT); dc.setColor(Graphics.COLOR_BLUE,Graphics.COLOR_TRANSPARENT);
@ -38,15 +58,15 @@ class RootViewDelegate extends WatchUi.BehaviorDelegate {
mApp=app; mApp=app;
} }
public function onTap(evt as ClickEvent) as Boolean { function onTap(evt as WatchUi.ClickEvent) as Lang.Boolean {
return backToMainMenu(); return backToMainMenu();
} }
public function onSelect() as Boolean { function onSelect() as Lang.Boolean {
return backToMainMenu(); return backToMainMenu();
} }
function onMenu(){ function onMenu() as Lang.Boolean{
return backToMainMenu(); return backToMainMenu();
} }