Updated pxt.json/user-interface-base to use latest version, added controlSetupFn to all startup() {}, increase basic.pause() time during startup(), removed unneccessary microgui include, modified home.ts to use modern style afforded by user-interface-base upgrade.

Author: KierPalin

compile_commands.json

@@ -0,0 +1 @@
+[]

home.ts

@@ -4,72 +4,68 @@ namespace micromusic {
     import Button = user_interface_base.Button
     import ButtonStyles = user_interface_base.ButtonStyles
     import AppInterface = user_interface_base.AppInterface
-    import CursorSceneEnum = user_interface_base.CursorSceneEnum
     import font = user_interface_base.font
     import resolveTooltip = user_interface_base.resolveTooltip
 
     export class Home extends CursorScene {
-        private liveDataBtn: Button
-        private recordDataBtn: Button
-        private distributedLoggingBtn: Button
-
         constructor(app: AppInterface) {
             super(app)
         }
 
-        /* override */ startup() {
+        /* override */ startup(controlSetupFn: () => void) {
             super.startup()
-            basic.pause(10)
+            basic.pause(50)
+
             this.cursor.setBorderThickness(2)
             const y = Screen.HEIGHT * 0.234 // y = 30 on an Arcade Shield of height 128 pixels
             this.navigator.setBtns([
                 [
-                    (this.liveDataBtn = new Button({
-                        parent: null,
-                        style: ButtonStyles.Transparent,
-                        icon: "edit_program",
-                        ariaId: "New Song",
-                        x: -40,
-                        y,
-                        onClick: () => {
-                            this.app.popScene()
-                            this.app.pushScene(
-                                SongComposerScreen.getInstance(this.app),
-                            )
-                        },
-                    })),
-                    (this.recordDataBtn = new Button({
-                        parent: null,
-                        style: ButtonStyles.Transparent,
-                        icon: "largeDisk",
-                        ariaId: "Saved Songs",
-                        x: 0,
-                        y,
-                        onClick: () => {},
-                    })),
-                    (this.distributedLoggingBtn = new Button({
-                        parent: null,
-                        style: ButtonStyles.Transparent,
-                        icon: "largeSettingsGear",
-                        ariaId: "Settings",
-                        x: 40,
-                        y,
-                        onClick: () => {
-                            this.app.popScene()
-                            this.app.pushScene(
-                                SettingsScreen.getInstance(this, this.app),
-                            )
-                        },
-                    })),
+                  new Button({
+                      parent: null,
+                      style: ButtonStyles.Transparent,
+                      icon: "edit_program",
+                      ariaId: "New Song",
+                      x: -40,
+                      y,
+                      onClick: () => {
+                          this.app.popScene()
+                          this.app.pushScene(
+                              SongComposerScreen.getInstance(this.app),
+                          )
+                      },
+                  }),
+                  new Button({
+                      parent: null,
+                      style: ButtonStyles.Transparent,
+                      icon: "largeDisk",
+                      ariaId: "Saved Songs",
+                      x: 0,
+                      y,
+                      onClick: () => {},
+                  }),
+                  new Button({
+                      parent: null,
+                      style: ButtonStyles.Transparent,
+                      icon: "largeSettingsGear",
+                      ariaId: "Settings",
+                      x: 40,
+                      y,
+                      onClick: () => {
+                          this.app.popScene()
+                          this.app.pushScene(
+                              SettingsScreen.getInstance(this, this.app),
+                          )
+                      },
+                  }),
                 ],
             ])
         }
 
         private drawVersion() {
             const font = bitmaps.font5
             Screen.print(
-                "v0.1",
-                Screen.RIGHT_EDGE - font.charWidth * "v0.1".length,
+                "v0.2",
+                Screen.RIGHT_EDGE - font.charWidth * "v0.2".length,
                 Screen.BOTTOM_EDGE - font.charHeight - 2,
                 0xb,
                 font,
@@ -124,10 +120,7 @@ namespace micromusic {
                 )
             }
 
-            this.liveDataBtn.draw()
-            this.recordDataBtn.draw()
-            this.distributedLoggingBtn.draw()
-
+            this.navigator.drawComponents();
             this.drawVersion()
             super.draw()
         }

patternComposer.ts

@@ -159,9 +159,9 @@ namespace micromusic {
             return PatternScreen.instance
         }
 
-        /* override */ startup() {
+        /* override */ startup(controlSetupFn: () => void) {
             super.startup()
-            basic.pause(10)
+            basic.pause(50)
 
             this.icon = getIcon("placeholder", true)
                 .doubled()

pxt.json

@@ -1,14 +1,13 @@
 {
     "name": "MicroMusic",
-    "version": "0.0.01",
+    "version": "0.0.1",
     "description": "Making music with micro:bit v2",
     "dependencies": {
         "core": "*",
         "radio": "*",
         "microphone": "*",
         "datalogger": "*",
-        "user-interface-base": "github:microbit-apps/user-interface-base#589d51e8901fe16bc4c1dfb6c81d3ffc86edb2fe",
-        "microgui": "github:microbit-apps/microgui#cd5827ba0a3b8e87c12750612218aea7b320b98d",
+        "user-interface-base": "github:microbit-apps/user-interface-base#v0.0.23",
         "audio-samples": "*"
     },
     "files": [

sampleSelectionScreen.ts

@@ -39,9 +39,10 @@ namespace micromusic {
             this.selectedIndex = this.sampleNames.indexOf(this.currentSample)
         }
 
-        /* override */ startup() {
+
+        /* override */ startup(controlSetupFn: () => void) {
             super.startup()
-            basic.pause(10)
+            basic.pause(50)
 
             this.cursor.setBorderThickness(1)
             this.resetNavigator()

saveLoadScreen.ts

@@ -97,8 +97,10 @@ namespace micromusic {
             return SaveLoadScreen.instance
         }
 
-        /* override */ startup() {
+
+        /* override */ startup(controlSetupFn: () => void) {
             super.startup()
+            basic.pause(50)
             // this.loadSaves()
             this.resetNavigator()
         }

settingsScreen.ts

@@ -38,9 +38,10 @@ namespace micromusic {
             this.previousScene = previousScene
         }
 
-        /* override */ startup() {
+
+        /* override */ startup(controlSetupFn: () => void) {
             super.startup()
-            basic.pause(10)
+            basic.pause(50)
 
             this.cursor.setBorderThickness(1)
 

songComposer.ts

@@ -90,9 +90,10 @@ namespace micromusic {
             this.song = song
         }
 
-        /*override*/ startup() {
+
+        /* override */ startup(controlSetupFn: () => void) {
             super.startup()
-            basic.pause(10)
+            basic.pause(50)
 
             this.playedNote = 0
             this.playedPattern = 0