From ae43a0abcd1fa3bb12775bc2074783b5aebd4bd6 Mon Sep 17 00:00:00 2001 From: Piyou Date: Thu, 26 Feb 2026 11:47:04 -0800 Subject: [PATCH 1/7] added some tranlations need to get update some things --- .../composeResources/values-cs/quantitative.xml | 12 ++++++++++++ .../composeResources/values-es/quantiative.xml | 12 ++++++++++++ .../composeResources/values-kn/quantiative.xml | 13 +++++++++++++ .../commonMain/composeResources/values/prematch.xml | 3 --- .../composeResources/values/quantitative.xml | 3 +++ .../commonMain/composeResources/values/teleop.xml | 3 --- gradle/libs.versions.toml | 2 +- 7 files changed, 41 insertions(+), 7 deletions(-) create mode 100644 composeApp/src/commonMain/composeResources/values-cs/quantitative.xml create mode 100644 composeApp/src/commonMain/composeResources/values-es/quantiative.xml create mode 100644 composeApp/src/commonMain/composeResources/values-kn/quantiative.xml delete mode 100644 composeApp/src/commonMain/composeResources/values/teleop.xml diff --git a/composeApp/src/commonMain/composeResources/values-cs/quantitative.xml b/composeApp/src/commonMain/composeResources/values-cs/quantitative.xml new file mode 100644 index 0000000..d68a8f8 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/values-cs/quantitative.xml @@ -0,0 +1,12 @@ + + 比赛编号 + 记录人姓名 + 队伍编号 + 预装弹发射数 + 来自前哨站的燃料数 + 来自补给站的燃料数 + 来自中立区的燃料数 + Cycles + Herding + incapacitated + \ No newline at end of file diff --git a/composeApp/src/commonMain/composeResources/values-es/quantiative.xml b/composeApp/src/commonMain/composeResources/values-es/quantiative.xml new file mode 100644 index 0000000..1925ef2 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/values-es/quantiative.xml @@ -0,0 +1,12 @@ + + ¿Número de Partido? + ¡Tu Nombre! + ¿Número de Equipo? + Disparo Precargado + Combustible del Puesto de Avanzada + Combustible del Depósito + Combustible de la Zona Neutral + Cycles + Herding + incapacitated + \ No newline at end of file diff --git a/composeApp/src/commonMain/composeResources/values-kn/quantiative.xml b/composeApp/src/commonMain/composeResources/values-kn/quantiative.xml new file mode 100644 index 0000000..3aa3a20 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/values-kn/quantiative.xml @@ -0,0 +1,13 @@ + + + Match sankhye enu? + ninna hesarenu! + Team sankhye eshtu? + Shot Ready maadi + Outpost inda Indhana + Depot inda Indhana + Nuetral Zone inda Indhana + Cycles + Herding + incapacitated + \ No newline at end of file diff --git a/composeApp/src/commonMain/composeResources/values/prematch.xml b/composeApp/src/commonMain/composeResources/values/prematch.xml index bc546be..e5f8fdc 100644 --- a/composeApp/src/commonMain/composeResources/values/prematch.xml +++ b/composeApp/src/commonMain/composeResources/values/prematch.xml @@ -1,5 +1,2 @@ - Match Number??? - Your Name Human! - TeamNumber ;) \ No newline at end of file diff --git a/composeApp/src/commonMain/composeResources/values/quantitative.xml b/composeApp/src/commonMain/composeResources/values/quantitative.xml index e820f54..a991491 100644 --- a/composeApp/src/commonMain/composeResources/values/quantitative.xml +++ b/composeApp/src/commonMain/composeResources/values/quantitative.xml @@ -1,4 +1,7 @@ + Match Number??? + Your Name Human! + TeamNumber ;) Shot Preload Fuel from Outpost Fuel from Depot diff --git a/composeApp/src/commonMain/composeResources/values/teleop.xml b/composeApp/src/commonMain/composeResources/values/teleop.xml deleted file mode 100644 index 766c146..0000000 --- a/composeApp/src/commonMain/composeResources/values/teleop.xml +++ /dev/null @@ -1,3 +0,0 @@ - - MyStringText - \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0d9c526..732bff2 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.11.2" +agp = "8.13.2" android-compileSdk = "36" android-minSdk = "24" android-targetSdk = "36" From e09c7f72c37b1e3e902b74091f863404ea13af09 Mon Sep 17 00:00:00 2001 From: Piyou Date: Thu, 26 Feb 2026 11:48:19 -0800 Subject: [PATCH 2/7] ran spotless apply --- .../scouting/scoutingapp2026/Quantitative.kt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/com/team2813/scouting/scoutingapp2026/Quantitative.kt b/composeApp/src/commonMain/kotlin/com/team2813/scouting/scoutingapp2026/Quantitative.kt index 5b5fbcd..4674952 100644 --- a/composeApp/src/commonMain/kotlin/com/team2813/scouting/scoutingapp2026/Quantitative.kt +++ b/composeApp/src/commonMain/kotlin/com/team2813/scouting/scoutingapp2026/Quantitative.kt @@ -50,12 +50,12 @@ import scoutingapp2026.composeapp.generated.resources.auto_fuel_depot import scoutingapp2026.composeapp.generated.resources.auto_fuel_neutral import scoutingapp2026.composeapp.generated.resources.auto_fuel_outpost import scoutingapp2026.composeapp.generated.resources.auto_shoot_preload -import scoutingapp2026.composeapp.generated.resources.matchNumber -import scoutingapp2026.composeapp.generated.resources.nameOfPerson -import scoutingapp2026.composeapp.generated.resources.teamNumber import scoutingapp2026.composeapp.generated.resources.cycles import scoutingapp2026.composeapp.generated.resources.herding import scoutingapp2026.composeapp.generated.resources.incap +import scoutingapp2026.composeapp.generated.resources.matchNumber +import scoutingapp2026.composeapp.generated.resources.nameOfPerson +import scoutingapp2026.composeapp.generated.resources.teamNumber @Composable fun IncrementButton( @@ -294,8 +294,10 @@ fun Teleoperated( modifier = Modifier.fillMaxWidth(0.5f), horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.spacedBy(20.dp)) { - IncrementButton(stringResource(Res.string.cycles), - teleopData.Cycles, enabled = true) + IncrementButton( + stringResource(Res.string.cycles), + teleopData.Cycles, + enabled = true) } } val fuelAmount = mutableIntStateOf(0) From 8ab943c61de2740be84d85411e950650c68b4c76 Mon Sep 17 00:00:00 2001 From: Piyou Date: Thu, 26 Feb 2026 11:50:56 -0800 Subject: [PATCH 3/7] combined prematch.xml into quantiative.xml --- composeApp/src/commonMain/composeResources/values/prematch.xml | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 composeApp/src/commonMain/composeResources/values/prematch.xml diff --git a/composeApp/src/commonMain/composeResources/values/prematch.xml b/composeApp/src/commonMain/composeResources/values/prematch.xml deleted file mode 100644 index e5f8fdc..0000000 --- a/composeApp/src/commonMain/composeResources/values/prematch.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file From 3db7a99803b12a5059a9536f338b8edcfdeba164 Mon Sep 17 00:00:00 2001 From: Tom Joseph Date: Thu, 26 Feb 2026 19:29:51 -0800 Subject: [PATCH 4/7] Added language code for simplfied havent tested it yet will update if test passes or fails --- .../{values-cs => values-zh-Hans}/quantitative.xml | 1 + .../values-zh-Hant/quantitative.xml | 14 ++++++++++++++ 2 files changed, 15 insertions(+) rename composeApp/src/commonMain/composeResources/{values-cs => values-zh-Hans}/quantitative.xml (91%) create mode 100644 composeApp/src/commonMain/composeResources/values-zh-Hant/quantitative.xml diff --git a/composeApp/src/commonMain/composeResources/values-cs/quantitative.xml b/composeApp/src/commonMain/composeResources/values-zh-Hans/quantitative.xml similarity index 91% rename from composeApp/src/commonMain/composeResources/values-cs/quantitative.xml rename to composeApp/src/commonMain/composeResources/values-zh-Hans/quantitative.xml index d68a8f8..893f9af 100644 --- a/composeApp/src/commonMain/composeResources/values-cs/quantitative.xml +++ b/composeApp/src/commonMain/composeResources/values-zh-Hans/quantitative.xml @@ -1,4 +1,5 @@ + 比赛编号 记录人姓名 队伍编号 diff --git a/composeApp/src/commonMain/composeResources/values-zh-Hant/quantitative.xml b/composeApp/src/commonMain/composeResources/values-zh-Hant/quantitative.xml new file mode 100644 index 0000000..dc1bd0e --- /dev/null +++ b/composeApp/src/commonMain/composeResources/values-zh-Hant/quantitative.xml @@ -0,0 +1,14 @@ + + + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + Cycles + Herding + incapacitated + \ No newline at end of file From 6f5ea479fce9796ec070a1ba09781aa9c23cbf81 Mon Sep 17 00:00:00 2001 From: Tom Joseph Date: Fri, 27 Feb 2026 10:16:27 -0800 Subject: [PATCH 5/7] refactored to use regions for written mandarin --- .../{values-zh-Hans => values-zh-rCN}/quantitative.xml | 0 .../{values-zh-Hant => values-zh-rTW}/quantitative.xml | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename composeApp/src/commonMain/composeResources/{values-zh-Hans => values-zh-rCN}/quantitative.xml (100%) rename composeApp/src/commonMain/composeResources/{values-zh-Hant => values-zh-rTW}/quantitative.xml (100%) diff --git a/composeApp/src/commonMain/composeResources/values-zh-Hans/quantitative.xml b/composeApp/src/commonMain/composeResources/values-zh-rCN/quantitative.xml similarity index 100% rename from composeApp/src/commonMain/composeResources/values-zh-Hans/quantitative.xml rename to composeApp/src/commonMain/composeResources/values-zh-rCN/quantitative.xml diff --git a/composeApp/src/commonMain/composeResources/values-zh-Hant/quantitative.xml b/composeApp/src/commonMain/composeResources/values-zh-rTW/quantitative.xml similarity index 100% rename from composeApp/src/commonMain/composeResources/values-zh-Hant/quantitative.xml rename to composeApp/src/commonMain/composeResources/values-zh-rTW/quantitative.xml From 82367dbd26d8dafb76136f080a69edd1a92202ee Mon Sep 17 00:00:00 2001 From: Tom Joseph Date: Fri, 27 Feb 2026 18:25:41 -0800 Subject: [PATCH 6/7] added mMandarintraditional translations --- .../values-zh-rTW/quantitative.xml | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/composeApp/src/commonMain/composeResources/values-zh-rTW/quantitative.xml b/composeApp/src/commonMain/composeResources/values-zh-rTW/quantitative.xml index dc1bd0e..9b0d22c 100644 --- a/composeApp/src/commonMain/composeResources/values-zh-rTW/quantitative.xml +++ b/composeApp/src/commonMain/composeResources/values-zh-rTW/quantitative.xml @@ -1,14 +1,14 @@ - 1 - 2 - 3 - 4 - 5 - 6 - 7 - Cycles - Herding - incapacitated + 匹配號碼 + 隊員姓名 + 隊號 + 射擊預裝 + 球來自隊員裝球位 + 球來自取球倉 + 球來自中立區 + :循環次數 + 運球 + 停止運作 \ No newline at end of file From a196d367ddfb11940065edb15b36bc2f6921600e Mon Sep 17 00:00:00 2001 From: Piyou Date: Thu, 5 Mar 2026 10:32:22 -0800 Subject: [PATCH 7/7] added for kn translations and reverted gradle version --- .../commonMain/composeResources/values-kn/quantiative.xml | 6 +++--- gradle/libs.versions.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/composeApp/src/commonMain/composeResources/values-kn/quantiative.xml b/composeApp/src/commonMain/composeResources/values-kn/quantiative.xml index 3aa3a20..dfc7960 100644 --- a/composeApp/src/commonMain/composeResources/values-kn/quantiative.xml +++ b/composeApp/src/commonMain/composeResources/values-kn/quantiative.xml @@ -7,7 +7,7 @@ Outpost inda Indhana Depot inda Indhana Nuetral Zone inda Indhana - Cycles - Herding - incapacitated + Chakra + Chendugalannu ottu maaduvudu + Asamartha \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 732bff2..0d9c526 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.13.2" +agp = "8.11.2" android-compileSdk = "36" android-minSdk = "24" android-targetSdk = "36"