$
This commit is contained in:
pro.boooooo
parent
a7ccc42e5c
commit
f6e4552f30
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -7,11 +7,11 @@
|
||||
<deviceKey>
|
||||
<Key>
|
||||
<type value="VIRTUAL_DEVICE_PATH" />
|
||||
<value value="C:\Users\probo\.android\avd\3.7_FWVGA_slider_API_33.avd" />
|
||||
<value value="C:\Users\probo\.android\avd\Test.avd" />
|
||||
</Key>
|
||||
</deviceKey>
|
||||
</Target>
|
||||
</targetSelectedWithDropDown>
|
||||
<timeTargetWasSelectedWithDropDown value="2023-03-23T21:35:59.383997800Z" />
|
||||
<timeTargetWasSelectedWithDropDown value="2023-03-24T00:14:09.288218700Z" />
|
||||
</component>
|
||||
</project>
|
||||
@ -11,17 +11,23 @@
|
||||
<component name="ChangeListManager">
|
||||
<list default="true" id="82f4db7b-b08f-41cd-bd6f-7811a6f46e99" name="Changes" comment="">
|
||||
<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$/.idea/deploymentTargetDropDown.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deploymentTargetDropDown.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/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/src/main/java/com/example/tamere/Events/SelectionColorEvent.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/tamere/Events/SelectionColorEvent.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/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/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/res/layout/activity_main.xml" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/res/layout/activity_main.xml" afterDir="false" />
|
||||
</list>
|
||||
<option name="SHOW_DIALOG" value="false" />
|
||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||
</component>
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\probo\.android\avd\3.7_FWVGA_slider_API_33.avd]" />
|
||||
<component name="ExecutionTargetManager" SELECTED_TARGET="device_and_snapshot_combo_box_target[C:\Users\probo\.android\avd\Test.avd]" />
|
||||
<component name="ExternalProjectsData">
|
||||
<projectState path="$PROJECT_DIR$">
|
||||
<ProjectState />
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -1,25 +1,25 @@
|
||||
#Thu Mar 23 01:13:25 CET 2023
|
||||
com.example.tamere.app-pngs-24\:/drawable-xhdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\tamere\\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\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-anydpi-v33_ic_launcher.xml.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-hdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\tamere\\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\\tamere\\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\\tamere\\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\\tamere\\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\\tamere\\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\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-hdpi_ic_launcher_round.webp.flat
|
||||
com.example.tamere.app-main-31\:/xml/backup_rules.xml=C\:\\Users\\probo\\Desktop\\tamere\\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\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher.webp.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-ldpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_launcher_background.png.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher.webp.flat
|
||||
com.example.tamere.app-main-31\:/layout/activity_main.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_main.xml.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-anydpi-v24/ic_launcher_foreground.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v24_ic_launcher_foreground.xml.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-xxhdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_launcher_background.png.flat
|
||||
com.example.tamere.app-main-31\:/xml/data_extraction_rules.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\xml_data_extraction_rules.xml.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher_round.webp.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher_round.webp.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-mdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_launcher_background.png.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher.webp.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-xxxhdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_launcher_background.png.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher.webp.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher_round.webp.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-anydpi-v21/ic_launcher_background.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v21_ic_launcher_background.xml.flat
|
||||
#Fri Mar 24 01:55:01 CET 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-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-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-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\:/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-pngs-24\:/drawable-ldpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-ldpi_ic_launcher_background.png.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher.webp.flat
|
||||
com.example.tamere.app-main-31\:/layout/activity_main.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\layout_activity_main.xml.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-anydpi-v24/ic_launcher_foreground.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v24_ic_launcher_foreground.xml.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-xxhdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxhdpi_ic_launcher_background.png.flat
|
||||
com.example.tamere.app-main-31\:/xml/data_extraction_rules.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\xml_data_extraction_rules.xml.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxxhdpi_ic_launcher_round.webp.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-mdpi_ic_launcher_round.webp.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-mdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-mdpi_ic_launcher_background.png.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xhdpi_ic_launcher.webp.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-xxxhdpi/ic_launcher_background.png=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-xxxhdpi_ic_launcher_background.png.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher.webp.flat
|
||||
com.example.tamere.app-main-31\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\mipmap-xxhdpi_ic_launcher_round.webp.flat
|
||||
com.example.tamere.app-pngs-24\:/drawable-anydpi-v21/ic_launcher_background.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\merged_res\\debug\\drawable-anydpi-v21_ic_launcher_background.xml.flat
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,19 +1,19 @@
|
||||
#Thu Mar 23 01:13:25 CET 2023
|
||||
com.example.tamere.app-main-6\:/layout/activity_main.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\layout\\activity_main.xml
|
||||
com.example.tamere.app-main-6\:/xml/backup_rules.xml=C\:\\Users\\probo\\Desktop\\tamere\\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\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v26\\ic_launcher.xml
|
||||
com.example.tamere.app-main-6\:/xml/data_extraction_rules.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\xml\\data_extraction_rules.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_launcher.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-mdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/drawable-v24/ic_launcher_foreground.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\drawable-v24\\ic_launcher_foreground.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/drawable/ic_launcher_background.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\ic_launcher_background.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-mdpi-v4\\ic_launcher.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-anydpi-v33/ic_launcher.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v33\\ic_launcher.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xxxhdpi-v4\\ic_launcher.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xxxhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\ic_launcher.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v26\\ic_launcher_round.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_launcher.webp
|
||||
#Fri Mar 24 01:55:02 CET 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\:/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\:/xml/data_extraction_rules.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\xml\\data_extraction_rules.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-xhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_launcher.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-hdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-mdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-mdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/drawable-v24/ic_launcher_foreground.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable-v24\\ic_launcher_foreground.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-xxhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-xhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/drawable/ic_launcher_background.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\drawable\\ic_launcher_background.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-mdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-mdpi-v4\\ic_launcher.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-anydpi-v33/ic_launcher.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v33\\ic_launcher.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-xxxhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xxxhdpi-v4\\ic_launcher.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-xxxhdpi/ic_launcher_round.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xxxhdpi-v4\\ic_launcher_round.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-hdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-hdpi-v4\\ic_launcher.webp
|
||||
com.example.tamere.app-main-6\:/mipmap-anydpi-v26/ic_launcher_round.xml=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-anydpi-v26\\ic_launcher_round.xml
|
||||
com.example.tamere.app-main-6\:/mipmap-xxhdpi/ic_launcher.webp=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\packaged_res\\debug\\mipmap-xxhdpi-v4\\ic_launcher.webp
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\tamere\app\src\main\assets"/><source path="C:\Users\probo\Desktop\tamere\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\tamere\app\src\debug\assets"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\assets"/><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\build\intermediates\shader_assets\debug\out"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\debug\assets"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\tamere\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\tamere\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\jniLibs"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\debug\jniLibs"/></dataSet></merger>
|
||||
@ -1,2 +1,2 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\tamere\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\tamere\app\src\debug\shaders"/></dataSet></merger>
|
||||
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\shaders"/></dataSet><dataSet config="debug" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:<dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\debug\shaders"/></dataSet></merger>
|
||||
@ -1,4 +1,4 @@
|
||||
#Thu Mar 23 22:51:14 CET 2023
|
||||
base.0=C\:\\Users\\probo\\Desktop\\tamere\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
#Fri Mar 24 01:55:04 CET 2023
|
||||
base.0=C\:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\build\\intermediates\\dex\\debug\\mergeDexDebug\\classes.dex
|
||||
renamed.0=classes.dex
|
||||
path.0=classes.dex
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@ -10,6 +10,7 @@ color white
|
||||
drawable ic_launcher_background
|
||||
drawable ic_launcher_foreground
|
||||
id colorsChooser
|
||||
id counter
|
||||
id trayColors
|
||||
layout activity_main
|
||||
mipmap ic_launcher
|
||||
|
||||
@ -6,9 +6,9 @@
|
||||
6
|
||||
7 <uses-sdk
|
||||
8 android:minSdkVersion="19"
|
||||
8-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
|
||||
8-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
|
||||
9 android:targetSdkVersion="33" />
|
||||
9-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
|
||||
9-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
|
||||
10
|
||||
11 <permission
|
||||
11-->[androidx.core:core:1.9.0] C:\Users\probo\.gradle\caches\transforms-3\85625968673fb9fd8db34217596f6efd\transformed\core-1.9.0\AndroidManifest.xml:22:5-24:47
|
||||
@ -22,40 +22,40 @@
|
||||
15-->[androidx.core:core:1.9.0] C:\Users\probo\.gradle\caches\transforms-3\85625968673fb9fd8db34217596f6efd\transformed\core-1.9.0\AndroidManifest.xml:26:22-94
|
||||
16
|
||||
17 <application
|
||||
17-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:5:5-23:19
|
||||
17-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:5:5-23:19
|
||||
18 android:allowBackup="true"
|
||||
18-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:6:9-35
|
||||
18-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:6:9-35
|
||||
19 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
|
||||
19-->[androidx.core:core:1.9.0] C:\Users\probo\.gradle\caches\transforms-3\85625968673fb9fd8db34217596f6efd\transformed\core-1.9.0\AndroidManifest.xml:28:18-86
|
||||
20 android:dataExtractionRules="@xml/data_extraction_rules"
|
||||
20-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:7:9-65
|
||||
20-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:7:9-65
|
||||
21 android:debuggable="true"
|
||||
22 android:fullBackupContent="@xml/backup_rules"
|
||||
22-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:8:9-54
|
||||
22-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:8:9-54
|
||||
23 android:icon="@mipmap/ic_launcher"
|
||||
23-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:9:9-43
|
||||
23-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:9:9-43
|
||||
24 android:label="@string/app_name"
|
||||
24-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:10:9-41
|
||||
24-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:10:9-41
|
||||
25 android:supportsRtl="true"
|
||||
25-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:11:9-35
|
||||
25-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:11:9-35
|
||||
26 android:testOnly="true"
|
||||
27 android:theme="@style/Theme.Tamere" >
|
||||
27-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:12:9-44
|
||||
27-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:12:9-44
|
||||
28 <activity
|
||||
28-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:14:9-22:20
|
||||
28-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:14:9-22:20
|
||||
29 android:name="com.example.tamere.MainActivity"
|
||||
29-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:15:13-41
|
||||
29-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:15:13-41
|
||||
30 android:exported="true" >
|
||||
30-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:16:13-36
|
||||
30-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:16:13-36
|
||||
31 <intent-filter>
|
||||
31-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:17:13-21:29
|
||||
31-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:17:13-21:29
|
||||
32 <action android:name="android.intent.action.MAIN" />
|
||||
32-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:18:17-69
|
||||
32-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:18:25-66
|
||||
32-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:18:17-69
|
||||
32-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:18:25-66
|
||||
33
|
||||
34 <category android:name="android.intent.category.LAUNCHER" />
|
||||
34-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:20:17-77
|
||||
34-->C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:20:27-74
|
||||
34-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:20:17-77
|
||||
34-->C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:20:27-74
|
||||
35 </intent-filter>
|
||||
36 </activity>
|
||||
37
|
||||
|
||||
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -21,7 +21,24 @@
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "C:\\Users\\probo\\Desktop\\tamere\\app\\src\\main\\res\\values-night\\themes.xml",
|
||||
"source": "C:\\Users\\probo\\.gradle\\caches\\transforms-3\\8dfa01e26e3a1ce0f11a38ffb7d7a3c4\\transformed\\appcompat-1.6.1\\res\\values-night-v8\\values-night-v8.xml",
|
||||
"from": {
|
||||
"startLines": "2,3,4,5,6,7,8,9",
|
||||
"startColumns": "4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "55,125,209,293,389,491,593,687",
|
||||
"endColumns": "69,83,83,95,101,101,93,88",
|
||||
"endOffsets": "120,204,288,384,486,588,682,771"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "2,3,4,5,6,7,8,47",
|
||||
"startColumns": "4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "100,170,254,338,434,536,638,4091",
|
||||
"endColumns": "69,83,83,95,101,101,93,88",
|
||||
"endOffsets": "165,249,333,429,531,633,727,4175"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "C:\\Users\\probo\\Desktop\\SAE41_2022\\src\\app\\src\\main\\res\\values-night\\themes.xml",
|
||||
"from": {
|
||||
"startLines": "2",
|
||||
"startColumns": "4",
|
||||
@ -38,23 +55,6 @@
|
||||
"endColumns": "12",
|
||||
"endOffsets": "4086"
|
||||
}
|
||||
},
|
||||
{
|
||||
"source": "C:\\Users\\probo\\.gradle\\caches\\transforms-3\\8dfa01e26e3a1ce0f11a38ffb7d7a3c4\\transformed\\appcompat-1.6.1\\res\\values-night-v8\\values-night-v8.xml",
|
||||
"from": {
|
||||
"startLines": "2,3,4,5,6,7,8,9",
|
||||
"startColumns": "4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "55,125,209,293,389,491,593,687",
|
||||
"endColumns": "69,83,83,95,101,101,93,88",
|
||||
"endOffsets": "120,204,288,384,486,588,682,771"
|
||||
},
|
||||
"to": {
|
||||
"startLines": "2,3,4,5,6,7,8,47",
|
||||
"startColumns": "4,4,4,4,4,4,4,4",
|
||||
"startOffsets": "100,170,254,338,434,536,638,4091",
|
||||
"endColumns": "69,83,83,95,101,101,93,88",
|
||||
"endOffsets": "165,249,333,429,531,633,727,4175"
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
@ -7,6 +7,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
tools:context=".MainActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:background="#FFC0CB"
|
||||
android:gravity="center"
|
||||
android:orientation="horizontal"
|
||||
@ -29,5 +30,13 @@
|
||||
android:id="@+id/colorsChooser"
|
||||
android:orientation="vertical"
|
||||
>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/counter"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center"
|
||||
android:text="Tentatives rest. \n 10"
|
||||
/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user