From f5095ac97ac44431802cf4761f2d6248b2bce3a2 Mon Sep 17 00:00:00 2001
From: SomeoneOnEarth <github@someone.earth>
Date: Wed, 6 Dec 2023 00:51:06 +0100
Subject: [PATCH] Code cleanups

---
 source/HomeAssistantApp.mc        |  2 +-
 source/HomeAssistantGlanceView.mc | 12 +++--------
 source/RootView.mc                | 36 ++++++++++++++++++++++++-------
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/source/HomeAssistantApp.mc b/source/HomeAssistantApp.mc
index 565ea92..7c78723 100644
--- a/source/HomeAssistantApp.mc
+++ b/source/HomeAssistantApp.mc
@@ -176,7 +176,7 @@ class HomeAssistantApp extends Application.AppBase {
         return mHaMenu!=null;
     }
 
-    function pushHomeAssistantMenuView(){
+    function pushHomeAssistantMenuView() as Void{
         WatchUi.pushView(mHaMenu, new HomeAssistantViewDelegate(), WatchUi.SLIDE_IMMEDIATE);
     }
 
diff --git a/source/HomeAssistantGlanceView.mc b/source/HomeAssistantGlanceView.mc
index 9d2237e..f6ab6ec 100644
--- a/source/HomeAssistantGlanceView.mc
+++ b/source/HomeAssistantGlanceView.mc
@@ -18,8 +18,8 @@
 //
 //-----------------------------------------------------------------------------------
 
-import Toybox.WatchUi;
-import Toybox.Graphics;
+using Toybox.WatchUi;
+using Toybox.Graphics;
 
 (:glance)
 class HomeAssistantGlanceView extends WatchUi.GlanceView {
@@ -28,13 +28,7 @@ class HomeAssistantGlanceView extends WatchUi.GlanceView {
         GlanceView.initialize();
     }
 
-    function onShow() {
-    }
-
-    function onHide() {
-    }
-
-    function onUpdate(dc) {
+    function onUpdate(dc) as Void {
         GlanceView.onUpdate(dc);
       
         var font = Graphics.FONT_TINY;
diff --git a/source/RootView.mc b/source/RootView.mc
index 4a913cd..0b1623b 100644
--- a/source/RootView.mc
+++ b/source/RootView.mc
@@ -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 {
 
@@ -12,12 +32,12 @@ class RootView extends WatchUi.View {
         mApp=app;
     }
 
-    function onLayout(dc as Dc) as Void {
+    function onLayout(dc as Graphics.Dc) as Void {
         width=dc.getWidth();
 		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.clear();
 		dc.setColor(Graphics.COLOR_BLUE,Graphics.COLOR_TRANSPARENT);
@@ -38,15 +58,15 @@ class RootViewDelegate extends WatchUi.BehaviorDelegate {
         mApp=app;
     }
 
-    public function onTap(evt as ClickEvent) as Boolean {
+    function onTap(evt as WatchUi.ClickEvent) as Lang.Boolean {
         return backToMainMenu();
     }
 
-    public function onSelect() as Boolean {
+    function onSelect() as Lang.Boolean {
         return backToMainMenu();
     }
 
-    function onMenu(){
+    function onMenu() as Lang.Boolean{
         return backToMainMenu();
     }