This commit is contained in:
pro.boooooo 2023-03-31 05:11:52 +02:00
parent 9aba32a381
commit 06a93d373f
59 changed files with 1306 additions and 1184 deletions

BIN
app.zip Normal file

Binary file not shown.

Binary file not shown.

View File

@ -16,27 +16,55 @@
<change beforePath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/fileHashes/fileHashes.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/7.5/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/fileHashes/resourceHashesCache.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/7.5/fileHashes/resourceHashesCache.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/7.5/fileHashes/resourceHashesCache.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.gradle/file-system.probe" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/file-system.probe" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/apk/debug/app-debug.apk" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/apk/debug/app-debug.apk" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/apk/debug/app-debug.apk" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/compile_and_runtime_not_namespaced_r_class_jar/debug/R.jar" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex/debug/mergeDexDebug/classes.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/dex_archive_input_jar_hashes/debug/out" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug/mergeDebugResources/compile-file-map.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/debug/packageDebugResources/compile-file-map.properties" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Events/MenuEvent.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Events/MenuEvent.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Events/TrayColorEvent.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Events/TrayColorEvent.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Game/Checker.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Game/Checker.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/GameRobot.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/GameRobot.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Geometrics/Circle.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Geometrics/Circle.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/JMController.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/JMController.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/JMModel.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/JMModel.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/JMView.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/JMView.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/MainActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/MainActivity.class" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/MainActivity.class" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/MainActivity.class" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/javac/debug/classes/com/example/tamere/Menu.class" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/local_only_symbol_list/debug/R-def.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/local_only_symbol_list/debug/R-def.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res_blame_folder/debug/out/single/debug.json" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_game.xml.flat" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/merged_res/debug/layout_game.xml.flat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/packaged_res/debug/layout/game.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/packaged_res/debug/layout/game.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/processed_res/debug/out/resources-debug.ap_" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Events/MenuEvent.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Events/MenuEvent.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Events/TrayColorEvent.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Events/TrayColorEvent.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Game/Checker.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Game/Checker.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/GameRobot.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/GameRobot.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Geometrics/Circle.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Geometrics/Circle.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/JMController.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/JMController.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/JMModel.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/JMModel.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/JMView.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/JMView.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/MainActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/MainActivity.dex" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/MainActivity.dex" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/MainActivity.dex" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/com/example/tamere/Menu.dex" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e596d408e86c0620b9980fcbcefbefa5d49fa391abac029dae188d2ac3339585_0.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e596d408e86c0620b9980fcbcefbefa5d49fa391abac029dae188d2ac3339585_1.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/project_dex_archive/debug/out/e596d408e86c0620b9980fcbcefbefa5d49fa391abac029dae188d2ac3339585_2.jar" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/runtime_symbol_list/debug/R.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/stable_resource_ids_file/debug/stableIds.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/intermediates/symbol_list_with_package_name/debug/package-aware-r.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" beforeDir="false" afterPath="$PROJECT_DIR$/app/build/tmp/compileDebugJavaWithJavac/previous-compilation-data.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/AndroidManifest.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Events/MenuEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Events/MenuEvent.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Events/MenuEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Events/MenuEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Events/TrayColorEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Events/TrayColorEvent.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Game/Checker.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Game/Checker.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/GameRobot.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/GameRobot.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/GameRobot.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/GameRobot.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/MainActivity.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/MainActivity.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Geometrics/Circle.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Geometrics/Circle.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Menu.java" beforeDir="false" /> <change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/JMController.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/JMController.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/JMModel.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/JMModel.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/JMView.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/JMView.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/res/layout/game.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/game.xml" afterDir="false" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@ -1,12 +1,12 @@
#Mon Mar 27 22:50:58 CEST 2023 #Thu Mar 30 03:29:38 CEST 2023
com.example.tamere.app-pngs-24\:/drawable-xhdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_launcher_background.png.flat
com.example.tamere.app-main-31\:/mipmap-anydpi-v33/ic_launcher.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-anydpi-v33_ic_launcher.xml.flat com.example.tamere.app-main-31\:/mipmap-anydpi-v33/ic_launcher.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-anydpi-v33_ic_launcher.xml.flat
com.example.tamere.app-pngs-24\:/drawable-xhdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-xhdpi_ic_launcher_background.png.flat
com.example.tamere.app-pngs-24\:/drawable-hdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher_background.png.flat com.example.tamere.app-pngs-24\:/drawable-hdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-hdpi_ic_launcher_background.png.flat
com.example.tamere.app-main-31\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-anydpi-v26_ic_launcher_round.xml.flat com.example.tamere.app-main-31\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-anydpi-v26_ic_launcher_round.xml.flat
com.example.tamere.app-main-31\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher_round.webp.flat com.example.tamere.app-main-31\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher_round.webp.flat
com.example.tamere.app-main-31\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-anydpi-v26_ic_launcher.xml.flat com.example.tamere.app-main-31\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-anydpi-v26_ic_launcher.xml.flat
com.example.tamere.app-main-31\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.webp.flat
com.example.tamere.app-main-31\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher_round.webp.flat com.example.tamere.app-main-31\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher_round.webp.flat
com.example.tamere.app-main-31\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher.webp.flat
com.example.tamere.app-main-31\:/xml/backup_rules.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_backup_rules.xml.flat com.example.tamere.app-main-31\:/xml/backup_rules.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_backup_rules.xml.flat
com.example.tamere.app-main-31\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.webp.flat com.example.tamere.app-main-31\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.webp.flat
com.example.tamere.app-main-31\:/layout/game.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_game.xml.flat com.example.tamere.app-main-31\:/layout/game.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_game.xml.flat

View File

@ -1,4 +1,4 @@
#Mon Mar 27 22:50:58 CEST 2023 #Thu Mar 30 03:29:38 CEST 2023
com.example.tamere.app-main-6\:/layout/activity_main.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\activity_main.xml com.example.tamere.app-main-6\:/layout/activity_main.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\layout\\activity_main.xml
com.example.tamere.app-main-6\:/xml/backup_rules.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\xml\\backup_rules.xml com.example.tamere.app-main-6\:/xml/backup_rules.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\xml\\backup_rules.xml
com.example.tamere.app-main-6\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v26\\ic_launcher.xml com.example.tamere.app-main-6\:/mipmap-anydpi-v26/ic_launcher.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v26\\ic_launcher.xml

View File

@ -1,4 +1,4 @@
#Mon Mar 27 22:50:59 CEST 2023 #Thu Mar 30 04:12:05 CEST 2023
base.0=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex base.0=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
renamed.0=classes.dex renamed.0=classes.dex
path.0=classes.dex path.0=classes.dex

View File

@ -13,9 +13,11 @@ drawable ic_launcher_foreground
id colorsChooser id colorsChooser
id counter id counter
id jcjselect id jcjselect
id reset
id robotselect id robotselect
id rules id rules
id trayColors id trayColors
id validate
layout game layout game
layout menu layout menu
mipmap ic_launcher mipmap ic_launcher

View File

@ -13,14 +13,20 @@
android:orientation="horizontal" android:orientation="horizontal"
> >
<TableLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
android:layout_weight="1" android:layout_weight="1"
>
<TableLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:id="@+id/trayColors" android:id="@+id/trayColors"
> >
</TableLayout> </TableLayout>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_weight="2" android:layout_weight="2"
@ -38,5 +44,19 @@
android:gravity="center" android:gravity="center"
android:text="Tentatives rest. \n 10" android:text="Tentatives rest. \n 10"
/> />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Valider"
android:id="@+id/validate"
/>
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Effacer"
android:id="@+id/reset"
/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

File diff suppressed because it is too large Load Diff

View File

@ -3148,6 +3148,7 @@ id progress_horizontal
id radio id radio
id ratio id ratio
id rectangles id rectangles
id reset
id reverseSawtooth id reverseSawtooth
id right id right
id rightToLeft id rightToLeft
@ -3284,6 +3285,7 @@ id uniform
id unlabeled id unlabeled
id up id up
id useLogo id useLogo
id validate
id vertical_only id vertical_only
id view_offset_helper id view_offset_helper
id view_transition id view_transition

Some files were not shown because too many files have changed in this diff Show More