mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-22 01:51:20 -08:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9be83cf108 | ||
|
|
d7436e3972 | ||
|
|
bebc34d035 |
No files matched your search
+16
-16
@@ -2,23 +2,23 @@
|
||||
* @Eirenliel
|
||||
|
||||
# Make everyone be able to approve SolarXR submodule changes
|
||||
/solarxr-protocol @ButterscotchV @Erimelowo @loucass003
|
||||
/solarxr-protocol @ButterscotchV @Erimelowo @ImUrX @loucass003
|
||||
|
||||
# Make Loucass the owner of all GUI stuff
|
||||
/gui/ @loucass003
|
||||
/pnpm-lock.yaml @loucass003
|
||||
/pnpm-workspace.yaml @loucass003
|
||||
# Make Loucas and Uriel the owners of all GUI stuff
|
||||
/gui/ @ImUrX @loucass003
|
||||
/pnpm-lock.yaml @ImUrX @loucass003
|
||||
/pnpm-workspace.yaml @ImUrX @loucass003
|
||||
|
||||
# loucass003 and Erimel responsible for i18n
|
||||
/gui/public/i18n/ @loucass003 @Erimelowo
|
||||
/gui/src/i18n/ @loucass003 @Erimelowo
|
||||
/l10n.toml @loucass003 @Erimelowo
|
||||
# Uriel and Erimel responsible for i18n
|
||||
/gui/public/i18n/ @ImUrX @Erimelowo
|
||||
/gui/src/i18n/ @ImUrX @Erimelowo
|
||||
/l10n.toml @ImUrX @Erimelowo
|
||||
|
||||
/gui/src/components/settings/ @Erimelowo @loucass003
|
||||
/gui/src/components/settings/ @Erimelowo @ImUrX @loucass003
|
||||
|
||||
# Rust part of the GUI
|
||||
/gui/src-tauri/ @loucass003
|
||||
/Cargo.lock @loucass003
|
||||
/gui/src-tauri/ @ImUrX
|
||||
/Cargo.lock @ImUrX
|
||||
|
||||
# Some server code~
|
||||
/server/ @ButterscotchV @Eirenliel @Erimelowo
|
||||
@@ -32,7 +32,7 @@
|
||||
/server/src/main/java/dev/slimevr/filtering/ @Erimelowo
|
||||
|
||||
# Linux files
|
||||
*.nix @loucass003
|
||||
/flake.lock @loucass003
|
||||
/dev.slimevr.SlimeVR.metainfo.xml @loucass003
|
||||
/.envrc @loucass003
|
||||
*.nix @ImUrX
|
||||
/flake.lock @ImUrX
|
||||
/dev.slimevr.SlimeVR.metainfo.xml @ImUrX
|
||||
/.envrc @ImUrX
|
||||
@@ -27,7 +27,7 @@ jobs:
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v5
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
@@ -85,7 +85,7 @@ jobs:
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v5
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
|
||||
@@ -12,7 +12,7 @@ jobs:
|
||||
runs-on: ubuntu-22.04
|
||||
|
||||
steps:
|
||||
- uses: actions/setup-node@v5
|
||||
- uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version: '22.x'
|
||||
|
||||
|
||||
@@ -27,7 +27,7 @@ jobs:
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v5
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt'
|
||||
@@ -56,7 +56,7 @@ jobs:
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v5
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt'
|
||||
@@ -95,7 +95,7 @@ jobs:
|
||||
run: git fetch --tags origin --recurse-submodules=no --force
|
||||
|
||||
- name: Set up JDK 17
|
||||
uses: actions/setup-java@v5
|
||||
uses: actions/setup-java@v4
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'adopt'
|
||||
@@ -105,7 +105,7 @@ jobs:
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v5
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
@@ -190,7 +190,7 @@ jobs:
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v5
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
@@ -266,7 +266,7 @@ jobs:
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v5
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
@@ -351,7 +351,7 @@ jobs:
|
||||
|
||||
- uses: pnpm/action-setup@v4
|
||||
- name: Use Node.js
|
||||
uses: actions/setup-node@v5
|
||||
uses: actions/setup-node@v4
|
||||
with:
|
||||
node-version-file: '.node-version'
|
||||
cache: 'pnpm'
|
||||
|
||||
@@ -17,6 +17,6 @@ jobs:
|
||||
pull-requests: write
|
||||
|
||||
steps:
|
||||
- uses: actions/labeler@v6
|
||||
- uses: actions/labeler@v5
|
||||
with:
|
||||
repo-token: "${{ secrets.GITHUB_TOKEN }}"
|
||||
@@ -36,6 +36,8 @@ build/
|
||||
|
||||
# Rust build artifacts
|
||||
/target
|
||||
/.tauri
|
||||
/tauri.settings.gradle
|
||||
|
||||
# direnv has been claimed for Nix usage
|
||||
.direnv/
|
||||
@@ -43,6 +45,8 @@ build/
|
||||
|
||||
# Ignore Android local properties
|
||||
local.properties
|
||||
keystore.properties
|
||||
/.android
|
||||
|
||||
# Ignore temporary config
|
||||
vrconfig.yml.tmp
|
||||
Generated
-1
@@ -4081,7 +4081,6 @@ name = "slimevr"
|
||||
version = "0.0.0"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"cfg_aliases",
|
||||
"clap",
|
||||
"clap-verbosity-flag",
|
||||
"color-eyre",
|
||||
|
||||
@@ -1,3 +1,21 @@
|
||||
plugins {
|
||||
id("org.ajoberstar.grgit")
|
||||
}
|
||||
|
||||
buildscript {
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
dependencies {
|
||||
classpath("com.android.tools.build:gradle:8.6.1")
|
||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${rootProject.properties["kotlinVersion"]}")
|
||||
}
|
||||
}
|
||||
|
||||
subprojects.filter { it.name.contains("tauri") }.forEach {
|
||||
it.repositories {
|
||||
mavenCentral()
|
||||
google()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,23 @@
|
||||
plugins {
|
||||
`kotlin-dsl`
|
||||
}
|
||||
|
||||
gradlePlugin {
|
||||
plugins {
|
||||
create("pluginsForCoolKids") {
|
||||
id = "rust"
|
||||
implementationClass = "RustPlugin"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
repositories {
|
||||
google()
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
compileOnly(gradleApi())
|
||||
implementation("com.android.tools.build:gradle:8.6.1")
|
||||
}
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
import java.io.File
|
||||
import org.apache.tools.ant.taskdefs.condition.Os
|
||||
import org.gradle.api.DefaultTask
|
||||
import org.gradle.api.GradleException
|
||||
import org.gradle.api.logging.LogLevel
|
||||
import org.gradle.api.tasks.Input
|
||||
import org.gradle.api.tasks.TaskAction
|
||||
|
||||
open class BuildTask : DefaultTask() {
|
||||
@Input
|
||||
var rootDirRel: String? = null
|
||||
@Input
|
||||
var target: String? = null
|
||||
@Input
|
||||
var release: Boolean? = null
|
||||
|
||||
@TaskAction
|
||||
fun assemble() {
|
||||
val executable = """pnpm""";
|
||||
try {
|
||||
runTauriCli(executable)
|
||||
} catch (e: Exception) {
|
||||
if (Os.isFamily(Os.FAMILY_WINDOWS)) {
|
||||
runTauriCli("$executable.cmd")
|
||||
} else if (Os.isFamily(Os.FAMILY_UNIX)){
|
||||
runTauriCli("/nix/store/r2n3dbbp0djly6wjxx43sbffaq3abjpy-pnpm-10.15.0/bin/pnpm")
|
||||
} else {
|
||||
throw e
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun runTauriCli(executable: String) {
|
||||
val rootDirRel = rootDirRel ?: throw GradleException("rootDirRel cannot be null")
|
||||
val target = target ?: throw GradleException("target cannot be null")
|
||||
val release = release ?: throw GradleException("release cannot be null")
|
||||
val args = listOf("tauri", "android", "android-studio-script")
|
||||
|
||||
project.exec {
|
||||
workingDir(File(project.projectDir, rootDirRel))
|
||||
executable(executable)
|
||||
args(args)
|
||||
if (project.logger.isEnabled(LogLevel.DEBUG)) {
|
||||
args("-vv")
|
||||
} else if (project.logger.isEnabled(LogLevel.INFO)) {
|
||||
args("-v")
|
||||
}
|
||||
if (release) {
|
||||
args("--release")
|
||||
}
|
||||
args(listOf("--target", target))
|
||||
}.assertNormalExitValue()
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,85 @@
|
||||
import com.android.build.api.dsl.ApplicationExtension
|
||||
import org.gradle.api.DefaultTask
|
||||
import org.gradle.api.Plugin
|
||||
import org.gradle.api.Project
|
||||
import org.gradle.kotlin.dsl.configure
|
||||
import org.gradle.kotlin.dsl.get
|
||||
|
||||
const val TASK_GROUP = "rust"
|
||||
|
||||
open class Config {
|
||||
lateinit var rootDirRel: String
|
||||
}
|
||||
|
||||
open class RustPlugin : Plugin<Project> {
|
||||
private lateinit var config: Config
|
||||
|
||||
override fun apply(project: Project) = with(project) {
|
||||
config = extensions.create("rust", Config::class.java)
|
||||
|
||||
val defaultAbiList = listOf("arm64-v8a", "armeabi-v7a", "x86", "x86_64");
|
||||
val abiList = (findProperty("abiList") as? String)?.split(',') ?: defaultAbiList
|
||||
|
||||
val defaultArchList = listOf("arm64", "arm", "x86", "x86_64");
|
||||
val archList = (findProperty("archList") as? String)?.split(',') ?: defaultArchList
|
||||
|
||||
val targetsList = (findProperty("targetList") as? String)?.split(',') ?: listOf("aarch64", "armv7", "i686", "x86_64")
|
||||
|
||||
extensions.configure<ApplicationExtension> {
|
||||
@Suppress("UnstableApiUsage")
|
||||
flavorDimensions.add("abi")
|
||||
productFlavors {
|
||||
create("universal") {
|
||||
dimension = "abi"
|
||||
ndk {
|
||||
abiFilters += abiList
|
||||
}
|
||||
}
|
||||
defaultArchList.forEachIndexed { index, arch ->
|
||||
create(arch) {
|
||||
dimension = "abi"
|
||||
ndk {
|
||||
abiFilters.add(defaultAbiList[index])
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
afterEvaluate {
|
||||
for (profile in listOf("debug", "release")) {
|
||||
val profileCapitalized = profile.replaceFirstChar { it.uppercase() }
|
||||
val buildTask = tasks.maybeCreate(
|
||||
"rustBuildUniversal$profileCapitalized",
|
||||
DefaultTask::class.java
|
||||
).apply {
|
||||
group = TASK_GROUP
|
||||
description = "Build dynamic library in $profile mode for all targets"
|
||||
}
|
||||
|
||||
tasks["mergeUniversal${profileCapitalized}JniLibFolders"].dependsOn(buildTask)
|
||||
|
||||
for (targetPair in targetsList.withIndex()) {
|
||||
val targetName = targetPair.value
|
||||
val targetArch = archList[targetPair.index]
|
||||
val targetArchCapitalized = targetArch.replaceFirstChar { it.uppercase() }
|
||||
val targetBuildTask = project.tasks.maybeCreate(
|
||||
"rustBuild$targetArchCapitalized$profileCapitalized",
|
||||
BuildTask::class.java
|
||||
).apply {
|
||||
group = TASK_GROUP
|
||||
description = "Build dynamic library in $profile mode for $targetArch"
|
||||
rootDirRel = config.rootDirRel
|
||||
target = targetName
|
||||
release = profile == "release"
|
||||
}
|
||||
|
||||
buildTask.dependsOn(targetBuildTask)
|
||||
tasks["merge$targetArchCapitalized${profileCapitalized}JniLibFolders"].dependsOn(
|
||||
targetBuildTask
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -57,11 +57,36 @@
|
||||
_module.args.pkgs = import self.inputs.nixpkgs {
|
||||
inherit system;
|
||||
overlays = [nixgl.overlay];
|
||||
# Allow android SDK
|
||||
# config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
|
||||
# "android-sdk-cmdline-tools"
|
||||
# "android-sdk-platform-tools"
|
||||
# "platform-tools"
|
||||
# "android-sdk-tools"
|
||||
# "android-sdk-emulator"
|
||||
# "android-sdk-system-image-32-google_apis_playstore-arm64-v8a-system-image-32-google_apis_playstore-x86_64"
|
||||
# "system-image-32-google_apis_playstore-arm64-v8a"
|
||||
# "system-image-32-google_apis_playstore-x86_64"
|
||||
# "android-sdk-system-image-34-google_apis_playstore-arm64-v8a-system-image-34-google_apis_playstore-x86_64"
|
||||
# "system-image-34-google_apis_playstore-arm64-v8a"
|
||||
# "system-image-34-google_apis_playstore-x86_64"
|
||||
# "emulator"
|
||||
# "tools"
|
||||
# "android-sdk-build-tools"
|
||||
# "build-tools"
|
||||
# "android-sdk-platforms"
|
||||
# "platforms"
|
||||
# "cmake"
|
||||
# "android-sdk-ndk"
|
||||
# "ndk"
|
||||
# "android-sdk-extras-google-gcm"
|
||||
# "extras-google-gcm"
|
||||
# "cmdline-tools"
|
||||
# ];
|
||||
};
|
||||
|
||||
devenv.shells.default = let
|
||||
fenixpkgs = inputs'.fenix.packages;
|
||||
rust_toolchain = lib.importTOML ./rust-toolchain.toml;
|
||||
in {
|
||||
name = "slimevr";
|
||||
|
||||
@@ -76,6 +101,7 @@
|
||||
(with pkgs; [
|
||||
pkgs.nixgl.nixGLIntel
|
||||
cacert
|
||||
stow
|
||||
])
|
||||
++ lib.optionals pkgs.stdenv.isLinux (with pkgs; [
|
||||
atk
|
||||
@@ -118,6 +144,12 @@
|
||||
};
|
||||
languages.kotlin.enable = true;
|
||||
|
||||
# android = {
|
||||
# enable = true;
|
||||
# googleAPIs.enable = false;
|
||||
# googleTVAddOns.enable = false;
|
||||
# };
|
||||
|
||||
languages.javascript = {
|
||||
enable = true;
|
||||
corepack.enable = true;
|
||||
@@ -127,11 +159,10 @@
|
||||
|
||||
languages.rust = {
|
||||
enable = true;
|
||||
toolchain = fenixpkgs.fromToolchainName {
|
||||
name = rust_toolchain.toolchain.channel;
|
||||
sha256 = "sha256-yMuSb5eQPO/bHv+Bcf/US8LVMbf/G/0MSfiPwBhiPpk=";
|
||||
toolchainPackage = fenixpkgs.fromToolchainFile {
|
||||
file = ./rust-toolchain.toml;
|
||||
sha256 = "sha256-+9FmLhAOezBZCOziO0Qct1NOrfpjNsXxc/8I0c7BdKE=";
|
||||
};
|
||||
components = rust_toolchain.toolchain.components;
|
||||
};
|
||||
|
||||
env = {
|
||||
|
||||
+13
-1
@@ -3,14 +3,26 @@ org.gradle.jvmargs=--add-exports jdk.compiler/com.sun.tools.javac.api=ALL-UNNAME
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.file=ALL-UNNAMED \
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED \
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED \
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED
|
||||
--add-exports jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED \
|
||||
-Dfile.encoding=UTF-8
|
||||
|
||||
kotlin.code.style=official
|
||||
# https://github.com/Kotlin/kotlinx-atomicfu#atomicfu-compiler-plugin
|
||||
kotlinx.atomicfu.enableJvmIrTransformation=true
|
||||
|
||||
# When configured, Gradle will run in incubating parallel mode.
|
||||
# This option should only be used with decoupled projects. More details, visit
|
||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
||||
# org.gradle.parallel=true
|
||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
||||
# Android operating system, and which are packaged with your app"s APK
|
||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
||||
android.useAndroidX=true
|
||||
# Enables namespacing of each library's R class so that its R class includes only the
|
||||
# resources declared in the library itself and none from the library's dependencies,
|
||||
# thereby reducing the size of the R class for that library
|
||||
android.nonTransitiveRClass=true
|
||||
android.nonFinalResIds=false
|
||||
org.gradle.unsafe.configuration-cache=false
|
||||
|
||||
kotlinVersion=2.0.20
|
||||
|
||||
@@ -1125,7 +1125,6 @@ onboarding-automatic_mounting-preparation-v2-step-2 = 3. Hold the position until
|
||||
onboarding-automatic_mounting-put_trackers_on-title = Put on your trackers
|
||||
onboarding-automatic_mounting-put_trackers_on-description = To calibrate mounting orientations, we're gonna use the trackers you just assigned. Put on all your trackers, you can see which are which in the figure to the right.
|
||||
onboarding-automatic_mounting-put_trackers_on-next = I have all my trackers on
|
||||
onboarding-automatic_mounting-return-home = Done
|
||||
|
||||
## Tracker manual proportions setupa
|
||||
onboarding-manual_proportions-back = Go Back to Reset tutorial
|
||||
|
||||
@@ -12,6 +12,13 @@ default-run = "slimevr"
|
||||
|
||||
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
||||
|
||||
[lib]
|
||||
# The `_lib` suffix may seem redundant but it is necessary
|
||||
# to make the lib name unique and wouldn't conflict with the bin name.
|
||||
# This seems to be only an issue on Windows, see https://github.com/rust-lang/cargo/issues/8519
|
||||
name = "slimevr_lib"
|
||||
crate-type = ["staticlib", "cdylib", "rlib"]
|
||||
|
||||
[features]
|
||||
# by default Tauri runs in production mode
|
||||
# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
|
||||
@@ -22,7 +29,6 @@ custom-protocol = ["tauri/custom-protocol"]
|
||||
|
||||
[build-dependencies]
|
||||
tauri-build = { version = "2.0", features = [] }
|
||||
cfg_aliases = "0.2"
|
||||
shadow-rs = "0.35"
|
||||
|
||||
[dependencies]
|
||||
@@ -49,7 +55,6 @@ shadow-rs = { version = "0.35", default-features = false }
|
||||
const_format = "0.2.30"
|
||||
cfg-if = "1"
|
||||
color-eyre = "0.6"
|
||||
rfd = { version = "0.15", features = ["gtk3"], default-features = false }
|
||||
dirs-next = "2.0.0"
|
||||
discord-sdk = "0.3.6"
|
||||
tokio = { version = "1.37.0", features = ["time"] }
|
||||
@@ -62,3 +67,6 @@ winreg = "0.52"
|
||||
|
||||
[target.'cfg(target_os = "linux")'.dependencies]
|
||||
libloading = "0.8"
|
||||
|
||||
[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
|
||||
rfd = { version = "0.15", features = ["gtk3"], default-features = false }
|
||||
@@ -1,5 +1,3 @@
|
||||
use cfg_aliases::cfg_aliases;
|
||||
|
||||
fn main() -> shadow_rs::SdResult<()> {
|
||||
// Bypass for Nix script having libudev-zero and Tauri not liking it
|
||||
if let Some(path) = option_env!("SLIMEVR_RUST_LD_LIBRARY_PATH") {
|
||||
@@ -7,9 +5,5 @@ fn main() -> shadow_rs::SdResult<()> {
|
||||
}
|
||||
|
||||
tauri_build::build();
|
||||
cfg_aliases! {
|
||||
mobile: { any(target_os = "ios", target_os = "android") },
|
||||
desktop: { not(any(target_os = "ios", target_os = "android")) }
|
||||
}
|
||||
shadow_rs::new()
|
||||
}
|
||||
@@ -0,0 +1,10 @@
|
||||
--ignore='^gui$'
|
||||
--ignore='^\..+'
|
||||
--ignore='^node_modules$'
|
||||
--ignore='^build$'
|
||||
--ignore='^(local|keystore).properties$'
|
||||
--ignore='^target$'
|
||||
--ignore='^assets'
|
||||
--ignore='.*\.(toml|yaml|nix|lock|json|md)$'
|
||||
-d ../../../../
|
||||
-t android
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
../../../../server/android/
|
||||
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/build.gradle.kts
|
||||
+1
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/buildSrc
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/gradle
|
||||
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/gradle.properties
|
||||
+1
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/gradlew
|
||||
+1
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/gradlew.bat
|
||||
Symlink
+1
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/server
|
||||
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/settings.gradle.kts
|
||||
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/solarxr-protocol
|
||||
@@ -0,0 +1 @@
|
||||
../../../../../SlimeVR-Server/tauri.settings.gradle
|
||||
@@ -0,0 +1,6 @@
|
||||
pub struct TrayAvailable(pub bool);
|
||||
|
||||
#[tauri::command]
|
||||
pub fn is_tray_available(tray_available: tauri::State<TrayAvailable>) -> bool {
|
||||
tray_available.0
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
use tauri::Manager;
|
||||
|
||||
mod cross;
|
||||
|
||||
#[cfg_attr(mobile, tauri::mobile_entry_point)]
|
||||
pub fn run() {
|
||||
log_panics::init();
|
||||
|
||||
tauri::Builder::default()
|
||||
.plugin(
|
||||
tauri_plugin_log::Builder::new()
|
||||
.target(tauri_plugin_log::Target::new(
|
||||
tauri_plugin_log::TargetKind::LogDir {
|
||||
file_name: Some("slimevr".to_string()),
|
||||
},
|
||||
))
|
||||
.max_file_size(30_000 /* bytes */)
|
||||
.rotation_strategy(tauri_plugin_log::RotationStrategy::KeepSome(3))
|
||||
.build(),
|
||||
)
|
||||
.plugin(tauri_plugin_opener::init())
|
||||
.plugin(tauri_plugin_dialog::init())
|
||||
.plugin(tauri_plugin_fs::init())
|
||||
.plugin(tauri_plugin_os::init())
|
||||
.plugin(tauri_plugin_shell::init())
|
||||
.plugin(tauri_plugin_store::Builder::default().build())
|
||||
.plugin(tauri_plugin_http::init())
|
||||
.invoke_handler(tauri::generate_handler![cross::is_tray_available,])
|
||||
.setup(move |app| {
|
||||
log::info!("SlimeVR started!");
|
||||
|
||||
let _ = tauri::WebviewWindowBuilder::new(
|
||||
app,
|
||||
"main",
|
||||
tauri::WebviewUrl::App("index.html".into()),
|
||||
)
|
||||
.build()?;
|
||||
|
||||
app.manage(cross::TrayAvailable(false));
|
||||
|
||||
Ok(())
|
||||
})
|
||||
.run(tauri::generate_context!())
|
||||
.expect("error while running tauri application");
|
||||
}
|
||||
@@ -22,6 +22,7 @@ use crate::util::{
|
||||
get_launch_path, show_error, valid_java_paths, Cli, JAVA_BIN, MINIMUM_JAVA_VERSION,
|
||||
};
|
||||
|
||||
mod cross;
|
||||
mod presence;
|
||||
mod state;
|
||||
mod tray;
|
||||
@@ -106,6 +107,7 @@ fn main() -> Result<()> {
|
||||
setup_webview2()?;
|
||||
|
||||
// Check for environment variables that can affect the server, and if so, warn in log and GUI
|
||||
#[cfg(desktop)]
|
||||
check_environment_variables();
|
||||
|
||||
// Spawn server process
|
||||
@@ -189,6 +191,7 @@ fn setup_webview2() -> Result<()> {
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(desktop)]
|
||||
fn check_environment_variables() {
|
||||
use itertools::Itertools;
|
||||
const ENVS_TO_CHECK: &[&str] = &["_JAVA_OPTIONS", "JAVA_TOOL_OPTIONS"];
|
||||
@@ -264,7 +267,7 @@ fn setup_tauri(
|
||||
open_logs_folder,
|
||||
tray::update_translations,
|
||||
tray::update_tray_text,
|
||||
tray::is_tray_available,
|
||||
cross::is_tray_available,
|
||||
presence::discord_client_exists,
|
||||
presence::update_presence,
|
||||
presence::clear_presence,
|
||||
@@ -299,7 +302,7 @@ fn setup_tauri(
|
||||
tray::create_tray(handle)?;
|
||||
presence::create_presence(handle)?;
|
||||
} else {
|
||||
app.manage(tray::TrayAvailable(false));
|
||||
app.manage(cross::TrayAvailable(false));
|
||||
}
|
||||
|
||||
app.manage(Mutex::new(window_state));
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
use std::{collections::HashMap, sync::Mutex};
|
||||
|
||||
use crate::cross::TrayAvailable;
|
||||
use tauri::{
|
||||
include_image,
|
||||
menu::{Menu, MenuBuilder, MenuItemBuilder, MenuItemKind},
|
||||
@@ -8,7 +9,6 @@ use tauri::{
|
||||
};
|
||||
|
||||
pub struct TrayMenu<R: Runtime>(Menu<R>);
|
||||
pub struct TrayAvailable(pub bool);
|
||||
|
||||
pub struct TrayTranslations {
|
||||
store: Mutex<HashMap<String, String>>,
|
||||
@@ -22,11 +22,6 @@ impl TrayTranslations {
|
||||
}
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub fn is_tray_available(tray_available: State<TrayAvailable>) -> bool {
|
||||
tray_available.0
|
||||
}
|
||||
|
||||
#[tauri::command]
|
||||
pub fn update_translations<R: Runtime>(
|
||||
app: AppHandle<R>,
|
||||
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"build": {
|
||||
"beforeDevCommand": "pnpm run start --host"
|
||||
},
|
||||
"identifier": "dev.slimevr.android"
|
||||
}
|
||||
@@ -206,11 +206,6 @@ export default function App() {
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
// don't show update stuff when on android
|
||||
if (window.__ANDROID__?.isThere()) {
|
||||
setUpdateFound('');
|
||||
return;
|
||||
}
|
||||
async function fetchReleases() {
|
||||
const releases = await fetch(
|
||||
`https://api.github.com/repos/${GH_REPO}/releases`
|
||||
|
||||
@@ -66,7 +66,9 @@ export function WidgetsComponent() {
|
||||
bodyPartsToReset="fingers"
|
||||
></ResetButton>
|
||||
<ClearMountingButton></ClearMountingButton>
|
||||
{!window.__ANDROID__?.isThere() && <BVHButton></BVHButton>}
|
||||
{(typeof __ANDROID__ === 'undefined' || !__ANDROID__?.isThere()) && (
|
||||
<BVHButton></BVHButton>
|
||||
)}
|
||||
<TrackingPauseButton></TrackingPauseButton>
|
||||
</div>
|
||||
<div className="w-full">
|
||||
|
||||
@@ -28,7 +28,7 @@ export function ArrowLink({
|
||||
};
|
||||
return classNames(
|
||||
variantsMap[variant],
|
||||
'flex gap-2 hover:fill-background-10 fill-background-30 text-background-10'
|
||||
'flex gap-2 hover:fill-background-10 hover:text-background-10 fill-background-30 text-background-30'
|
||||
);
|
||||
}, [variant]);
|
||||
|
||||
|
||||
@@ -53,7 +53,7 @@ export function CheckBox({
|
||||
className={classNames(
|
||||
{
|
||||
'rounded-lg': outlined,
|
||||
'text-background-10': !outlined || disabled,
|
||||
'text-background-30': !outlined || disabled,
|
||||
'bg-background-60': outlined && color === 'primary',
|
||||
'bg-background-70': outlined && color === 'secondary',
|
||||
'bg-background-50': outlined && color === 'tertiary',
|
||||
|
||||
@@ -12,8 +12,6 @@ import { FileIcon } from './icon/FileIcon';
|
||||
import { UploadFileIcon } from './icon/UploadFileIcon';
|
||||
import { Typography } from './Typography';
|
||||
import { CloseIcon } from './icon/CloseIcon';
|
||||
import { FolderIcon } from './icon/FolderIcon';
|
||||
import { UploadFolderIcon } from './icon/UploadFolderIcon';
|
||||
|
||||
interface InputProps {
|
||||
variant?: 'primary' | 'secondary';
|
||||
@@ -24,11 +22,9 @@ interface InputProps {
|
||||
export const FileInputContentBlank = ({
|
||||
isDragging,
|
||||
label,
|
||||
directory = false,
|
||||
}: {
|
||||
isDragging: boolean;
|
||||
label: string;
|
||||
directory?: boolean;
|
||||
}) => {
|
||||
return (
|
||||
<div
|
||||
@@ -40,11 +36,7 @@ export const FileInputContentBlank = ({
|
||||
)}
|
||||
>
|
||||
<span className="flex items-center space-x-2 pointer-events-none">
|
||||
{directory ? (
|
||||
<UploadFolderIcon isDragging={isDragging} />
|
||||
) : (
|
||||
<UploadFileIcon isDragging={isDragging} />
|
||||
)}
|
||||
<UploadFileIcon isDragging={isDragging} />
|
||||
<div>
|
||||
<Localized
|
||||
id={label}
|
||||
@@ -65,12 +57,10 @@ export const FileInputContentBlank = ({
|
||||
|
||||
export const FileInputContentFile = ({
|
||||
importedFileName,
|
||||
directory = false,
|
||||
onClearPicker,
|
||||
}: {
|
||||
importedFileName: string;
|
||||
onClearPicker: () => any;
|
||||
directory?: boolean;
|
||||
}) => {
|
||||
return (
|
||||
<div
|
||||
@@ -82,7 +72,7 @@ export const FileInputContentFile = ({
|
||||
>
|
||||
<div className="flex items-center space-x-2">
|
||||
<div className="flex items-center space-x-2 px-4">
|
||||
{directory ? <FolderIcon /> : <FileIcon />}
|
||||
<FileIcon />
|
||||
<span>{importedFileName}</span>
|
||||
</div>
|
||||
<span className="flex-grow"></span>
|
||||
|
||||
@@ -47,19 +47,19 @@ export const InputInside = forwardRef<
|
||||
const classes = useMemo(() => {
|
||||
const variantsMap = {
|
||||
primary: classNames({
|
||||
'placeholder:text-background-10 placeholder:italic bg-background-60 border-background-60':
|
||||
'placeholder:text-background-30 bg-background-60 border-background-60':
|
||||
!disabled,
|
||||
'text-background-30 placeholder:text-background-30 border-background-70 bg-background-70':
|
||||
disabled,
|
||||
}),
|
||||
secondary: classNames({
|
||||
'placeholder:text-background-10 placeholder:italic bg-background-50 border-background-50':
|
||||
'placeholder:text-background-30 bg-background-50 border-background-50':
|
||||
!disabled,
|
||||
'text-background-40 placeholder:text-background-40 border-background-70 bg-background-70':
|
||||
disabled,
|
||||
}),
|
||||
tertiary: classNames({
|
||||
'placeholder:text-background-10 placeholder:italic bg-background-40 border-background-40':
|
||||
'placeholder:text-background-30 bg-background-40 border-background-40':
|
||||
!disabled,
|
||||
'text-background-30 placeholder:text-background-30 border-background-70 bg-background-70':
|
||||
disabled,
|
||||
|
||||
@@ -51,7 +51,9 @@ export function Radio({
|
||||
<div className="flex flex-col gap-2 pointer-events-none">
|
||||
{children ? children : <Typography bold>{label}</Typography>}
|
||||
{description && (
|
||||
<Typography variant="standard">{description}</Typography>
|
||||
<Typography variant="standard" color="secondary">
|
||||
{description}
|
||||
</Typography>
|
||||
)}
|
||||
</div>
|
||||
</label>
|
||||
|
||||
@@ -24,11 +24,10 @@ export function InnerTauriFileInput({
|
||||
<div ref={ref} onClick={async () => onChange(await open({ directory }))}>
|
||||
{value !== null
|
||||
? FileInputContentFile({
|
||||
directory,
|
||||
importedFileName: value,
|
||||
onClearPicker: () => onChange(null),
|
||||
})
|
||||
: FileInputContentBlank({ isDragging: false, label, directory })}
|
||||
: FileInputContentBlank({ isDragging: false, label })}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
@@ -1,12 +0,0 @@
|
||||
export function FolderIcon({ width = 24 }: { width?: number }) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 24 24"
|
||||
fill="currentColor"
|
||||
width={width}
|
||||
>
|
||||
<path d="M19.5 21a3 3 0 0 0 3-3v-4.5a3 3 0 0 0-3-3h-15a3 3 0 0 0-3 3V18a3 3 0 0 0 3 3h15ZM1.5 10.146V6a3 3 0 0 1 3-3h5.379a2.25 2.25 0 0 1 1.59.659l2.122 2.121c.14.141.331.22.53.22H19.5a3 3 0 0 1 3 3v1.146A4.483 4.483 0 0 0 19.5 9h-15a4.483 4.483 0 0 0-3 1.146Z" />
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
@@ -1,25 +0,0 @@
|
||||
import classNames from 'classnames';
|
||||
|
||||
export function UploadFolderIcon({
|
||||
width = 24,
|
||||
isDragging = false,
|
||||
}: {
|
||||
width?: number;
|
||||
isDragging?: boolean;
|
||||
}) {
|
||||
return (
|
||||
<svg
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
viewBox="0 0 5.5499997 4.7600007"
|
||||
width={width}
|
||||
fill="currentColor"
|
||||
className={classNames('transition-transform', isDragging && 'scale-150')}
|
||||
>
|
||||
<path
|
||||
fill-rule="evenodd"
|
||||
d="m 4.76,4.76 c 0.44,0 0.79,-0.36 0.79,-0.79 v -2.39 c 0,-0.44 -0.36,-0.79 -0.79,-0.79 H 3.34 c -0.05,0 -0.1,-0.02 -0.14,-0.06 L 2.64,0.17 C 2.53,0.06 2.38,0 2.22,0 H 0.79 C 0.35,0 0,0.36 0,0.79 V 3.97 C 0,4.41 0.36,4.76 0.79,4.76 Z M 2.58,3.71 c 0,0.26 0.4,0.26 0.4,0 V 2.6 L 3.44,3.06 C 3.63,3.23 3.89,2.97 3.72,2.78 L 2.93,1.99 c -0.08,-0.08 -0.2,-0.08 -0.28,0 L 1.86,2.78 C 1.65,2.97 1.95,3.26 2.14,3.06 L 2.6,2.6 Z"
|
||||
clip-rule="evenodd"
|
||||
/>
|
||||
</svg>
|
||||
);
|
||||
}
|
||||
@@ -240,7 +240,7 @@ export function AddImusStep({
|
||||
<>
|
||||
<div className="flex flex-col w-full">
|
||||
<div className="flex flex-col gap-4">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('firmware_tool-add_imus_step-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -297,7 +297,7 @@ export function AddImusStep({
|
||||
<div className="flex justify-center flex-col items-center gap-3 h-44">
|
||||
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
|
||||
<Localized id="firmware_tool-loading">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -53,7 +53,7 @@ export function BoardPinsStep({
|
||||
<>
|
||||
<div className="flex flex-col w-full justify-between text-background-10">
|
||||
<div className="flex flex-col gap-4">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('firmware_tool-board_pins_step-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -172,7 +172,7 @@ export function BoardPinsStep({
|
||||
<div className="flex justify-center flex-col items-center gap-3 h-44">
|
||||
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
|
||||
<Localized id="firmware_tool-loading">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -68,7 +68,7 @@ export function BuildStep({
|
||||
<>
|
||||
<div className="flex flex-col w-full">
|
||||
<div className="flex flex-grow flex-col gap-4">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('firmware_tool-build_step-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -82,7 +82,7 @@ export function BuildStep({
|
||||
: SlimeState.SAD
|
||||
}
|
||||
></LoaderIcon>
|
||||
<Typography variant="section-title">
|
||||
<Typography variant="section-title" color="secondary">
|
||||
{l10n.getString('firmware_tool-build-' + buildStatus.status)}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -91,7 +91,7 @@ export function BuildStep({
|
||||
<div className="flex justify-center flex-col items-center gap-3 h-44">
|
||||
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
|
||||
<Localized id="firmware_tool-loading">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -85,7 +85,9 @@ function FirmwareToolContent() {
|
||||
.getString('firmware_tool-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</>
|
||||
</div>
|
||||
|
||||
@@ -22,7 +22,7 @@ export function FlashBtnStep({
|
||||
<>
|
||||
<div className="flex flex-col w-full">
|
||||
<div className="flex flex-grow flex-col gap-4">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('firmware_tool-flashbtn_step-description')}
|
||||
</Typography>
|
||||
{defaultConfig?.boardConfig.type ===
|
||||
|
||||
@@ -160,7 +160,7 @@ function SerialDevicesList({
|
||||
</Localized>
|
||||
{Object.keys(devices).length === 0 ? (
|
||||
<Localized id="firmware_tool-flash_method_serial-no_devices">
|
||||
<Typography variant="standard"></Typography>
|
||||
<Typography variant="standard" color="secondary"></Typography>
|
||||
</Localized>
|
||||
) : (
|
||||
<Dropdown
|
||||
@@ -274,7 +274,7 @@ function OTADevicesList({
|
||||
</Localized>
|
||||
{devices.length === 0 && (
|
||||
<Localized id="firmware_tool-flash_method_ota-no_devices">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
)}
|
||||
<div className="grid xs-settings:grid-cols-2 mobile-settings:grid-cols-1 gap-2">
|
||||
@@ -347,7 +347,7 @@ export function FlashingMethodStep({
|
||||
<>
|
||||
<div className="flex flex-col w-full">
|
||||
<div className="flex flex-grow flex-col gap-4">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('firmware_tool-flash_method_step-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -416,7 +416,7 @@ export function FlashingMethodStep({
|
||||
<div className="flex justify-center flex-col items-center gap-3 h-44">
|
||||
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
|
||||
<Localized id="firmware_tool-loading">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -164,7 +164,7 @@ export function FlashingStep({
|
||||
<>
|
||||
<div className="flex flex-col w-full">
|
||||
<div className="flex flex-grow flex-col gap-4">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('firmware_tool-flashing_step-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -27,7 +27,7 @@ export function SelectBoardStep({
|
||||
<>
|
||||
<div className="flex flex-col w-full">
|
||||
<div className="flex flex-grow flex-col gap-4">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('firmware_tool-board_step-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -91,7 +91,7 @@ export function SelectBoardStep({
|
||||
<div className="flex justify-center flex-col items-center gap-3 h-44">
|
||||
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
|
||||
<Localized id="firmware_tool-loading">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -40,7 +40,7 @@ export function SelectFirmwareStep({
|
||||
<>
|
||||
<div className="flex flex-col w-full">
|
||||
<div className="flex justify-between items-center mobile:flex-col gap-4">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('firmware_tool-select_firmware_step-description')}
|
||||
</Typography>
|
||||
<div>
|
||||
@@ -109,7 +109,7 @@ export function SelectFirmwareStep({
|
||||
<div className="flex justify-center flex-col items-center gap-3 h-44">
|
||||
<LoaderIcon slimeState={SlimeState.JUMPY}></LoaderIcon>
|
||||
<Localized id="firmware_tool-loading">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
)}
|
||||
|
||||
@@ -320,7 +320,7 @@ export function FirmwareUpdate() {
|
||||
<Typography variant="section-title"></Typography>
|
||||
</Localized>
|
||||
<Localized id="firmware_update-devices-description">
|
||||
<Typography variant="standard"></Typography>
|
||||
<Typography variant="standard" color="secondary"></Typography>
|
||||
</Localized>
|
||||
<div className="flex flex-col gap-4 overflow-y-auto xs:max-h-[530px]">
|
||||
{devices.length === 0 &&
|
||||
|
||||
@@ -28,8 +28,8 @@ export function SkipSetupButton({
|
||||
<button
|
||||
type="button"
|
||||
className={classNames(
|
||||
'text-background-10 hover:text-background-20',
|
||||
'stroke-background-10 hover:stroke-background-20',
|
||||
'text-background-40 hover:text-background-30',
|
||||
'stroke-background-40 hover:stroke-background-30',
|
||||
'absolute xs:-top-10 xs:right-4 mobile:top-0 mobile:right-0'
|
||||
)}
|
||||
onClick={onClick}
|
||||
|
||||
@@ -132,7 +132,9 @@ export function CalibrationTutorialPage() {
|
||||
id="onboarding-calibration_tutorial-description-v1"
|
||||
elems={{ b: <b></b> }}
|
||||
>
|
||||
<Typography>Description on calibration of IMU</Typography>
|
||||
<Typography color="secondary">
|
||||
Description on calibration of IMU
|
||||
</Typography>
|
||||
</Localized>
|
||||
<div>
|
||||
<div className="xs:hidden flex flex-row justify-center">
|
||||
|
||||
@@ -221,10 +221,10 @@ export function ConnectTrackersPage() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('onboarding-connect_tracker-title')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-connect_tracker-description-p0-v1')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-connect_tracker-description-p1-v1')}
|
||||
</Typography>
|
||||
<div className="flex flex-col gap-2 py-5">
|
||||
@@ -281,7 +281,7 @@ export function ConnectTrackersPage() {
|
||||
{l10n.getString('onboarding-connect_tracker-usb')}
|
||||
</Typography>
|
||||
<div className="flex fill-background-10 gap-1">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(statusLabelMap[provisioningStatus])}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -319,7 +319,7 @@ export function ConnectTrackersPage() {
|
||||
</div>
|
||||
</div>
|
||||
<div style={{ gridArea: 't' }} className="flex items-center px-5">
|
||||
<Typography bold>
|
||||
<Typography color="secondary" bold>
|
||||
{l10n.getString('onboarding-connect_tracker-connected_trackers', {
|
||||
amount: connectedIMUTrackers.length,
|
||||
})}
|
||||
|
||||
@@ -20,7 +20,7 @@ export function DonePage() {
|
||||
{l10n.getString('onboarding-done-title')}
|
||||
</Typography>
|
||||
<div className="flex flex-col items-center">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-done-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -22,7 +22,7 @@ export function EnterVRPage() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('onboarding-enter_vr-title')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-enter_vr-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -125,7 +125,7 @@ export function ResetTutorialPage() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('onboarding-reset_tutorial')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-reset_tutorial-explanation')}
|
||||
</Typography>
|
||||
<div className="flex">
|
||||
@@ -165,7 +165,7 @@ export function ResetTutorialPage() {
|
||||
curIndex >= order.length && 'hidden'
|
||||
)}
|
||||
>
|
||||
<Typography whitespace="whitespace-pre-line">
|
||||
<Typography whitespace="whitespace-pre-line" color="secondary">
|
||||
{l10n.getString(`onboarding-reset_tutorial-${curIndex}`, {
|
||||
taps: tapSettings[curIndex],
|
||||
})}
|
||||
@@ -184,7 +184,7 @@ export function ResetTutorialPage() {
|
||||
curIndex >= order.length && 'hidden'
|
||||
)}
|
||||
>
|
||||
<Typography whitespace="whitespace-pre-line">
|
||||
<Typography whitespace="whitespace-pre-line" color="secondary">
|
||||
{l10n.getString(`onboarding-reset_tutorial-${curIndex}`, {
|
||||
taps: tapSettings[curIndex],
|
||||
})}
|
||||
|
||||
@@ -35,7 +35,9 @@ export function WifiCredsPage() {
|
||||
.getString('onboarding-wifi_creds-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</>
|
||||
{!state.alonePage && (
|
||||
|
||||
@@ -32,7 +32,7 @@ export function AutomaticProportionsPage() {
|
||||
{l10n.getString('onboarding-automatic_proportions-title')}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_proportions-description'
|
||||
)}
|
||||
|
||||
@@ -52,7 +52,7 @@ export function ScaledProportionsPage() {
|
||||
{l10n.getString('onboarding-scaled_proportions-title')}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-scaled_proportions-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
+2
-2
@@ -72,7 +72,7 @@ export function CheckFloorHeightStep({
|
||||
)}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_proportions-check_floor_height-description'
|
||||
)}
|
||||
@@ -81,7 +81,7 @@ export function CheckFloorHeightStep({
|
||||
id="onboarding-automatic_proportions-check_floor_height-calculation_warning-v2"
|
||||
elems={{ u: <span className="underline"></span> }}
|
||||
>
|
||||
<Typography bold>
|
||||
<Typography color="secondary" bold>
|
||||
Press the button to get your height!
|
||||
</Typography>
|
||||
</Localized>
|
||||
|
||||
@@ -60,7 +60,7 @@ export function CheckHeightStep({
|
||||
)}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_proportions-check_height-description-v2'
|
||||
)}
|
||||
@@ -69,7 +69,7 @@ export function CheckHeightStep({
|
||||
id="onboarding-automatic_proportions-check_height-calculation_warning-v3"
|
||||
elems={{ u: <span className="underline"></span> }}
|
||||
>
|
||||
<Typography bold>
|
||||
<Typography color="secondary" bold>
|
||||
Press the button to get your height!
|
||||
</Typography>
|
||||
</Localized>
|
||||
|
||||
@@ -12,7 +12,7 @@ export function DoneStep({ variant }: { variant: 'onboarding' | 'alone' }) {
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('onboarding-automatic_proportions-done-title')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-automatic_proportions-done-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -26,13 +26,13 @@ export function PreparationStep({
|
||||
</Typography>
|
||||
<div>
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-0">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-1">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-2">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
+1
-1
@@ -28,7 +28,7 @@ export function PutTrackersOnStep({
|
||||
)}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_proportions-put_trackers_on-description'
|
||||
)}
|
||||
|
||||
@@ -97,7 +97,7 @@ export function Recording({
|
||||
'onboarding-automatic_proportions-recording-description-p0'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_proportions-recording-description-p1'
|
||||
)}
|
||||
@@ -110,7 +110,7 @@ export function Recording({
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<li key={i}>
|
||||
<Typography>{line}</Typography>
|
||||
<Typography color="secondary">{line}</Typography>
|
||||
</li>
|
||||
))}
|
||||
</>
|
||||
@@ -137,7 +137,7 @@ export function Recording({
|
||||
)
|
||||
.otherwise(() => undefined)}
|
||||
></ProgressBar>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{match([hasCalibration, hasRecording])
|
||||
.returnType<ReactNode>()
|
||||
.with([ProcessStatus.PENDING, ProcessStatus.FULFILLED], () =>
|
||||
|
||||
+1
-1
@@ -31,7 +31,7 @@ export function RequirementsStep({
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<li key={i}>
|
||||
<Typography>{line}</Typography>
|
||||
<Typography color="secondary">{line}</Typography>
|
||||
</li>
|
||||
))}
|
||||
</>
|
||||
|
||||
+2
-2
@@ -63,7 +63,7 @@ export function StartRecording({
|
||||
)}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_proportions-start_recording-description'
|
||||
)}
|
||||
@@ -76,7 +76,7 @@ export function StartRecording({
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<li key={i}>
|
||||
<Typography>{line}</Typography>
|
||||
<Typography color="secondary">{line}</Typography>
|
||||
</li>
|
||||
))}
|
||||
</>
|
||||
|
||||
+2
-2
@@ -42,7 +42,7 @@ export function VerifyResultsStep({
|
||||
)}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_proportions-verify_results-description'
|
||||
)}
|
||||
@@ -65,7 +65,7 @@ export function VerifyResultsStep({
|
||||
>
|
||||
{bodyParts?.map(({ bone, label, value }) => (
|
||||
<div className="flex justify-between" key={bone}>
|
||||
<Typography>{label}</Typography>
|
||||
<Typography color="secondary">{label}</Typography>
|
||||
<Typography bold sentryMask>
|
||||
{(value * 100).toFixed(2)} CM
|
||||
</Typography>
|
||||
|
||||
@@ -12,7 +12,7 @@ export function DoneStep({ variant }: { variant: 'onboarding' | 'alone' }) {
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('onboarding-scaled_proportions-done-title')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-scaled_proportions-done-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
+1
-1
@@ -90,7 +90,7 @@ export function ManualHeightStep({
|
||||
)}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-scaled_proportions-manual_height-description-v2'
|
||||
)}
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ export function ResetProportionsStep({
|
||||
)}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-scaled_proportions-reset_proportion-description'
|
||||
)}
|
||||
|
||||
@@ -33,7 +33,7 @@ export function AutomaticMountingPage() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('onboarding-automatic_mounting-title')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-automatic_mounting-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -99,7 +99,7 @@ export function ManualMountingPage() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('onboarding-manual_mounting')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-manual_mounting-description')}
|
||||
</Typography>
|
||||
<TipBox>{l10n.getString('tips-find_tracker')}</TipBox>
|
||||
|
||||
@@ -17,12 +17,16 @@ export function MountingChoose() {
|
||||
return (
|
||||
<>
|
||||
<div className="flex flex-col gap-5 h-full items-center w-full xs:justify-center relative overflow-y-auto px-4 pb-4">
|
||||
<div className="flex flex-col gap-8 justify-center">
|
||||
<div className="flex flex-col gap-4 justify-center">
|
||||
<div className="xs:w-10/12 xs:max-w-[666px]">
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('onboarding-choose_mounting')}
|
||||
</Typography>
|
||||
<Typography variant="standard" whitespace="whitespace-pre-line">
|
||||
<Typography
|
||||
variant="standard"
|
||||
color="secondary"
|
||||
whitespace="whitespace-pre-line"
|
||||
>
|
||||
{l10n.getString('onboarding-choose_mounting-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -33,19 +37,12 @@ export function MountingChoose() {
|
||||
>
|
||||
<div
|
||||
className={classNames(
|
||||
'rounded-lg p-4 flex relative',
|
||||
'rounded-lg p-4 flex',
|
||||
!state.alonePage && 'bg-background-70',
|
||||
state.alonePage && 'bg-background-60'
|
||||
)}
|
||||
>
|
||||
<div className="bg-accent-background-30 absolute -left-4 -top-5 p-1.5 rounded-lg">
|
||||
<Typography variant="vr-accessible" italic>
|
||||
{l10n.getString(
|
||||
'onboarding-choose_mounting-auto_mounting-label-v2'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="flex flex-col gap-4 ">
|
||||
<div className="flex flex-col gap-4">
|
||||
<div className="flex flex-grow flex-col gap-4 max-w-sm">
|
||||
<div>
|
||||
<Typography variant="main-title" bold>
|
||||
@@ -53,9 +50,14 @@ export function MountingChoose() {
|
||||
'onboarding-choose_mounting-auto_mounting'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography variant="vr-accessible" italic>
|
||||
{l10n.getString(
|
||||
'onboarding-choose_mounting-auto_mounting-label-v2'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-choose_mounting-auto_mounting-description'
|
||||
)}
|
||||
@@ -96,9 +98,14 @@ export function MountingChoose() {
|
||||
'onboarding-choose_mounting-manual_mounting'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography variant="vr-accessible" italic>
|
||||
{l10n.getString(
|
||||
'onboarding-choose_mounting-manual_mounting-label-v2'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-choose_mounting-manual_mounting-description'
|
||||
)}
|
||||
|
||||
@@ -20,7 +20,7 @@ export function DoneStep({
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('onboarding-automatic_mounting-done-title')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-automatic_mounting-done-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -38,11 +38,6 @@ export function DoneStep({
|
||||
{l10n.getString('onboarding-automatic_mounting-next')}
|
||||
</Button>
|
||||
)}
|
||||
{variant === 'alone' && (
|
||||
<Button className="flex gap-3" variant="primary" to="/">
|
||||
{l10n.getString('onboarding-automatic_mounting-return-home')}
|
||||
</Button>
|
||||
)}
|
||||
</div>
|
||||
|
||||
<SkeletonVisualizerWidget />
|
||||
|
||||
@@ -27,12 +27,12 @@ export function MountingResetStep({
|
||||
)}
|
||||
</Typography>
|
||||
<div className="flex flex-col gap-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_mounting-mounting_reset-step-0'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_mounting-mounting_reset-step-1'
|
||||
)}
|
||||
|
||||
@@ -26,13 +26,13 @@ export function PreparationStep({
|
||||
</Typography>
|
||||
<div>
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-0">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-1">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-2">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -28,7 +28,7 @@ export function PutTrackersOnStep({
|
||||
)}
|
||||
</Typography>
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'onboarding-automatic_mounting-put_trackers_on-description'
|
||||
)}
|
||||
|
||||
@@ -136,7 +136,7 @@ export function StayAlignedSetup() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('onboarding-stay_aligned-title')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-stay_aligned-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -11,7 +11,7 @@ export function DoneStep({ goTo }: VerticalStepComponentProps) {
|
||||
<Typography variant="main-title"></Typography>
|
||||
</Localized>
|
||||
<Localized id="onboarding-stay_aligned-done-description-2">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<div className="flex gap-3 justify-between">
|
||||
|
||||
+3
-3
@@ -16,13 +16,13 @@ export function PreparationStep({
|
||||
<div className="flex flex-col flex-grow justify-between py-2 gap-2">
|
||||
<div className="flex flex-col gap-1">
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-0">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-1">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
<Localized id="onboarding-automatic_mounting-preparation-v2-step-2">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<Localized id="onboarding-stay_aligned-preparation-tip">
|
||||
|
||||
+1
-1
@@ -19,7 +19,7 @@ export function PutTrackersOnStep({ nextStep }: VerticalStepComponentProps) {
|
||||
<div className="flex flex-grow flex-col gap-4">
|
||||
<div>
|
||||
<Localized id="onboarding-stay_aligned-put_trackers_on-description">
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<div className="flex">
|
||||
|
||||
+3
-1
@@ -30,7 +30,9 @@ function PosePage({
|
||||
<div className="flex flex-col py-2">
|
||||
<div className="flex flex-col gap-2">
|
||||
{descriptionKeys.map((descriptionKey) => (
|
||||
<Typography>{l10n.getString(descriptionKey)}</Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(descriptionKey)}
|
||||
</Typography>
|
||||
))}
|
||||
</div>
|
||||
<div className="flex pt-1 items-center fill-background-50 justify-center px-12">
|
||||
|
||||
+4
-4
@@ -11,16 +11,16 @@ export function VerifyMountingStep({
|
||||
<div className="flex flex-grow flex-col gap-4 py-2">
|
||||
<div className="flex flex-col gap-2">
|
||||
<Localized id="onboarding-stay_aligned-verify_mounting-step-0">
|
||||
<Typography />
|
||||
<Typography color="secondary" />
|
||||
</Localized>
|
||||
<Localized id="onboarding-stay_aligned-verify_mounting-step-1">
|
||||
<Typography />
|
||||
<Typography color="secondary" />
|
||||
</Localized>
|
||||
<Localized id="onboarding-stay_aligned-verify_mounting-step-2">
|
||||
<Typography />
|
||||
<Typography color="secondary" />
|
||||
</Localized>
|
||||
<Localized id="onboarding-stay_aligned-verify_mounting-step-3">
|
||||
<Typography />
|
||||
<Typography color="secondary" />
|
||||
</Localized>
|
||||
</div>
|
||||
<div className="flex gap-3 justify-between">
|
||||
|
||||
@@ -43,7 +43,7 @@ const ItemContent = ({
|
||||
mode,
|
||||
})}
|
||||
</Typography>
|
||||
<Typography variant="standard">
|
||||
<Typography variant="standard" color="secondary">
|
||||
{l10n.getString('onboarding-assign_trackers-option-description', {
|
||||
mode,
|
||||
})}
|
||||
|
||||
@@ -284,11 +284,11 @@ export function TrackersAssignPage() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('onboarding-assign_trackers-title')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-assign_trackers-description')}
|
||||
</Typography>
|
||||
<div className="flex gap-1">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('onboarding-assign_trackers-assigned', {
|
||||
assigned: assignedTrackers.length,
|
||||
trackers: trackers.length,
|
||||
|
||||
@@ -63,11 +63,11 @@ export function AdvancedSettings() {
|
||||
<div className="grid gap-4">
|
||||
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
|
||||
<div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-utils-advanced-reset-gui')}
|
||||
</Typography>
|
||||
<div className="flex flex-col">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-utils-advanced-reset-gui-description'
|
||||
)}
|
||||
@@ -95,11 +95,11 @@ export function AdvancedSettings() {
|
||||
|
||||
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
|
||||
<div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-utils-advanced-reset-server')}
|
||||
</Typography>
|
||||
<div className="flex flex-col">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-utils-advanced-reset-server-description'
|
||||
)}
|
||||
@@ -132,11 +132,11 @@ export function AdvancedSettings() {
|
||||
|
||||
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
|
||||
<div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-utils-advanced-reset-all')}
|
||||
</Typography>
|
||||
<div className="flex flex-col">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-utils-advanced-reset-all-description'
|
||||
)}
|
||||
@@ -168,11 +168,11 @@ export function AdvancedSettings() {
|
||||
|
||||
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
|
||||
<div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-utils-advanced-open_data-v1')}
|
||||
</Typography>
|
||||
<div className="flex flex-col">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-utils-advanced-open_data-description-v1'
|
||||
)}
|
||||
@@ -188,11 +188,11 @@ export function AdvancedSettings() {
|
||||
|
||||
<div className="sm:grid sm:grid-cols-[1.75fr,_1fr] items-center">
|
||||
<div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-utils-advanced-open_logs')}
|
||||
</Typography>
|
||||
<div className="flex flex-col">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-utils-advanced-open_logs-description'
|
||||
)}
|
||||
|
||||
@@ -459,7 +459,7 @@ export function GeneralSettings() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('settings-general-steamvr')}
|
||||
</Typography>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-steamvr-subtitle')}
|
||||
</Typography>
|
||||
<div className="flex flex-col py-2">
|
||||
@@ -467,11 +467,13 @@ export function GeneralSettings() {
|
||||
.getString('settings-general-steamvr-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</div>
|
||||
<div className="flex flex-col pt-4"></div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-steamvr-trackers-tracker_toggling'
|
||||
)}
|
||||
@@ -483,7 +485,9 @@ export function GeneralSettings() {
|
||||
)
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</div>
|
||||
<CheckBox
|
||||
@@ -604,7 +608,7 @@ export function GeneralSettings() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('settings-general-tracker_mechanics')}
|
||||
</Typography>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-tracker_mechanics-filtering')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-2 pb-4">
|
||||
@@ -614,7 +618,9 @@ export function GeneralSettings() {
|
||||
)
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</div>
|
||||
<Typography>
|
||||
@@ -684,7 +690,7 @@ export function GeneralSettings() {
|
||||
/>
|
||||
</div>
|
||||
<div className="flex flex-col pt-5 pb-3">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-tracker_mechanics-save_mounting_reset'
|
||||
)}
|
||||
@@ -693,7 +699,7 @@ export function GeneralSettings() {
|
||||
id="settings-general-tracker_mechanics-save_mounting_reset-description"
|
||||
elems={{ b: <b></b> }}
|
||||
>
|
||||
<Typography></Typography>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<CheckBox
|
||||
@@ -719,19 +725,19 @@ export function GeneralSettings() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('settings-general-fk_settings')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-2 pb-4 gap-2">
|
||||
<Typography variant="section-title">
|
||||
<div className="flex flex-col pt-2 pb-4">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-leg_tweak-skating_correction'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-leg_tweak-skating_correction-description'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-1 gap-2 pb-4">
|
||||
<div className="grid sm:grid-cols-1 gap-3 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
outlined
|
||||
@@ -755,18 +761,18 @@ export function GeneralSettings() {
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col pt-2 pb-2">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-fk_settings-leg_fk')}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-1 gap-3 pb-3">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-leg_tweak-floor_clip-description'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-1 gap-2 pb-3">
|
||||
<div className="grid sm:grid-cols-1 gap-3 pb-3">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
outlined
|
||||
@@ -778,7 +784,7 @@ export function GeneralSettings() {
|
||||
/>
|
||||
</div>
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-leg_tweak-foot_plant-description'
|
||||
)}
|
||||
@@ -796,7 +802,7 @@ export function GeneralSettings() {
|
||||
/>
|
||||
</div>
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-leg_tweak-toe_snap-description'
|
||||
)}
|
||||
@@ -815,10 +821,10 @@ export function GeneralSettings() {
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-fk_settings-arm_fk')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-description'
|
||||
)}
|
||||
@@ -837,114 +843,110 @@ export function GeneralSettings() {
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col pt-2">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-fk_settings-reset_settings')}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<div className="grid grid-cols-2 gap-2">
|
||||
<div className="flex flex-col gap-2">
|
||||
<Typography>
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-reset_settings-reset_hmd_pitch-description'
|
||||
)}
|
||||
</Typography>
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
outlined
|
||||
control={control}
|
||||
name="resetsSettings.resetHmdPitch"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-reset_settings-reset_hmd_pitch'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
<div className="flex flex-col gap-2 justify-end">
|
||||
<Typography>
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1'
|
||||
)}
|
||||
</Typography>
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
outlined
|
||||
control={control}
|
||||
name="resetsSettings.resetMountingFeet"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-leg_fk-reset_mounting_feet-v1'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-reset_mode-description'
|
||||
'settings-general-fk_settings-reset_settings-reset_hmd_pitch-description'
|
||||
)}
|
||||
</Typography>
|
||||
<div className="grid md:grid-cols-2 flex-col gap-3 pt-2 pb-3">
|
||||
<Radio
|
||||
control={control}
|
||||
name="resetsSettings.armsMountingResetMode"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-back'
|
||||
)}
|
||||
description={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-back-description'
|
||||
)}
|
||||
value={'0'}
|
||||
></Radio>
|
||||
<Radio
|
||||
control={control}
|
||||
name="resetsSettings.armsMountingResetMode"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-forward'
|
||||
)}
|
||||
description={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-forward-description'
|
||||
)}
|
||||
value={'1'}
|
||||
></Radio>
|
||||
<Radio
|
||||
control={control}
|
||||
name="resetsSettings.armsMountingResetMode"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-tpose_up'
|
||||
)}
|
||||
description={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-tpose_up-description'
|
||||
)}
|
||||
value={'2'}
|
||||
></Radio>
|
||||
<Radio
|
||||
control={control}
|
||||
name="resetsSettings.armsMountingResetMode"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-tpose_down'
|
||||
)}
|
||||
description={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-tpose_down-description'
|
||||
)}
|
||||
value={'3'}
|
||||
></Radio>
|
||||
</div>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-1 gap-3 pb-3">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
outlined
|
||||
control={control}
|
||||
name="resetsSettings.resetHmdPitch"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-reset_settings-reset_hmd_pitch'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-leg_fk-reset_mounting_feet-description-v1'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-1 gap-3 pb-3">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
outlined
|
||||
control={control}
|
||||
name="resetsSettings.resetMountingFeet"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-leg_fk-reset_mounting_feet-v1'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col pt-2 pb-1">
|
||||
<Typography variant="section-title">
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-reset_mode-description'
|
||||
)}
|
||||
</Typography>
|
||||
<div className="grid md:grid-cols-2 flex-col gap-3 pt-2 pb-3">
|
||||
<Radio
|
||||
control={control}
|
||||
name="resetsSettings.armsMountingResetMode"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-back'
|
||||
)}
|
||||
description={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-back-description'
|
||||
)}
|
||||
value={'0'}
|
||||
></Radio>
|
||||
<Radio
|
||||
control={control}
|
||||
name="resetsSettings.armsMountingResetMode"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-forward'
|
||||
)}
|
||||
description={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-forward-description'
|
||||
)}
|
||||
value={'1'}
|
||||
></Radio>
|
||||
<Radio
|
||||
control={control}
|
||||
name="resetsSettings.armsMountingResetMode"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-tpose_up'
|
||||
)}
|
||||
description={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-tpose_up-description'
|
||||
)}
|
||||
value={'2'}
|
||||
></Radio>
|
||||
<Radio
|
||||
control={control}
|
||||
name="resetsSettings.armsMountingResetMode"
|
||||
label={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-tpose_down'
|
||||
)}
|
||||
description={l10n.getString(
|
||||
'settings-general-fk_settings-arm_fk-tpose_down-description'
|
||||
)}
|
||||
value={'3'}
|
||||
></Radio>
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-enforce_joint_constraints'
|
||||
)}
|
||||
</Typography>
|
||||
<div className="pt-2">
|
||||
<Typography>
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-enforce_joint_constraints-enforce_constraints-description'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-1 pb-3">
|
||||
<CheckBox
|
||||
@@ -961,12 +963,12 @@ export function GeneralSettings() {
|
||||
{config?.debug && (
|
||||
<>
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-skeleton_settings-toggles'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-skeleton_settings-description'
|
||||
)}
|
||||
@@ -1001,14 +1003,14 @@ export function GeneralSettings() {
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
<div className="flex flex-col">
|
||||
<div className="flex flex-col pt-2 pb-3 gap-2">
|
||||
<Typography variant="section-title">
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-skeleton_settings-ratios'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-skeleton_settings-ratios-description'
|
||||
)}
|
||||
@@ -1110,12 +1112,12 @@ export function GeneralSettings() {
|
||||
</div>
|
||||
|
||||
<div className="flex flex-col pt-2 pb-3">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-self_localization-title'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-fk_settings-self_localization-description'
|
||||
)}
|
||||
@@ -1145,12 +1147,11 @@ export function GeneralSettings() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('settings-general-gesture_control')}
|
||||
</Typography>
|
||||
|
||||
<div className="flex flex-col pt-2 pb-4 gap-2">
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('settings-general-gesture_control-subtitle')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-gesture_control-subtitle')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-2 pb-4">
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-general-gesture_control-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -1266,12 +1267,12 @@ export function GeneralSettings() {
|
||||
/>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-1 gap-2 pt-2">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-gesture_control-numberTrackersOverThreshold'
|
||||
)}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-gesture_control-numberTrackersOverThreshold-description'
|
||||
)}
|
||||
|
||||
@@ -130,14 +130,11 @@ export function InterfaceSettings() {
|
||||
{l10n.getString('settings-interface-notifications')}
|
||||
</Typography>
|
||||
|
||||
<div className="pt-2">
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('settings-general-interface-serial_detection')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-interface-serial_detection')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-interface-serial_detection-description'
|
||||
)}
|
||||
@@ -155,11 +152,11 @@ export function InterfaceSettings() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-interface-feedback_sound')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-interface-feedback_sound-description'
|
||||
)}
|
||||
@@ -190,13 +187,13 @@ export function InterfaceSettings() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-interface-connected_trackers_warning'
|
||||
)}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-interface-connected_trackers_warning-description'
|
||||
)}
|
||||
@@ -224,134 +221,130 @@ export function InterfaceSettings() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('settings-interface-behavior')}
|
||||
</Typography>
|
||||
<div className="pt-2">
|
||||
{isTrayAvailable && (
|
||||
<>
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('settings-general-interface-use_tray')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
{l10n.getString(
|
||||
'settings-general-interface-use_tray-description'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-2 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
control={control}
|
||||
outlined
|
||||
name="behavior.useTray"
|
||||
label={l10n.getString(
|
||||
'settings-general-interface-use_tray-label'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('settings-general-interface-discord_presence')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
{l10n.getString(
|
||||
'settings-general-interface-discord_presence-description'
|
||||
)}
|
||||
{isTrayAvailable && (
|
||||
<>
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-interface-use_tray')}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-2 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
control={control}
|
||||
outlined
|
||||
name="behavior.discordPresence"
|
||||
label={l10n.getString(
|
||||
'settings-general-interface-discord_presence-label'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('settings-general-interface-dev_mode')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
{l10n.getString(
|
||||
'settings-general-interface-dev_mode-description'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-2 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
control={control}
|
||||
outlined
|
||||
name="behavior.devmode"
|
||||
label={l10n.getString(
|
||||
'settings-general-interface-dev_mode-label'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('settings-interface-behavior-error_tracking')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Localized
|
||||
id={
|
||||
'settings-interface-behavior-error_tracking-description_v2'
|
||||
}
|
||||
elems={{
|
||||
b: <b></b>,
|
||||
}}
|
||||
>
|
||||
<Typography whitespace="whitespace-pre-line"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-2 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
control={control}
|
||||
outlined
|
||||
name="behavior.errorTracking"
|
||||
label={l10n.getString(
|
||||
'settings-interface-behavior-error_tracking-label'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{isTauri() && (
|
||||
<>
|
||||
<Typography variant="section-title">
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-interface-behavior-bvh_directory'
|
||||
'settings-general-interface-use_tray-description'
|
||||
)}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Localized
|
||||
id={
|
||||
'settings-interface-behavior-bvh_directory-description'
|
||||
}
|
||||
>
|
||||
<Typography></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<div className="grid gap-3 pb-5">
|
||||
<TauriFileInput
|
||||
name="behavior.bvhDirectory"
|
||||
rules={{
|
||||
required: false,
|
||||
}}
|
||||
control={control}
|
||||
label="settings-interface-behavior-bvh_directory-label"
|
||||
directory
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-2 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
control={control}
|
||||
outlined
|
||||
name="behavior.useTray"
|
||||
label={l10n.getString(
|
||||
'settings-general-interface-use_tray-label'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-interface-discord_presence')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-interface-discord_presence-description'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-2 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
control={control}
|
||||
outlined
|
||||
name="behavior.discordPresence"
|
||||
label={l10n.getString(
|
||||
'settings-general-interface-discord_presence-label'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-interface-dev_mode')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-interface-dev_mode-description'
|
||||
)}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-2 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
control={control}
|
||||
outlined
|
||||
name="behavior.devmode"
|
||||
label={l10n.getString(
|
||||
'settings-general-interface-dev_mode-label'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-interface-behavior-error_tracking')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Localized
|
||||
id={'settings-interface-behavior-error_tracking-description_v2'}
|
||||
elems={{
|
||||
b: <b></b>,
|
||||
}}
|
||||
>
|
||||
<Typography
|
||||
color="secondary"
|
||||
whitespace="whitespace-pre-line"
|
||||
></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<div className="grid sm:grid-cols-2 pb-4">
|
||||
<CheckBox
|
||||
variant="toggle"
|
||||
control={control}
|
||||
outlined
|
||||
name="behavior.errorTracking"
|
||||
label={l10n.getString(
|
||||
'settings-interface-behavior-error_tracking-label'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
|
||||
{isTauri() && (
|
||||
<>
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-interface-behavior-bvh_directory')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Localized
|
||||
id={'settings-interface-behavior-bvh_directory-description'}
|
||||
>
|
||||
<Typography color="secondary"></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<div className="grid gap-3 pb-5">
|
||||
<TauriFileInput
|
||||
name="behavior.bvhDirectory"
|
||||
rules={{
|
||||
required: false,
|
||||
}}
|
||||
control={control}
|
||||
label="settings-interface-behavior-bvh_directory-label"
|
||||
directory
|
||||
/>
|
||||
</div>
|
||||
</>
|
||||
)}
|
||||
</>
|
||||
</SettingsPagePaneLayout>
|
||||
|
||||
@@ -363,13 +356,11 @@ export function InterfaceSettings() {
|
||||
<Typography variant="main-title">
|
||||
{l10n.getString('settings-interface-appearance')}
|
||||
</Typography>
|
||||
<div className="pt-2">
|
||||
<Typography variant="section-title">
|
||||
{l10n.getString('settings-interface-appearance-decorations')}
|
||||
</Typography>
|
||||
</div>
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-interface-appearance-decorations')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-interface-appearance-decorations-description'
|
||||
)}
|
||||
@@ -388,7 +379,7 @@ export function InterfaceSettings() {
|
||||
</div>
|
||||
|
||||
<div className="pb-4">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-interface-theme')}
|
||||
</Typography>
|
||||
<div className="flex flex-wrap gap-3 pt-2">
|
||||
@@ -449,13 +440,13 @@ export function InterfaceSettings() {
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-interface-show-navbar-onboarding'
|
||||
)}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-general-interface-show-navbar-onboarding-description'
|
||||
)}
|
||||
@@ -473,11 +464,11 @@ export function InterfaceSettings() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-interface-appearance-font')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-interface-appearance-font-description'
|
||||
)}
|
||||
@@ -522,11 +513,11 @@ export function InterfaceSettings() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-interface-appearance-font_size')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-interface-appearance-font_size-description'
|
||||
)}
|
||||
@@ -550,11 +541,11 @@ export function InterfaceSettings() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-general-interface-lang')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pt-1 pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-general-interface-lang-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -95,7 +95,7 @@ export function MagnetometerToggleSetting({
|
||||
return settingType === 'general' ? (
|
||||
<>
|
||||
<div className="flex flex-col pt-5 pb-3" id={id}>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString(
|
||||
'settings-general-tracker_mechanics-use_mag_on_all_trackers'
|
||||
)}
|
||||
@@ -104,7 +104,10 @@ export function MagnetometerToggleSetting({
|
||||
id="settings-general-tracker_mechanics-use_mag_on_all_trackers-description"
|
||||
elems={{ b: <b></b> }}
|
||||
>
|
||||
<Typography whitespace="whitespace-pre-line"></Typography>
|
||||
<Typography
|
||||
color="secondary"
|
||||
whitespace="whitespace-pre-line"
|
||||
></Typography>
|
||||
</Localized>
|
||||
</div>
|
||||
<CheckBox
|
||||
@@ -136,7 +139,10 @@ export function MagnetometerToggleSetting({
|
||||
),
|
||||
}}
|
||||
>
|
||||
<Typography whitespace="whitespace-pre-line"></Typography>
|
||||
<Typography
|
||||
color="secondary"
|
||||
whitespace="whitespace-pre-line"
|
||||
></Typography>
|
||||
</Localized>
|
||||
<div className="flex">
|
||||
<CheckBox
|
||||
|
||||
@@ -110,15 +110,17 @@ export function OSCRouterSettings() {
|
||||
.getString('settings-osc-router-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-router-enable')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-osc-router-enable-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -131,7 +133,7 @@ export function OSCRouterSettings() {
|
||||
label={l10n.getString('settings-osc-router-enable-label')}
|
||||
/>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-router-network')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
@@ -140,7 +142,9 @@ export function OSCRouterSettings() {
|
||||
.getString('settings-osc-router-network-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</>
|
||||
</div>
|
||||
@@ -172,11 +176,11 @@ export function OSCRouterSettings() {
|
||||
></Input>
|
||||
</Localized>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-router-network-address')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-osc-router-network-address-description'
|
||||
)}
|
||||
|
||||
@@ -240,7 +240,9 @@ export function Serial() {
|
||||
.getString('settings-serial-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</>
|
||||
</div>
|
||||
|
||||
@@ -137,15 +137,17 @@ export function VMCSettings() {
|
||||
.getString('settings-osc-vmc-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vmc-enable')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-osc-vmc-enable-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -158,7 +160,7 @@ export function VMCSettings() {
|
||||
label={l10n.getString('settings-osc-vmc-enable-label')}
|
||||
/>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vmc-network')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
@@ -167,7 +169,9 @@ export function VMCSettings() {
|
||||
.getString('settings-osc-vmc-network-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</>
|
||||
</div>
|
||||
@@ -199,11 +203,11 @@ export function VMCSettings() {
|
||||
></Input>
|
||||
</Localized>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vmc-network-address')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-osc-vmc-network-address-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -223,11 +227,11 @@ export function VMCSettings() {
|
||||
label=""
|
||||
></Input>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vmc-vrm')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-osc-vmc-vrm-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -250,11 +254,11 @@ export function VMCSettings() {
|
||||
></FileInput>
|
||||
{/* For some reason, linux (GNOME) is detecting the VRM file is a VRML */}
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vmc-anchor_hip')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-osc-vmc-anchor_hip-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -267,11 +271,11 @@ export function VMCSettings() {
|
||||
label={l10n.getString('settings-osc-vmc-anchor_hip-label')}
|
||||
/>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vmc-mirror_tracking')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-osc-vmc-mirror_tracking-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -140,15 +140,17 @@ export function VRCOSCSettings() {
|
||||
.getString('settings-osc-vrchat-description-v1')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vrchat-enable')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-osc-vrchat-enable-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -162,16 +164,18 @@ export function VRCOSCSettings() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vrchat-oscqueryEnabled')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n
|
||||
.getString('settings-osc-vrchat-oscqueryEnabled-description')
|
||||
.split('\n')
|
||||
.map((line, i) => (
|
||||
<Typography key={i}>{line}</Typography>
|
||||
<Typography color="secondary" key={i}>
|
||||
{line}
|
||||
</Typography>
|
||||
))}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -187,11 +191,11 @@ export function VRCOSCSettings() {
|
||||
/>
|
||||
</div>
|
||||
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vrchat-network')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-osc-vrchat-network-description-v1')}
|
||||
</Typography>
|
||||
</div>
|
||||
@@ -223,11 +227,11 @@ export function VRCOSCSettings() {
|
||||
></Input>
|
||||
</Localized>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vrchat-network-address')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-osc-vrchat-network-address-description-v1'
|
||||
)}
|
||||
@@ -249,11 +253,11 @@ export function VRCOSCSettings() {
|
||||
label=""
|
||||
></Input>
|
||||
</div>
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-osc-vrchat-network-trackers')}
|
||||
</Typography>
|
||||
<div className="flex flex-col pb-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-osc-vrchat-network-trackers-description'
|
||||
)}
|
||||
|
||||
@@ -40,7 +40,9 @@ function StaAlignedPoseModal({
|
||||
</div>
|
||||
<div className="flex flex-col gap-1">
|
||||
{descriptionKeys.map((descriptionKey) => (
|
||||
<Typography>{l10n.getString(descriptionKey)}</Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(descriptionKey)}
|
||||
</Typography>
|
||||
))}
|
||||
</div>
|
||||
<div className="flex pt-1 items-center fill-background-50 justify-center px-12">
|
||||
|
||||
@@ -182,10 +182,10 @@ export function StayAlignedSettings({
|
||||
{l10n.getString('settings-stay_aligned')}
|
||||
</Typography>
|
||||
<div className="mt-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-stay_aligned-description')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-stay_aligned-setup-description')}
|
||||
</Typography>
|
||||
<div className="flex mt-2">
|
||||
@@ -199,7 +199,7 @@ export function StayAlignedSettings({
|
||||
</div>
|
||||
</div>
|
||||
<div className="mt-6">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-stay_aligned-general-label')}
|
||||
</Typography>
|
||||
<div className="grid sm:grid-cols-2 gap-3 mt-2">
|
||||
@@ -224,11 +224,11 @@ export function StayAlignedSettings({
|
||||
</div>
|
||||
</div>
|
||||
<div className="mt-6">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-stay_aligned-relaxed_poses-label')}
|
||||
</Typography>
|
||||
<div className="mt-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString(
|
||||
'settings-stay_aligned-relaxed_poses-description'
|
||||
)}
|
||||
@@ -305,11 +305,11 @@ export function StayAlignedSettings({
|
||||
</div>
|
||||
</div>
|
||||
<div className="mt-6">
|
||||
<Typography variant="section-title">
|
||||
<Typography bold>
|
||||
{l10n.getString('settings-stay_aligned-debug-label')}
|
||||
</Typography>
|
||||
<div className="mt-2">
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('settings-stay_aligned-debug-description')}
|
||||
</Typography>
|
||||
</div>
|
||||
|
||||
@@ -49,7 +49,7 @@ export function SingleTrackerBodyAssignmentMenu({
|
||||
<Typography variant="mobile-title" bold>
|
||||
{l10n.getString('body_assignment_menu')}
|
||||
</Typography>
|
||||
<Typography>
|
||||
<Typography color="secondary">
|
||||
{l10n.getString('body_assignment_menu-description')}
|
||||
</Typography>
|
||||
<div className="flex">
|
||||
|
||||
Loaded 100 of 148 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user