Renamed functions and base classes #287

TheNinth7 · TheNinth7 · commit c1e1780d11d0 · 2026-03-02T07:24:33.000+01:00
diff --git a/source/config/base/BaseConfig.mc b/source/config/base/BaseConfig.mc
@@ -39,7 +39,7 @@ class BaseConfig {
     /******* INPUT HINTS *******/ 
 
     // Positions of the device buttons, for drawing input hints
-    // Corresponds to BaseControlView.InputHints enumeration
+    // Corresponds to ControlView.InputHints enumeration
     // 0=ENTER
     // 1=BACK
     // 2=UP
diff --git a/source/config/base/BaseGlanceConfig.mc b/source/config/base/BaseGlanceConfig.mc
@@ -10,7 +10,7 @@ import Toybox.System;
  * subclasses can override individual constants as needed.
  */
 (:glance)
-class GlanceBaseConfig {
+class BaseGlanceConfig {
     protected function initialize() {}
     
     // The fonts available for the glance
diff --git a/source/config/device-default/GlanceConfig.mc b/source/config/device-default/GlanceConfig.mc
@@ -4,6 +4,6 @@ import Toybox.Lang;
 * The default `Config` implementation inherits all default values and overrides none.
 */
 (:glance)
-class GlanceConfig extends GlanceBaseConfig {
-    protected function initialize() { GlanceBaseConfig.initialize(); }
+class GlanceConfig extends BaseGlanceConfig {
+    protected function initialize() { BaseGlanceConfig.initialize(); }
 }
diff --git a/source/config/device-edge/base/EdgeConfig.mc b/source/config/device-edge/base/EdgeConfig.mc
@@ -6,7 +6,7 @@ import Toybox.System;
 * Default values for all Edge devices.
 * Config implementations vary between button-based and touch-based devices.
 */
-class EdgeBaseConfig extends BaseConfig {
+class EdgeConfig extends BaseConfig {
     protected function initialize() { BaseConfig.initialize(); }
 
     // Heights of menu elements
diff --git a/source/config/device-edge/device-x40-button/Config.mc b/source/config/device-edge/device-x40-button/Config.mc
@@ -5,8 +5,8 @@ import Toybox.System;
 /*
 * Config specific to button-based Edge devices.
 */
-class Config extends EdgeBaseConfig {
-    protected function initialize() { EdgeBaseConfig.initialize(); }
+class Config extends EdgeConfig {
+    protected function initialize() { EdgeConfig.initialize(); }
 
     // On Edge devices, the connection mode indicator is displayed below
     // the title text, so the title text is positioned higher
diff --git a/source/config/device-edge/device-x40-touch/Config.mc b/source/config/device-edge/device-x40-touch/Config.mc
@@ -5,9 +5,9 @@ import Toybox.System;
 /*
 * Config for touch-based Edge devices.
 */
-class Config extends EdgeBaseConfig {
+class Config extends EdgeConfig {
 
-    protected function initialize() { EdgeBaseConfig.initialize(); }
+    protected function initialize() { EdgeConfig.initialize(); }
 
     // On Edge devices, the connection mode indicator is displayed below
     // the title text, so the title text is positioned higher
diff --git a/source/config/device-edge/device-x50-button/base/EdgeX50ButtonConfig.mc b/source/config/device-edge/device-x50-button/base/EdgeX50ButtonConfig.mc
@@ -5,11 +5,11 @@ import Toybox.System;
 /*
 * Config specific to button-based Edge devices.
 */
-class EdgeX50ButtonBaseConfig extends EdgeBaseConfig {
-    protected function initialize() { EdgeBaseConfig.initialize(); }
+class EdgeX50ButtonConfig extends EdgeConfig {
+    protected function initialize() { EdgeConfig.initialize(); }
 
     // Positions of the keys, for drawing input hints
-    // Corresponds to BaseControlView.InputHints enumeration
+    // Corresponds to ControlView.InputHints enumeration
     // 0=ENTER
     // 1=BACK
     // 2=UP
diff --git a/source/config/device-edge/device-x50-button/device-550/Config.mc b/source/config/device-edge/device-x50-button/device-550/Config.mc
@@ -5,8 +5,8 @@ import Toybox.System;
 /*
 * Config specific to button-based Edge devices.
 */
-class Config extends EdgeX50ButtonBaseConfig {
-    protected function initialize() { EdgeX50ButtonBaseConfig.initialize(); }
+class Config extends EdgeX50ButtonConfig {
+    protected function initialize() { EdgeX50ButtonConfig.initialize(); }
 
     // The following two constants control the workaround for a firmware bug on the
     // Edge 550 and 850 that prevents the focus indicator from being rendered properly.
diff --git a/source/config/device-edge/device-x50-button/device-850/Config.mc b/source/config/device-edge/device-x50-button/device-850/Config.mc
@@ -5,8 +5,8 @@ import Toybox.System;
 /*
 * Config specific to button-based Edge devices.
 */
-class Config extends EdgeX50ButtonBaseConfig {
-    protected function initialize() { EdgeX50ButtonBaseConfig.initialize(); }
+class Config extends EdgeX50ButtonConfig {
+    protected function initialize() { EdgeX50ButtonConfig.initialize(); }
 
     // The following two constants control the workaround for a firmware bug on the
     // Edge 550 and 850 that prevents the focus indicator from being rendered properly.
diff --git a/source/config/device-edge/device-x50-touch/Config.mc b/source/config/device-edge/device-x50-touch/Config.mc
@@ -5,9 +5,9 @@ import Toybox.System;
 /*
 * Config for touch-based Edge devices.
 */
-class Config extends EdgeBaseConfig {
+class Config extends EdgeConfig {
 
-    protected function initialize() { EdgeBaseConfig.initialize(); }
+    protected function initialize() { EdgeConfig.initialize(); }
 
     // Show menu item dividers
     public static const UI_MENU_ITEM_SHOW_DIVIDER as Boolean = true;
diff --git a/source/config/device-edge/glance/GlanceConfig.mc b/source/config/device-edge/glance/GlanceConfig.mc
@@ -6,8 +6,8 @@ import Toybox.System;
 * `GlanceConfig` uses a single implementation for all Edge devices.
 */
 (:glance)
-class GlanceConfig extends GlanceBaseConfig {
-    protected function initialize() { GlanceBaseConfig.initialize(); }
+class GlanceConfig extends BaseGlanceConfig {
+    protected function initialize() { BaseGlanceConfig.initialize(); }
     
     // Edge devices need larger fonts
     public static const UI_GLANCE_FONTS as Array<FontDefinition> = [Graphics.FONT_GLANCE];
diff --git a/source/config/device-fenix6pro/GlanceConfig.mc b/source/config/device-fenix6pro/GlanceConfig.mc
@@ -6,6 +6,6 @@ import Toybox.Graphics;
 * No changes to the default values are required.
 */
 (:glance)
-class GlanceConfig extends GlanceBaseConfig {
-    protected function initialize() { GlanceBaseConfig.initialize(); }
+class GlanceConfig extends BaseGlanceConfig {
+    protected function initialize() { BaseGlanceConfig.initialize(); }
 }
diff --git a/source/config/device-forerunner/Config.mc b/source/config/device-forerunner/Config.mc
@@ -7,7 +7,7 @@ class Config extends BaseConfig {
     protected function initialize() { BaseConfig.initialize(); }
     
     // Positions of the keys, for drawing input hints
-    // Corresponds to BaseControlView.InputHints enumeration
+    // Corresponds to ControlView.InputHints enumeration
     // 0=ENTER
     // 1=BACK
     public static const UI_INPUT_HINT_POSITIONS as Array<Number> = [25, 330];
diff --git a/source/config/device-forerunner/GlanceConfig.mc b/source/config/device-forerunner/GlanceConfig.mc
@@ -6,6 +6,6 @@ import Toybox.Graphics;
 * No changes to the default values are required.
 */
 (:glance)
-class GlanceConfig extends GlanceBaseConfig {
-    protected function initialize() { GlanceBaseConfig.initialize(); }
+class GlanceConfig extends BaseGlanceConfig {
+    protected function initialize() { BaseGlanceConfig.initialize(); }
 }
diff --git a/source/config/device-venux1/GlanceConfig.mc b/source/config/device-venux1/GlanceConfig.mc
@@ -5,6 +5,6 @@ import Toybox.Graphics;
 * `GlanceConfig` uses a single implementation for all Edge devices.
 */
 (:glance)
-class GlanceConfig extends GlanceBaseConfig {
-    protected function initialize() { GlanceBaseConfig.initialize(); }
+class GlanceConfig extends BaseGlanceConfig {
+    protected function initialize() { BaseGlanceConfig.initialize(); }
 }
diff --git a/source/main/data/communications/sync-delegates/command/CommandSyncDelegate.mc b/source/main/data/communications/sync-delegates/command/CommandSyncDelegate.mc
@@ -50,11 +50,11 @@ class CommandSyncDelegate extends BaseSyncDelegate {
 
     // Helper function that can be used to access the command,
     // while ensuring that a command is present.
-    private function ensureCommand() as WifiSyncCommand {
+    private function getCommand() as WifiSyncCommand {
         if( _cmd != null ) {
             return _cmd;
         } else {
-            // Logger.debug( "CommandSyncDelegate.ensureCommand: command is missing" );
+            // Logger.debug( "CommandSyncDelegate.getCommand: command is missing" );
             throw new GeneralException( "CommandSyncDelegate: command is missing" );
         }
     }
@@ -63,7 +63,7 @@ class CommandSyncDelegate extends BaseSyncDelegate {
     // Part of the CommandRequestDelegate interface
     public function getItemName() as String {
         // Logger.debug( "CommandSyncDelegate.getItemName" );
-        return ensureCommand()[0];
+        return getCommand()[0];
     }
 
     // Is called when the command request is successful and terminates
@@ -101,7 +101,7 @@ class CommandSyncDelegate extends BaseSyncDelegate {
             
         // Send the command
         if( commandRequest != null ) {
-            commandRequest.sendCommand( ensureCommand()[1] );
+            commandRequest.sendCommand( getCommand()[1] );
         } else {
             throw new GeneralException( "CommandSyncDelegate: neither REST API nor Webhook are available" );
         }
diff --git a/source/main/infrastructure/memory/MemoryManager.mc b/source/main/infrastructure/memory/MemoryManager.mc
@@ -10,7 +10,7 @@ class MemoryManager {
     // If not, throw a catchable exception.
     // This threshold is intentionally generous but reasonable,
     // considering we only support devices with 500 kB or more of app memory.
-    public static function ensureMemory() as Void {
+    public static function ensureSufficientMemory() as Void {
         if( System.getSystemStats().freeMemory < 10240 ) {
             throw new OutOfMemoryException();
         }
diff --git a/source/main/user-interface/features/sitemap/base/control/input-hints/InputHintIcon-rectangular.mc b/source/main/user-interface/features/sitemap/base/control/input-hints/InputHintIcon-rectangular.mc
@@ -9,7 +9,7 @@ import Toybox.WatchUi;
  *
  * This class also accepts a touch area identifier. If provided,
  * it will create a corresponding touch area, which is automatically
- * added by BaseControlView.
+ * added by ControlView.
  */
 (:exclForTouch :exclForScreenRound)
 class InputHintIcon extends Bitmap {
diff --git a/source/main/user-interface/features/sitemap/base/control/input-hints/InputHintIcon-round.mc b/source/main/user-interface/features/sitemap/base/control/input-hints/InputHintIcon-round.mc
@@ -9,7 +9,7 @@ import Toybox.WatchUi;
  *
  * This class also accepts a touch area identifier. If provided,
  * it will create a corresponding touch area, which is automatically
- * added by BaseControlView.
+ * added by ControlView.
  */
 (:exclForTouch :exclForScreenRectangular)
 class InputHintIcon extends Bitmap {
diff --git a/source/main/user-interface/features/sitemap/base/control/touch-area/TouchArea.mc b/source/main/user-interface/features/sitemap/base/control/touch-area/TouchArea.mc
@@ -10,10 +10,10 @@ import Toybox.Lang;
  * lies within the touch area.
  *
  * Usage:
- * - Create a view that extends BaseControlView.
+ * - Create a view that extends ControlView.
  * - Add instances of touch areas via addTouchArea().
  * - Alternatively, use InteractiveRelativeBitmap drawables with a defined touch identifier.
- * - Handle touch events by implementing BaseControlViewDelegate.onAreaTap().
+ * - Handle touch events by implementing ControlViewDelegate.onAreaTap().
  */
 class TouchArea {
     // Handle the identifier
diff --git a/source/main/user-interface/features/sitemap/base/control/view/ControlView.mc b/source/main/user-interface/features/sitemap/base/control/view/ControlView.mc
@@ -13,13 +13,13 @@ import Toybox.Graphics;
  * to ensure the Drawables are properly rendered.
  *
  * Use addTouchArea() to define areas that trigger actions when tapped 
- * (see BaseControlViewDelegate). If a InteractiveRelativeBitmap with a touch area is added,
+ * (see ControlViewDelegate). If a InteractiveRelativeBitmap with a touch area is added,
  * the area is automatically included.
  *
  * Subclasses can also use addInputHint() to display input hints on button-based devices—
  * indicators showing which buttons perform which actions.
  */
-class BaseControlView extends View {
+class ControlView extends View {
 
     // Constructor
     public function initialize() {
@@ -85,7 +85,7 @@ class BaseControlView extends View {
     
     // Clear the Dc and draw all Drawables    
     public function onUpdate( dc as Dc ) as Void {
-        // Logger.debug( "BaseControlView.onUpdate: start" );
+        // Logger.debug( "ControlView.onUpdate: start" );
 
         // We need to clear the clip, because there is bug in Garmin SDK,
         // with a clip in the menu title setting a clip in subsequent views
@@ -97,7 +97,7 @@ class BaseControlView extends View {
         dc.clear();
 
         draw( dc );
-        // Logger.debug( "BaseControlView.onUpdate: end" );
+        // Logger.debug( "ControlView.onUpdate: end" );
     }
 
     // Touch areas with accessors
diff --git a/source/main/user-interface/features/sitemap/base/control/view/ControlViewDelegate.mc b/source/main/user-interface/features/sitemap/base/control/view/ControlViewDelegate.mc
@@ -3,7 +3,7 @@ import Toybox.WatchUi;
 import Toybox.Graphics;
 
 /*
- * Base class for delegates used with BaseControlView.
+ * Base class for delegates used with ControlView.
  *
  * The onSelect() method is triggered by a screen tap, which can conflict
  * with using onTap() for handling touch events on specific areas.
@@ -12,12 +12,12 @@ import Toybox.Graphics;
  *
  * For touch input, subclasses can implement onAreaTap() to receive taps
  * along with the identifier of the touched area. This identifier corresponds
- * to the one used when defining the area in BaseControlView.
+ * to the one used when defining the area in ControlView.
  *
  * If touch areas are not being used, subclasses may override onTap()
  * to define a single behavior for all screen taps.
  */
-class BaseControlViewDelegate extends BehaviorDelegate {
+class ControlViewDelegate extends BehaviorDelegate {
 
     // Constructor
     public function initialize() {
@@ -32,11 +32,11 @@ class BaseControlViewDelegate extends BehaviorDelegate {
     // The onTap() implementation checks which touch area has
     // been tapped and then calls onTapArea() with its identifier
     public function onTap( clickEvent as ClickEvent ) as Boolean {
-        // Logger.debug "BaseControlViewDelegate.onTap" );
+        // Logger.debug "ControlViewDelegate.onTap" );
         try {
-            // Only do this if the view is a BaseControlView
+            // Only do this if the view is a ControlView
             var currentView = ViewStack.getCurrentView()[0];
-            if( currentView instanceof BaseControlView ) {
+            if( currentView instanceof ControlView ) {
                 var touchAreas = currentView.getTouchAreas();
                 var coordinates = clickEvent.getCoordinates();
                 for( var i = touchAreas.size() - 1; i >= 0; i-- ) {
@@ -56,7 +56,7 @@ class BaseControlViewDelegate extends BehaviorDelegate {
     // Subclasses should override this and implement
     // behaviors for the individual tap areas
     public function onAreaTap( area as Symbol, clickEvent as ClickEvent ) as Boolean {
-        // Logger.debug "BaseControlViewDelegate.onAreaTap" );
+        // Logger.debug "ControlViewDelegate.onAreaTap" );
         return false;
     }
 }
diff --git a/source/main/user-interface/features/sitemap/pages/homepage/HomepageMenu.mc b/source/main/user-interface/features/sitemap/pages/homepage/HomepageMenu.mc
@@ -104,11 +104,11 @@ class HomepageMenu extends BasePageMenu {
     // Returns true, if any sitemap-related view is currently showing
     // These are:
     // - Any `CustomMenu` implementations, exception the `SettingsMenu`
-    // - Any `BaseControlView`
+    // - Any `ControlView`
     public static function isSitemapShowing() as Boolean {
         var currentView = ViewStack.getCurrentView()[0];
         return  ( currentView instanceof CustomMenu && ! ( currentView instanceof SettingsMenu ) )
-                || currentView instanceof BaseControlView;
+                || currentView instanceof ControlView;
     }
 
     /******* INSTANCE *******/
diff --git a/source/main/user-interface/features/sitemap/shared/picker/BaseDynamicPickerDelegate.mc b/source/main/user-interface/features/sitemap/shared/picker/BaseDynamicPickerDelegate.mc
@@ -21,11 +21,11 @@ import Toybox.Graphics;
  * Do not override onBack(), as it is used internally for handling cancellation.
  * Similarly, do not override onTap(); all tap events should be handled by this class.
  */
-class BaseDynamicPickerDelegate extends BaseControlViewDelegate {
+class BaseDynamicPickerDelegate extends ControlViewDelegate {
 
     // Constructor
     public function initialize() {
-        BaseControlViewDelegate.initialize();
+        ControlViewDelegate.initialize();
     }
 
     // The delegate functions to be implemented by
diff --git a/source/main/user-interface/features/sitemap/shared/picker/DynamicPicker.mc b/source/main/user-interface/features/sitemap/shared/picker/DynamicPicker.mc
@@ -35,7 +35,7 @@ import Toybox.Graphics;
  * See the Numeric menu item and control view implementation for an example of how to 
  * implement a BaseDynamicPickerDataSource and BaseDynamicPickerDelegate.
  */
-class DynamicPicker extends BaseControlView {
+class DynamicPicker extends ControlView {
 
     // The BaseDynamicPickerDataSource implementation
     private var _factory as BaseDynamicPickerDataSource;
@@ -51,7 +51,7 @@ class DynamicPicker extends BaseControlView {
     // The constructor takes the display title as String,
     // and the implementation of the BaseDynamicPickerDataSource
     public function initialize( title as String, factory as BaseDynamicPickerDataSource ) {
-        BaseControlView.initialize();
+        ControlView.initialize();
         _title = title;
         _factory = factory;
     }
@@ -125,7 +125,7 @@ class DynamicPicker extends BaseControlView {
     }
 
     // On button-based devices we use the input hints
-    // feature of the BaseControlView
+    // feature of the ControlView
     (:exclForTouch)
     private function addInputHints( y as Float ) as Void {
         addInputHint( InputHint.HINT_KEY_ENTER, InputHint.HINT_TYPE_CHECK, :touchCheck );
@@ -136,7 +136,7 @@ class DynamicPicker extends BaseControlView {
     // confirm and cancel
     // The icons are instantiated as InteractiveRelativeBitmap with
     // a touchId defined, which will automatically add
-    // their touch area to the BaseControlView
+    // their touch area to the ControlView
     (:exclForButton)
     private function addInputHints( y as Float ) as Void {
         var xSpace = 0.15;
@@ -161,6 +161,6 @@ class DynamicPicker extends BaseControlView {
         if( _pickable != null ) {
             _pickable.setText( _factory.getCurrent().getLabel() );
         }
-        BaseControlView.onUpdate( dc );
+        ControlView.onUpdate( dc );
     }
 }
diff --git a/source/main/user-interface/features/sitemap/widgets/factory/MenuItemFactory.mc b/source/main/user-interface/features/sitemap/widgets/factory/MenuItemFactory.mc
@@ -15,8 +15,8 @@ class MenuItemFactory {
     ) as WidgetMenuItem {
         
         // Check if there is still sufficent memory, otherwise
-        // ensureMemory() will throw an exception
-        MemoryManager.ensureMemory();
+        // ensureSufficientMemory() will throw an exception
+        MemoryManager.ensureSufficientMemory();
 
         if( ContainerMenuItem.isMyType( sitemapWidget ) ) {
             return new ContainerMenuItem( 
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/base/SwitchMenuItem.mc b/source/main/user-interface/features/sitemap/widgets/switch/base/SwitchMenuItem.mc
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/generic/GenericSwitchMenuItem.mc b/source/main/user-interface/features/sitemap/widgets/switch/generic/GenericSwitchMenuItem.mc
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/onoff/OnOffSwitchMenuItem.mc b/source/main/user-interface/features/sitemap/widgets/switch/onoff/OnOffSwitchMenuItem.mc
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/player/menu-item/PlayerMenuItem.mc b/source/main/user-interface/features/sitemap/widgets/switch/player/menu-item/PlayerMenuItem.mc
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/player/view/PlayerView.mc b/source/main/user-interface/features/sitemap/widgets/switch/player/view/PlayerView.mc
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/player/view/PlayerViewDelegate.mc b/source/main/user-interface/features/sitemap/widgets/switch/player/view/PlayerViewDelegate.mc
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/rollershutter/menu-item/RollershutterMenuItem.mc b/source/main/user-interface/features/sitemap/widgets/switch/rollershutter/menu-item/RollershutterMenuItem.mc
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/rollershutter/view/RollershutterView.mc b/source/main/user-interface/features/sitemap/widgets/switch/rollershutter/view/RollershutterView.mc
diff --git a/source/main/user-interface/features/sitemap/widgets/switch/rollershutter/view/RollershutterViewDelegate.mc b/source/main/user-interface/features/sitemap/widgets/switch/rollershutter/view/RollershutterViewDelegate.mc
diff --git a/source/main/user-interface/shared/drawables/InteractiveRelativeBitmap.mc b/source/main/user-interface/shared/drawables/InteractiveRelativeBitmap.mc

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,6 @@ import Toybox.Lang;`
`4`	`4`	* The default `Config` implementation inherits all default values and overrides none.
`5`	`5`	`*/`
`6`	`6`	`(:glance)`
`7`		`-class GlanceConfig extends GlanceBaseConfig {`
`8`		`- protected function initialize() { GlanceBaseConfig.initialize(); }`
	`7`	`+class GlanceConfig extends BaseGlanceConfig {`
	`8`	`+ protected function initialize() { BaseGlanceConfig.initialize(); }`
`9`	`9`	`}`