From 40978a0beac334a78f134bc5be864121f810a82e Mon Sep 17 00:00:00 2001 From: wildercayden Date: Thu, 30 Jul 2026 14:15:31 -0400 Subject: [PATCH] test commit from linux --- Generator/app/build.gradle.kts | 1 + Generator/app/src/main/AndroidManifest.xml | 4 + .../com/example/generator/ColorActivity.java | 2 +- .../com/example/generator/EventsActivity.java | 37 + .../com/example/generator/MainActivity.java | 2 +- .../src/main/res/layout/activity_events.xml | 37 + Generator/gradle/libs.versions.toml | 2 + .../executionHistory/executionHistory.bin | Bin 4669795 -> 4669795 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes .../.gradle/8.13/fileHashes/fileHashes.bin | Bin 273719 -> 335037 bytes .../.gradle/8.13/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.13/fileHashes/resourceHashesCache.bin | Bin 24175 -> 24515 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 58613 -> 87119 bytes ScoutingApp/.gradle/file-system.probe | Bin 8 -> 8 bytes ScoutingApp/.idea/caches/deviceStreaming.xml | 120 + ScoutingApp/app/build.gradle.kts | 4 +- .../intermediates/apk/debug/app-debug.apk | Bin 11925587 -> 11925583 bytes .../apk/debug/output-metadata.json | 4 +- .../currentProject/dirs_bucket_0/graph.bin | Bin 3286 -> 2283 bytes .../currentProject/dirs_bucket_1/graph.bin | Bin 1947 -> 1197 bytes .../currentProject/dirs_bucket_2/graph.bin | Bin 2338 -> 2806 bytes .../currentProject/dirs_bucket_3/graph.bin | Bin 1881 -> 1666 bytes .../currentProject/dirs_bucket_4/graph.bin | Bin 1925 -> 2272 bytes .../currentProject/dirs_bucket_5/graph.bin | Bin 7199 -> 1197 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../graph.bin | Bin 235 -> 0 bytes .../debug/mergeProjectDexDebug/4/classes.dex | Bin 65680 -> 65684 bytes .../debug/dexBuilderDebug/out | Bin 424 -> 422 bytes .../debug/dexBuilderDebug/out | 2 +- .../debug-mergeJavaRes/merge-state | Bin 23962 -> 23962 bytes .../zip-cache/+T+QRZozBkiB4OjRLKLRTQ== | 1 - .../zip-cache/+lkwdp134C1aG2xR6jr+8Q== | 1 - .../zip-cache/0mAMALUedgdz3ym6a_Hp0A== | 1 - .../zip-cache/3bHdR_6yScclKZUgSwSQYQ== | 1 - .../zip-cache/3rP+xYiIlgHz7rXKEs6loA== | 1 - .../zip-cache/4FngolG2mmwFMjqJNJ9+hg== | 1 - .../zip-cache/4ruDCP_2uCQ5at1szVEVEA== | 1 - .../zip-cache/5NIQSnfs1im5jn2bNtubyQ== | 1 - .../zip-cache/5RDb5Ny0nwCHP6AZge9R5Q== | 1 - .../zip-cache/5hsp3OZBT4Z1B6yLi471kw== | 1 - .../zip-cache/67gflX1vrxajjRdbRMPv5w== | 1 - .../zip-cache/7kFg10bAdr5U55KEy1iyCw== | 1 - .../zip-cache/9JVmsupDFiu6WlDKwxBnNg== | 1 - .../zip-cache/BT_+1czMPGt6_1ezOg01GQ== | 1 - .../zip-cache/Br+_sVYw0InuCaDy6VqYSg== | 1 - .../zip-cache/CVGzKojX8QJcgip04IFAfA== | 1 - .../zip-cache/D1gDjuIm9jmjItc_Bp9lTg== | 1 - .../zip-cache/Duh_AuuwZ5gcsaoKsYNsBw== | 1 - .../zip-cache/E7SmDsvfOf0WCHDNrH3ZfA== | 1 - .../zip-cache/EKKCuy1SD5pThDLc8yoNdA== | 1 - .../zip-cache/FDlpn9M8V5hz4xWQL_0XmA== | 1 - .../zip-cache/FdbjyoF_4xBYkZ7nXc_qsw== | 1 - .../zip-cache/FjdGyfNgqGKL6aXeJBNF9A== | 1 - .../zip-cache/Fvj_r61uYbY42swEWiEwDQ== | 1 - .../zip-cache/GgTSilvxmNj4AkG4C6K_cw== | 1 - .../zip-cache/HINUadtEEWkeOypODF9vHQ== | 1 - .../zip-cache/HsopKeCc5kMdP_NNG31nsA== | 1 - .../zip-cache/Hxtj4DLNoXCLiOC+yj0jDw== | 1 - .../zip-cache/Jv6OC95DQj_AgQA64MqTAw== | 1 - .../zip-cache/JzmS+R1pxHu1oJQXclrYZQ== | 1 - .../zip-cache/L4Luo9HnFohFOajLHnsStg== | 1 - .../zip-cache/L7TB2XjugZCsdlIMkzGgjA== | 1 - .../zip-cache/MEGCqnlKnUoADFjWvtPgxQ== | 1 - .../zip-cache/My+IYklIwkshxc+vRmiUIw== | 1 - .../zip-cache/N0U5ZPSG8dOi1elJ7zGkeQ== | 1 - .../zip-cache/NCm7N42F59ASMA59xJv1ZA== | 1 - .../zip-cache/QRuCOoa6+r+LPGBRu+Uz6A== | 1 - .../zip-cache/RPj6Lyopeb0I99FVPg0O_w== | 1 - .../zip-cache/Rs29P0GGFqL8DLCTtF9+AA== | 1 - .../zip-cache/U7lXrl5kvBoIk8Py8MRAdg== | 1 - .../zip-cache/UOQNKmM_RUNX7rJZ1VzSBQ== | 1 - .../zip-cache/Ucc1bXabOlX8MsQzBdSdig== | 1 - .../zip-cache/VLT_N6lAIXz033wEsW_yWA== | 1 - .../zip-cache/W+wChRThZCIK3w5wg5uNfw== | 1 - .../zip-cache/W9TISG5rotdqFbJR86SSSw== | 1 - .../zip-cache/WWxjb63L+BXIsySOyq6uWw== | 1 - .../zip-cache/WgMWroCTxpO85d5ZkMg7sA== | 1 - .../zip-cache/__gYvVwn4qsh4bNDl8jigA== | 1 - .../zip-cache/bCu4_olagul9IvdEftT5Dw== | 1 - .../zip-cache/bbwTa2IH77p1gy3nbSdGbA== | 1 - .../zip-cache/cTwnWnP21oXaeXzUIUQRJQ== | 1 - .../zip-cache/ca9QQ4ztjQAgRpuKIKiqrw== | 1 - .../zip-cache/caMrDiRsJ0M3PhnmIeqMpA== | 1 - .../zip-cache/dt0vt9Ri1n5kE17h5ARkCQ== | 1 - .../zip-cache/ehurfxj8tR9tLVfIs852Bw== | 1 - .../zip-cache/gKbXc2zguZbK9cFPstIoVQ== | 1 - .../zip-cache/hSIvbeFkzs1PKVssKUggaA== | 1 - .../zip-cache/hcnV14_BF9o+Arxs0eOcNA== | 1 - .../zip-cache/iqAdOjnMnpBeQO9akOBK9Q== | 1 - .../zip-cache/j2RHf79cqotl20ox1n8qKA== | 1 - .../zip-cache/j6aQ1JjgZtrqRNGKS6tYFw== | 1 - .../zip-cache/jHnc2B5MemLh9IK8GekyVQ== | 1 - .../zip-cache/jY9zWflZJxY8ljBNFPYV+Q== | 1 - .../zip-cache/jn6BX36w_sciRYBezajEUA== | 1 - .../zip-cache/k2s4Fp5rgGhiqDja_K4MTg== | 1 - .../zip-cache/kv+3esGtzPYsFyzY4VKHgg== | 1 - .../zip-cache/lBlymB+CqFxMOH8LoPSnkg== | 1 - .../zip-cache/mSwvlVygSKHKLPT7gW3vDQ== | 1 - .../zip-cache/obpGKXz19gC5Nvq9_v12yw== | 1 - .../zip-cache/omt_YdA5XejmfYfoQw9Ifw== | 1 - .../zip-cache/pGE47Cv7zuTGaznjSB81+g== | 1 - .../zip-cache/pS1zZCLhi4NlVBqeSUALaw== | 1 - .../zip-cache/pmVVIKap8SXAD+hXhJ3i4A== | 1 - .../zip-cache/qZRtOejJe5eV8qSudzrM6g== | 1 - .../zip-cache/sH01Py4NY1V4bEiCb4taBw== | 1 - .../zip-cache/tUm9UMgntzIO_U8hS4VuqQ== | 1 - .../zip-cache/tZXQNTIO92Db2KPpLfzjRg== | 1 - .../zip-cache/tmTKuPMA16GLPCawhPKzag== | 1 - .../zip-cache/u+Cuma2prVBnDO356+crCw== | 1 - .../zip-cache/v8rcQiIzI9QvMAG1M5or_w== | 1 - .../zip-cache/vXUbG9uYu28wsaRxOASGYQ== | 1 - .../zip-cache/vfJdc9xtcO3tCS5asugITw== | 1 - .../zip-cache/vtKyk6VpqTRiGqQJA6Cd0w== | 1 - .../zip-cache/wSTpZSdkyVCQbeJcCcm3Uw== | 1 - .../zip-cache/ybBIqwm30763z9AjVUcBGA== | 1 - .../zip-cache/zp6cs20tf3O6ti11azf7cA== | 1 - .../zip-cache/zuA+Qd8PZaS_g5SZN+2q0Q== | 1 - .../compile-file-map.properties | 82 +- .../debug/mergeDebugResources/merger.xml | 1790 ++++---- .../compile-file-map.properties | 70 +- .../debug/packageDebugResources/merger.xml | 6 +- .../incremental/mergeDebugAssets/merger.xml | 2 +- .../mergeDebugJniLibFolders/merger.xml | 2 +- .../incremental/mergeDebugShaders/merger.xml | 2 +- .../tmp/debug/dex-renamer-state.txt | 12 +- .../tmp/debug/zip-cache/androidResources | 2 +- .../linked-resources-binary-format-debug.ap_ | Bin 2316605 -> 2316597 bytes .../output-metadata.json | 4 +- .../manifest-merger-blame-debug-report.txt | 160 +- .../debug/mergeDebugJavaResource/base.jar | Bin 396897 -> 396897 bytes .../AndroidManifest.xml | 4 +- .../processDebugManifest/AndroidManifest.xml | 4 +- .../processDebugManifest/output-metadata.json | 4 +- .../mergeDebugResources/raw_info.json.flat | Bin 2476 -> 2464 bytes .../out/multi-v2/mergeDebugResources.json | 3946 ++++++++--------- .../out/multi-v2/values-af.json | 38 +- .../out/multi-v2/values-am.json | 42 +- .../out/multi-v2/values-ar.json | 38 +- .../out/multi-v2/values-as.json | 46 +- .../out/multi-v2/values-az.json | 38 +- .../out/multi-v2/values-b+es+419.json | 2 +- .../out/multi-v2/values-b+sr+Latn.json | 38 +- .../out/multi-v2/values-be.json | 38 +- .../out/multi-v2/values-bg.json | 46 +- .../out/multi-v2/values-bn.json | 38 +- .../out/multi-v2/values-bs.json | 38 +- .../out/multi-v2/values-ca.json | 38 +- .../out/multi-v2/values-cs.json | 38 +- .../out/multi-v2/values-da.json | 38 +- .../out/multi-v2/values-de.json | 46 +- .../out/multi-v2/values-el.json | 38 +- .../out/multi-v2/values-en-rAU.json | 36 +- .../out/multi-v2/values-en-rCA.json | 4 +- .../out/multi-v2/values-en-rGB.json | 46 +- .../out/multi-v2/values-en-rIN.json | 36 +- .../out/multi-v2/values-en-rXC.json | 36 +- .../out/multi-v2/values-es-rUS.json | 38 +- .../out/multi-v2/values-es.json | 50 +- .../out/multi-v2/values-et.json | 38 +- .../out/multi-v2/values-eu.json | 6 +- .../out/multi-v2/values-fa.json | 38 +- .../out/multi-v2/values-fi.json | 70 +- .../out/multi-v2/values-fr-rCA.json | 38 +- .../out/multi-v2/values-fr.json | 38 +- .../out/multi-v2/values-gl.json | 50 +- .../out/multi-v2/values-gu.json | 38 +- .../out/multi-v2/values-h320dp-port-v13.json | 2 +- .../out/multi-v2/values-h360dp-land-v13.json | 2 +- .../out/multi-v2/values-h480dp-land-v13.json | 2 +- .../out/multi-v2/values-h480dp-v13.json | 2 +- .../out/multi-v2/values-h550dp-port-v13.json | 2 +- .../out/multi-v2/values-h720dp-v13.json | 2 +- .../out/multi-v2/values-hdpi-v4.json | 2 +- .../out/multi-v2/values-hi.json | 38 +- .../out/multi-v2/values-hr.json | 38 +- .../out/multi-v2/values-hu.json | 46 +- .../out/multi-v2/values-hy.json | 38 +- .../out/multi-v2/values-in.json | 46 +- .../out/multi-v2/values-is.json | 46 +- .../out/multi-v2/values-it.json | 38 +- .../out/multi-v2/values-iw.json | 38 +- .../out/multi-v2/values-ja.json | 38 +- .../out/multi-v2/values-ka.json | 46 +- .../out/multi-v2/values-kk.json | 38 +- .../out/multi-v2/values-km.json | 38 +- .../out/multi-v2/values-kn.json | 38 +- .../out/multi-v2/values-ko.json | 6 +- .../out/multi-v2/values-ky.json | 38 +- .../out/multi-v2/values-land.json | 22 +- .../out/multi-v2/values-large-v4.json | 4 +- .../out/multi-v2/values-ldltr-v21.json | 2 +- .../out/multi-v2/values-ldrtl-v17.json | 2 +- .../out/multi-v2/values-lo.json | 6 +- .../out/multi-v2/values-lt.json | 6 +- .../out/multi-v2/values-lv.json | 6 +- .../out/multi-v2/values-mk.json | 38 +- .../out/multi-v2/values-ml.json | 38 +- .../out/multi-v2/values-mn.json | 38 +- .../out/multi-v2/values-mr.json | 46 +- .../out/multi-v2/values-ms.json | 38 +- .../out/multi-v2/values-my.json | 38 +- .../out/multi-v2/values-nb.json | 38 +- .../out/multi-v2/values-ne.json | 38 +- .../out/multi-v2/values-night-v8.json | 42 +- .../out/multi-v2/values-nl.json | 38 +- .../out/multi-v2/values-or.json | 70 +- .../out/multi-v2/values-pa.json | 46 +- .../out/multi-v2/values-pl.json | 38 +- .../out/multi-v2/values-port.json | 2 +- .../out/multi-v2/values-pt-rBR.json | 70 +- .../out/multi-v2/values-pt-rPT.json | 38 +- .../out/multi-v2/values-pt.json | 36 +- .../out/multi-v2/values-ro.json | 38 +- .../out/multi-v2/values-ru.json | 38 +- .../out/multi-v2/values-si.json | 38 +- .../out/multi-v2/values-sk.json | 42 +- .../out/multi-v2/values-sl.json | 46 +- .../out/multi-v2/values-sq.json | 6 +- .../out/multi-v2/values-sr.json | 38 +- .../out/multi-v2/values-sv.json | 6 +- .../out/multi-v2/values-sw.json | 38 +- .../out/multi-v2/values-sw600dp-v13.json | 4 +- .../out/multi-v2/values-ta.json | 38 +- .../out/multi-v2/values-te.json | 38 +- .../out/multi-v2/values-th.json | 38 +- .../out/multi-v2/values-tl.json | 38 +- .../out/multi-v2/values-tr.json | 6 +- .../out/multi-v2/values-uk.json | 6 +- .../out/multi-v2/values-ur.json | 46 +- .../out/multi-v2/values-uz.json | 38 +- .../out/multi-v2/values-v16.json | 2 +- .../out/multi-v2/values-v17.json | 2 +- .../out/multi-v2/values-v18.json | 2 +- .../out/multi-v2/values-v21.json | 42 +- .../out/multi-v2/values-v22.json | 2 +- .../out/multi-v2/values-v23.json | 26 +- .../out/multi-v2/values-v24.json | 4 +- .../out/multi-v2/values-v25.json | 2 +- .../out/multi-v2/values-v26.json | 2 +- .../out/multi-v2/values-v28.json | 40 +- .../out/multi-v2/values-v31.json | 2 +- .../out/multi-v2/values-v34.json | 2 +- .../out/multi-v2/values-v35.json | 2 +- .../out/multi-v2/values-vi.json | 38 +- .../out/multi-v2/values-w320dp-land-v13.json | 2 +- .../out/multi-v2/values-w360dp-port-v13.json | 2 +- .../out/multi-v2/values-w400dp-port-v13.json | 2 +- .../out/multi-v2/values-w600dp-land-v13.json | 2 +- .../out/multi-v2/values-watch-v20.json | 2 +- .../out/multi-v2/values-watch-v21.json | 2 +- .../out/multi-v2/values-xlarge-v4.json | 2 +- .../out/multi-v2/values-zh-rCN.json | 38 +- .../out/multi-v2/values-zh-rHK.json | 38 +- .../out/multi-v2/values-zh-rTW.json | 38 +- .../out/multi-v2/values-zu.json | 38 +- .../out/multi-v2/values.json | 584 +-- .../AndroidManifest.xml | 4 +- .../output-metadata.json | 4 +- .../com/example/scoutingapp/MainActivity.dex | Bin 11420 -> 11420 bytes .../example/scoutingapp/OfflineActivity.dex | Bin 5924 -> 5928 bytes .../example/scoutingapp/SettingsActivity.dex | Bin 5016 -> 5016 bytes .../example/scoutingapp/startingActivity.dex | Bin 6332 -> 6332 bytes ...71eb9c28eaf3930b3584f1854c31b11200c4_0.jar | Bin 7474 -> 4021 bytes ...71eb9c28eaf3930b3584f1854c31b11200c4_1.jar | Bin 4476 -> 4196 bytes ...71eb9c28eaf3930b3584f1854c31b11200c4_2.jar | Bin 4920 -> 20860 bytes ...71eb9c28eaf3930b3584f1854c31b11200c4_3.jar | Bin 26907 -> 5992 bytes ...71eb9c28eaf3930b3584f1854c31b11200c4_4.jar | Bin 23030 -> 5772 bytes ...71eb9c28eaf3930b3584f1854c31b11200c4_5.jar | Bin 70107 -> 24867 bytes .../debug/mapDebugSourceSetPaths/file-map.txt | 80 +- .../logs/manifest-merger-debug-report.txt | 498 +-- .../previous-compilation-data.bin | Bin 97529 -> 97529 bytes .../reports/problems/problems-report.html | 2 +- ScoutingApp/local.properties | 3 +- 278 files changed, 5522 insertions(+), 5407 deletions(-) create mode 100644 Generator/app/src/main/java/com/example/generator/EventsActivity.java create mode 100644 Generator/app/src/main/res/layout/activity_events.xml delete mode 100644 ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_7788ef5d66958042d5c7e828929e3d1c3be6f3038432ef6d164c69454a89bae1_bucket_0/graph.bin delete mode 100644 ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_7788ef5d66958042d5c7e828929e3d1c3be6f3038432ef6d164c69454a89bae1_bucket_1/graph.bin delete mode 100644 ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_7788ef5d66958042d5c7e828929e3d1c3be6f3038432ef6d164c69454a89bae1_bucket_2/graph.bin delete mode 100644 ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_7788ef5d66958042d5c7e828929e3d1c3be6f3038432ef6d164c69454a89bae1_bucket_3/graph.bin delete mode 100644 ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_7788ef5d66958042d5c7e828929e3d1c3be6f3038432ef6d164c69454a89bae1_bucket_4/graph.bin delete mode 100644 ScoutingApp/app/build/intermediates/desugar_graph/debug/dexBuilderDebug/out/currentProject/jar_7788ef5d66958042d5c7e828929e3d1c3be6f3038432ef6d164c69454a89bae1_bucket_5/graph.bin delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+T+QRZozBkiB4OjRLKLRTQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/+lkwdp134C1aG2xR6jr+8Q== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/0mAMALUedgdz3ym6a_Hp0A== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3bHdR_6yScclKZUgSwSQYQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/3rP+xYiIlgHz7rXKEs6loA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4FngolG2mmwFMjqJNJ9+hg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/4ruDCP_2uCQ5at1szVEVEA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5NIQSnfs1im5jn2bNtubyQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5RDb5Ny0nwCHP6AZge9R5Q== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/5hsp3OZBT4Z1B6yLi471kw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/67gflX1vrxajjRdbRMPv5w== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/7kFg10bAdr5U55KEy1iyCw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/9JVmsupDFiu6WlDKwxBnNg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/BT_+1czMPGt6_1ezOg01GQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Br+_sVYw0InuCaDy6VqYSg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/CVGzKojX8QJcgip04IFAfA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/D1gDjuIm9jmjItc_Bp9lTg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Duh_AuuwZ5gcsaoKsYNsBw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/E7SmDsvfOf0WCHDNrH3ZfA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/EKKCuy1SD5pThDLc8yoNdA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FDlpn9M8V5hz4xWQL_0XmA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FdbjyoF_4xBYkZ7nXc_qsw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/FjdGyfNgqGKL6aXeJBNF9A== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Fvj_r61uYbY42swEWiEwDQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/GgTSilvxmNj4AkG4C6K_cw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HINUadtEEWkeOypODF9vHQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/HsopKeCc5kMdP_NNG31nsA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Hxtj4DLNoXCLiOC+yj0jDw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Jv6OC95DQj_AgQA64MqTAw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/JzmS+R1pxHu1oJQXclrYZQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L4Luo9HnFohFOajLHnsStg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/L7TB2XjugZCsdlIMkzGgjA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/MEGCqnlKnUoADFjWvtPgxQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/My+IYklIwkshxc+vRmiUIw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/N0U5ZPSG8dOi1elJ7zGkeQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/NCm7N42F59ASMA59xJv1ZA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/QRuCOoa6+r+LPGBRu+Uz6A== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/RPj6Lyopeb0I99FVPg0O_w== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Rs29P0GGFqL8DLCTtF9+AA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/U7lXrl5kvBoIk8Py8MRAdg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/UOQNKmM_RUNX7rJZ1VzSBQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/Ucc1bXabOlX8MsQzBdSdig== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/VLT_N6lAIXz033wEsW_yWA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/W+wChRThZCIK3w5wg5uNfw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/W9TISG5rotdqFbJR86SSSw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WWxjb63L+BXIsySOyq6uWw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/WgMWroCTxpO85d5ZkMg7sA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/__gYvVwn4qsh4bNDl8jigA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bCu4_olagul9IvdEftT5Dw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/bbwTa2IH77p1gy3nbSdGbA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/cTwnWnP21oXaeXzUIUQRJQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ca9QQ4ztjQAgRpuKIKiqrw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/caMrDiRsJ0M3PhnmIeqMpA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/dt0vt9Ri1n5kE17h5ARkCQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ehurfxj8tR9tLVfIs852Bw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/gKbXc2zguZbK9cFPstIoVQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hSIvbeFkzs1PKVssKUggaA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/hcnV14_BF9o+Arxs0eOcNA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/iqAdOjnMnpBeQO9akOBK9Q== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j2RHf79cqotl20ox1n8qKA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/j6aQ1JjgZtrqRNGKS6tYFw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jHnc2B5MemLh9IK8GekyVQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jY9zWflZJxY8ljBNFPYV+Q== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/jn6BX36w_sciRYBezajEUA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/k2s4Fp5rgGhiqDja_K4MTg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/kv+3esGtzPYsFyzY4VKHgg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/lBlymB+CqFxMOH8LoPSnkg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/mSwvlVygSKHKLPT7gW3vDQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/obpGKXz19gC5Nvq9_v12yw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/omt_YdA5XejmfYfoQw9Ifw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pGE47Cv7zuTGaznjSB81+g== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pS1zZCLhi4NlVBqeSUALaw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/pmVVIKap8SXAD+hXhJ3i4A== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/qZRtOejJe5eV8qSudzrM6g== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/sH01Py4NY1V4bEiCb4taBw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tUm9UMgntzIO_U8hS4VuqQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tZXQNTIO92Db2KPpLfzjRg== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/tmTKuPMA16GLPCawhPKzag== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/u+Cuma2prVBnDO356+crCw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/v8rcQiIzI9QvMAG1M5or_w== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vXUbG9uYu28wsaRxOASGYQ== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vfJdc9xtcO3tCS5asugITw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/vtKyk6VpqTRiGqQJA6Cd0w== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/wSTpZSdkyVCQbeJcCcm3Uw== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/ybBIqwm30763z9AjVUcBGA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zp6cs20tf3O6ti11azf7cA== delete mode 100644 ScoutingApp/app/build/intermediates/incremental/debug-mergeJavaRes/zip-cache/zuA+Qd8PZaS_g5SZN+2q0Q== diff --git a/Generator/app/build.gradle.kts b/Generator/app/build.gradle.kts index 2209bcf..013b1b0 100644 --- a/Generator/app/build.gradle.kts +++ b/Generator/app/build.gradle.kts @@ -41,6 +41,7 @@ android { } dependencies { + implementation(libs.activity.ktx) implementation(libs.appcompat) implementation(libs.material) implementation(libs.activity) diff --git a/Generator/app/src/main/AndroidManifest.xml b/Generator/app/src/main/AndroidManifest.xml index f82b5e0..88d560e 100644 --- a/Generator/app/src/main/AndroidManifest.xml +++ b/Generator/app/src/main/AndroidManifest.xml @@ -33,6 +33,10 @@ + \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/ColorActivity.java b/Generator/app/src/main/java/com/example/generator/ColorActivity.java index 5c8106a..a3eb4a0 100644 --- a/Generator/app/src/main/java/com/example/generator/ColorActivity.java +++ b/Generator/app/src/main/java/com/example/generator/ColorActivity.java @@ -45,7 +45,7 @@ public class ColorActivity extends AppCompatActivity { Button backButton = (Button) findViewById(R.id.button_back); Button nextButton = (Button) findViewById(R.id.button_next); backButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, MainActivity.class); + Intent intent = new Intent(this, EventsActivity.class); startActivity(intent); }); nextButton.setOnClickListener((v) -> { diff --git a/Generator/app/src/main/java/com/example/generator/EventsActivity.java b/Generator/app/src/main/java/com/example/generator/EventsActivity.java new file mode 100644 index 0000000..685d111 --- /dev/null +++ b/Generator/app/src/main/java/com/example/generator/EventsActivity.java @@ -0,0 +1,37 @@ +package com.example.generator; + +import android.content.Intent; +import android.os.Bundle; +import android.widget.Button; + +import androidx.activity.EdgeToEdge; +import androidx.appcompat.app.AppCompatActivity; +import androidx.core.graphics.Insets; +import androidx.core.view.ViewCompat; +import androidx.core.view.WindowInsetsCompat; + +public class EventsActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + EdgeToEdge.enable(this); + setContentView(R.layout.activity_events); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { + Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); + v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); + return insets; + }); + + Button backButton = (Button) findViewById(R.id.button_back); + Button nextButton = (Button) findViewById(R.id.button_next); + backButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + }); + nextButton.setOnClickListener((v) -> { + Intent intent = new Intent(this, ColorActivity.class); + startActivity(intent); + }); + } +} \ No newline at end of file diff --git a/Generator/app/src/main/java/com/example/generator/MainActivity.java b/Generator/app/src/main/java/com/example/generator/MainActivity.java index 2deb20a..2dd91c1 100644 --- a/Generator/app/src/main/java/com/example/generator/MainActivity.java +++ b/Generator/app/src/main/java/com/example/generator/MainActivity.java @@ -24,7 +24,7 @@ public class MainActivity extends AppCompatActivity { }); Button makeButton = (Button) findViewById(R.id.button_next); makeButton.setOnClickListener((v) -> { - Intent intent = new Intent(this, ColorActivity.class); + Intent intent = new Intent(this, EventsActivity.class); startActivity(intent); }); } diff --git a/Generator/app/src/main/res/layout/activity_events.xml b/Generator/app/src/main/res/layout/activity_events.xml new file mode 100644 index 0000000..44b7180 --- /dev/null +++ b/Generator/app/src/main/res/layout/activity_events.xml @@ -0,0 +1,37 @@ + + + + +