Merge pull request #338 from UltraStar-Deluxe/anst/improvements

Anst/improvements
UltraStar-Deluxe · Nov 20, 2022 · 386f749 · 386f749
2 parents e0574ab + 9083bb4
commit 386f749
Show file tree

Hide file tree

Showing 353 changed files with 17,834 additions and 6,510 deletions.
diff --git a/UltraStar Play Companion/Assets/Scenes/MainScene/MainSceneControl.cs b/UltraStar Play Companion/Assets/Scenes/MainScene/MainSceneControl.cs
@@ -168,6 +168,8 @@ public void OnInjectionFinished()
             settings.SetMicProfileName(Microphone.devices.FirstOrDefault());
         }
 
+        menuOverlay.ShowByDisplay();
+
         settings.ObserveEveryValueChanged(it => it.MicProfile)
             .Subscribe(_ => OnMicProfileChanged());
         micSampleRecorder.IsRecording.Subscribe(OnRecordingStateChanged);

diff --git a/UltraStar Play Companion/Assets/Scenes/MainScene/MainSceneUi.uxml b/UltraStar Play Companion/Assets/Scenes/MainScene/MainSceneUi.uxml
@@ -8,7 +8,7 @@
                 </ui:VisualElement>
             </ui:VisualElement>
             <ui:Button display-tooltip-when-elided="true" name="showMenuButton" style="align-items: center; justify-content: center; width: 48px; height: 48px; flex-grow: 0; margin-left: 0; margin-right: 0; margin-top: 5px; margin-bottom: 5px; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0;">
-                <ui:VisualElement name="menuIcon" picking-mode="Ignore" style="background-image: url(&apos;project://database/Packages/playshared/Runtime/Graphics/MaterialDesignIcons/menu_white_24dp.svg?fileID=7388822144124034973&amp;guid=3a1f291f5afd8ce47a65ce133facea36&amp;type=3#menu_white_24dp&apos;); width: 28px; height: 28px; -unity-background-scale-mode: scale-to-fit;" />
+                <MaterialIcon icon="settings" name="menuIcon" />
             </ui:Button>
             <ui:Label text="FPS: 30" display-tooltip-when-elided="true" name="fpsText" style="font-size: 15px; margin-left: 0; position: absolute; margin-right: 0; margin-top: 0; margin-bottom: 0; top: 0; right: 50%;" />
         </ui:VisualElement>
@@ -24,7 +24,7 @@
                 </ui:VisualElement>
                 <ui:VisualElement name="toggleRecordingButtonContainer" style="flex-grow: 1; justify-content: center; align-items: center;">
                     <ui:Button display-tooltip-when-elided="true" name="toggleRecordingButton" class="startButtonClass" style="margin-bottom: 0; width: 256px; height: 256px; border-top-left-radius: 128px; border-bottom-left-radius: 128px; border-top-right-radius: 128px; border-bottom-right-radius: 128px; margin-left: 0; margin-right: 0; margin-top: 0; padding-left: 0; padding-right: 0; padding-top: 0; padding-bottom: 0;">
-                        <ui:VisualElement name="micIcon" picking-mode="Ignore" style="background-image: url(&apos;project://database/Packages/playshared/Runtime/Graphics/MaterialDesignIcons/mic_white_24dp.svg?fileID=7388822144124034973&amp;guid=d2510bd105a74f54792f8a032452222d&amp;type=3#mic_white_24dp&apos;); width: 128px; height: 128px; -unity-background-scale-mode: scale-to-fit;" />
+                        <MaterialIcon icon="mic" name="micIcon" style="font-size: 176px;" />
                     </ui:Button>
                 </ui:VisualElement>
                 <ui:VisualElement name="visualizeAudioToggleContainer" style="align-items: center; justify-content: center; width: 100%; flex-direction: row;">

diff --git a/...Runtime/Graphics/MaterialDesignIcons.meta → ...lay Companion/Assets/StreamingAssets.meta b/...Runtime/Graphics/MaterialDesignIcons.meta → ...lay Companion/Assets/StreamingAssets.meta
diff --git a/UltraStar Play Companion/Packages/manifest.json b/UltraStar Play Companion/Packages/manifest.json
@@ -3,25 +3,14 @@
     "com.achimmihca.primeinputactions": "https://github.com/achimmihca/PrimeInputActions.git?path=PrimeInputActions/Packages/com.achimmihca.primeinputactions#v1.0.0",
     "com.achimmihca.protrans": "https://github.com/achimmihca/ProTrans.git?path=ProTrans/Packages/com.achimmihca.ProTrans#v1.0.0",
     "com.achimmihca.uniinject": "https://github.com/achimmihca/UniInject.git?path=UniInject/Packages/com.achimmihca.uniinject#v5.0.1",
-    "com.unity.2d.animation": "7.0.5",
-    "com.unity.2d.pixel-perfect": "5.0.1",
-    "com.unity.2d.psdimporter": "6.0.3",
     "com.unity.2d.sprite": "1.0.0",
-    "com.unity.2d.spriteshape": "7.0.4",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.collab-proxy": "1.15.17",
-    "com.unity.ide.rider": "3.0.14",
-    "com.unity.ide.visualstudio": "2.0.15",
-    "com.unity.ide.vscode": "1.2.5",
-    "com.unity.inputsystem": "1.3.0",
+    "com.unity.ai.navigation": "1.1.1",
+    "com.unity.collab-proxy": "1.17.7",
+    "com.unity.ide.rider": "3.0.16",
+    "com.unity.ide.visualstudio": "2.0.16",
+    "com.unity.inputsystem": "1.4.4",
     "com.unity.mobile.android-logcat": "1.3.2",
-    "com.unity.test-framework": "1.1.31",
-    "com.unity.timeline": "1.6.4",
-    "com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.21-preview",
-    "com.unity.ugui": "1.0.0",
-    "com.unity.ui.builder": "2.0.0",
-    "com.unity.vectorgraphics": "2.0.0-preview.18",
-    "playshared": "file:../../UltraStar Play/Packages/playshared",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",
     "com.unity.modules.animation": "1.0.0",
@@ -52,6 +41,14 @@
     "com.unity.modules.video": "1.0.0",
     "com.unity.modules.vr": "1.0.0",
     "com.unity.modules.wind": "1.0.0",
-    "com.unity.modules.xr": "1.0.0"
+    "com.unity.modules.xr": "1.0.0",
+    "com.unity.test-framework": "1.1.33",
+    "com.unity.timeline": "1.7.2",
+    "com.unity.toolchain.win-x86_64-linux-x86_64": "2.0.3",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.ui.builder": "2.0.0",
+    "com.unity.vectorgraphics": "2.0.0-preview.20",
+    "com.yasirkula.androidruntimepermissions": "https://github.com/yasirkula/UnityAndroidRuntimePermissions.git",
+    "playshared": "file:../../UltraStar Play/Packages/playshared"
   }
 }
diff --git a/UltraStar Play Companion/Packages/packages-lock.json b/UltraStar Play Companion/Packages/packages-lock.json
@@ -21,90 +21,32 @@
       "dependencies": {},
       "hash": "04879fa41030fbd4e2a9ddc0c2350201f3a5630a"
     },
-    "com.unity.2d.animation": {
-      "version": "7.0.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.common": "6.0.3",
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.modules.animation": "1.0.0",
-        "com.unity.modules.uielements": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.common": {
-      "version": "6.0.3",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.sprite": "1.0.0",
-        "com.unity.mathematics": "1.1.0",
-        "com.unity.modules.uielements": "1.0.0",
-        "com.unity.burst": "1.5.1"
-      },
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.path": {
-      "version": "5.0.2",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.pixel-perfect": {
-      "version": "5.0.1",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
-    "com.unity.2d.psdimporter": {
-      "version": "6.0.3",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.2d.animation": "7.0.4",
-        "com.unity.2d.common": "6.0.3",
-        "com.unity.2d.sprite": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.2d.sprite": {
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
       "dependencies": {}
     },
-    "com.unity.2d.spriteshape": {
-      "version": "7.0.4",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {
-        "com.unity.mathematics": "1.1.0",
-        "com.unity.2d.common": "6.0.3",
-        "com.unity.2d.path": "5.0.2",
-        "com.unity.modules.physics2d": "1.0.0"
-      },
-      "url": "https://packages.unity.com"
-    },
     "com.unity.2d.tilemap": {
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
-      "dependencies": {}
+      "dependencies": {
+        "com.unity.modules.tilemap": "1.0.0",
+        "com.unity.modules.uielements": "1.0.0"
+      }
     },
-    "com.unity.burst": {
-      "version": "1.6.5",
-      "depth": 2,
+    "com.unity.ai.navigation": {
+      "version": "1.1.1",
+      "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.mathematics": "1.2.1"
+        "com.unity.modules.ai": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.collab-proxy": {
-      "version": "1.15.17",
+      "version": "1.17.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -113,14 +55,14 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ext.nunit": {
-      "version": "1.0.6",
+      "version": "2.0.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.14",
+      "version": "3.0.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -129,37 +71,23 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.15",
+      "version": "2.0.16",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.ide.vscode": {
-      "version": "1.2.5",
-      "depth": 0,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.inputsystem": {
-      "version": "1.3.0",
+      "version": "1.4.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {
         "com.unity.modules.uielements": "1.0.0"
       },
       "url": "https://packages.unity.com"
     },
-    "com.unity.mathematics": {
-      "version": "1.2.6",
-      "depth": 1,
-      "source": "registry",
-      "dependencies": {},
-      "url": "https://packages.unity.com"
-    },
     "com.unity.mobile.android-logcat": {
       "version": "1.3.2",
       "depth": 0,
@@ -175,7 +103,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.services.core": {
-      "version": "1.4.0",
+      "version": "1.5.2",
       "depth": 1,
       "source": "registry",
       "dependencies": {
@@ -186,23 +114,23 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.sysroot": {
-      "version": "0.1.19-preview",
+      "version": "2.0.4",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
     "com.unity.sysroot.linux-x86_64": {
-      "version": "0.1.14-preview",
+      "version": "2.0.3",
       "depth": 1,
       "source": "registry",
       "dependencies": {
-        "com.unity.sysroot": "0.1.18-preview"
+        "com.unity.sysroot": "2.0.4"
       },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.31",
+      "version": "1.1.33",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -213,7 +141,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.timeline": {
-      "version": "1.6.4",
+      "version": "1.7.2",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -225,12 +153,12 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.toolchain.win-x86_64-linux-x86_64": {
-      "version": "0.1.21-preview",
+      "version": "2.0.3",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.sysroot": "0.1.19-preview",
-        "com.unity.sysroot.linux-x86_64": "0.1.14-preview"
+        "com.unity.sysroot": "2.0.4",
+        "com.unity.sysroot.linux-x86_64": "2.0.3"
       },
       "url": "https://packages.unity.com"
     },
@@ -250,7 +178,7 @@
       "dependencies": {}
     },
     "com.unity.vectorgraphics": {
-      "version": "2.0.0-preview.18",
+      "version": "2.0.0-preview.20",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -268,6 +196,13 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.yasirkula.androidruntimepermissions": {
+      "version": "https://github.com/yasirkula/UnityAndroidRuntimePermissions.git",
+      "depth": 0,
+      "source": "git",
+      "dependencies": {},
+      "hash": "6778d20ec4133dbac43cd526113426a608558249"
+    },
     "playshared": {
       "version": "file:../../UltraStar Play/Packages/playshared",
       "depth": 0,
@@ -406,17 +341,6 @@
       "version": "1.0.0",
       "depth": 0,
       "source": "builtin",
-      "dependencies": {
-        "com.unity.modules.ui": "1.0.0",
-        "com.unity.modules.imgui": "1.0.0",
-        "com.unity.modules.jsonserialize": "1.0.0",
-        "com.unity.modules.uielementsnative": "1.0.0"
-      }
-    },
-    "com.unity.modules.uielementsnative": {
-      "version": "1.0.0",
-      "depth": 1,
-      "source": "builtin",
       "dependencies": {
         "com.unity.modules.ui": "1.0.0",
         "com.unity.modules.imgui": "1.0.0",