From a6a9ac5c777a9c34d16ffe6d40a853d59f4a38d0 Mon Sep 17 00:00:00 2001 From: 25lacorazzan <25lacorazzan@students.msad54.org> Date: Tue, 4 Feb 2025 12:01:24 -0500 Subject: [PATCH 1/3] Changed the layouts of auto and tele --- .idea/caches/deviceStreaming.xml | 22 + .../8.7/executionHistory/executionHistory.bin | Bin 2487758 -> 2487758 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/8.7/fileHashes/fileHashes.bin | Bin 160133 -> 173792 bytes .../.gradle/8.7/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.7/fileHashes/resourceHashesCache.bin | Bin 19925 -> 20843 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes ScoutingApp/.gradle/file-system.probe | Bin 8 -> 8 bytes .../intermediates/apk/debug/app-debug.apk | Bin 10872428 -> 10872372 bytes .../debug/processDebugResources/R.jar | Bin 736543 -> 736437 bytes .../debug/mergeProjectDexDebug/0/classes.dex | Bin 484052 -> 483960 bytes .../debug/mergeProjectDexDebug/4/classes.dex | Bin 32092 -> 31684 bytes .../debug/dexBuilderDebug/out | Bin 450 -> 450 bytes .../compile-file-map.properties | 2 +- .../debug/mergeDebugResources/merger.xml | 2 +- .../compile-file-map.properties | 2 +- .../debug/packageDebugResources/merger.xml | 2 +- .../tmp/debug/dex-renamer-state.txt | 2 +- .../tmp/debug/zip-cache/androidResources | Bin 79943 -> 79943 bytes .../example/scoutingapp/AutoActivity.class | Bin 9827 -> 9589 bytes .../example/scoutingapp/EndActivity$1.class | Bin 1337 -> 1405 bytes .../example/scoutingapp/TeleActivity.class | Bin 9761 -> 9532 bytes .../linked-resources-binary-format-debug.ap_ | Bin 1549315 -> 1549507 bytes .../debug/parseDebugLocalResources/R-def.txt | 12 +- .../layout_activity_auto.xml.flat | Bin 15032 -> 12856 bytes .../layout_activity_tele.xml.flat | Bin 9540 -> 12848 bytes .../values_values.arsc.flat | Bin 874104 -> 874104 bytes .../out/multi-v2/mergeDebugResources.json | 210 +- .../out/multi-v2/values.json | 34 +- .../out/single/mergeDebugResources.json | 28 +- .../layout/activity_auto.xml | 300 +- .../layout/activity_tele.xml | 241 +- .../packageDebugResources/values/values.xml | 2 +- ...d263289bd34519c8c8356b69ae5fceebf60_0.jar} | Bin ...d263289bd34519c8c8356b69ae5fceebf60_1.jar} | Bin ...d263289bd34519c8c8356b69ae5fceebf60_2.jar} | Bin ...d263289bd34519c8c8356b69ae5fceebf60_3.jar} | Bin ...d263289bd34519c8c8356b69ae5fceebf60_5.jar} | Bin ...d263289bd34519c8c8356b69ae5fceebf60_6.jar} | Bin ...d263289bd34519c8c8356b69ae5fceebf60_7.jar} | Bin ...1d263289bd34519c8c8356b69ae5fceebf60_8.jar | Bin 0 -> 5446 bytes ...d263289bd34519c8c8356b69ae5fceebf60_9.jar} | Bin .../com/example/scoutingapp/AutoActivity.dex | Bin 13604 -> 13408 bytes .../com/example/scoutingapp/EndActivity$1.dex | Bin 1660 -> 1748 bytes .../com/example/scoutingapp/TeleActivity.dex | Bin 13604 -> 13344 bytes ...a50368e050f29c7da372a58543dcdaaf8924_8.jar | Bin 5472 -> 0 bytes .../debug/processDebugResources/R.txt | 12 +- .../debug/processDebugResources/stableIds.txt | 3611 +++++++++-------- .../processDebugResources/package-aware-r.txt | 12 +- .../stash-dir/AutoActivity.class.uniqueId1 | Bin 0 -> 9136 bytes .../stash-dir/AutoActivity.class.uniqueId3 | Bin 8767 -> 0 bytes .../stash-dir/EndActivity$1.class.uniqueId0 | Bin 1337 -> 0 bytes .../stash-dir/EndActivity$2.class.uniqueId5 | Bin 973 -> 0 bytes .../stash-dir/EndActivity.class.uniqueId1 | Bin 2779 -> 0 bytes ...iqueId2 => MainActivity$1.class.uniqueId0} | Bin ...ctivity$AsynchronousGet$1.class.uniqueId5} | Bin ...nActivity$AsynchronousGet.class.uniqueId3} | Bin ...uniqueId7 => MainActivity.class.uniqueId4} | Bin .../stash-dir/TeleActivity.class.uniqueId2 | Bin 0 -> 9122 bytes .../stash-dir/TeleActivity.class.uniqueId4 | Bin 6677 -> 0 bytes .../previous-compilation-data.bin | Bin 63627 -> 63610 bytes .../com/example/scoutingapp/AutoActivity.java | 47 +- .../com/example/scoutingapp/EndActivity.java | 2 +- .../com/example/scoutingapp/TeleActivity.java | 56 +- .../app/src/main/res/layout/activity_auto.xml | 300 +- .../app/src/main/res/layout/activity_tele.xml | 241 +- .../app/src/main/res/values/strings.xml | 2 +- 67 files changed, 2589 insertions(+), 2553 deletions(-) rename ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/{d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_0.jar => bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_0.jar} (100%) rename ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/{d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_1.jar => bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_1.jar} (100%) rename ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/{d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_2.jar => bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_2.jar} (100%) rename ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/{d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_3.jar => bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_3.jar} (100%) rename ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/{d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_5.jar => bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_5.jar} (100%) rename ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/{d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_6.jar => bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_6.jar} (100%) rename ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/{d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_7.jar => bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_7.jar} (100%) create mode 100644 ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_8.jar rename ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/{d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_9.jar => bc2846fe0c4e212a194b79a17ede1d263289bd34519c8c8356b69ae5fceebf60_9.jar} (100%) delete mode 100644 ScoutingApp/app/build/intermediates/project_dex_archive/debug/dexBuilderDebug/out/d9e80a1f056eeb38789cecf53fd3a50368e050f29c7da372a58543dcdaaf8924_8.jar create mode 100644 ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AutoActivity.class.uniqueId1 delete mode 100644 ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/AutoActivity.class.uniqueId3 delete mode 100644 ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$1.class.uniqueId0 delete mode 100644 ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity$2.class.uniqueId5 delete mode 100644 ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/EndActivity.class.uniqueId1 rename ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/{MainActivity$1.class.uniqueId2 => MainActivity$1.class.uniqueId0} (100%) rename ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/{MainActivity$AsynchronousGet$1.class.uniqueId8 => MainActivity$AsynchronousGet$1.class.uniqueId5} (100%) rename ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/{MainActivity$AsynchronousGet.class.uniqueId6 => MainActivity$AsynchronousGet.class.uniqueId3} (100%) rename ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/{MainActivity.class.uniqueId7 => MainActivity.class.uniqueId4} (100%) create mode 100644 ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId2 delete mode 100644 ScoutingApp/app/build/tmp/compileDebugJavaWithJavac/compileTransaction/stash-dir/TeleActivity.class.uniqueId4 diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml index e05e216..f553ee9 100644 --- a/.idea/caches/deviceStreaming.xml +++ b/.idea/caches/deviceStreaming.xml @@ -124,6 +124,17 @@