This commit is contained in:
pro.boooooo
2023-03-24 01:58:12 +01:00
parent a7ccc42e5c
commit f6e4552f30
67 changed files with 2787 additions and 2714 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\debug\assets"/></dataSet></merger>

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\debug\jniLibs"/></dataSet></merger>

View File

@@ -1,2 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<merger version="3"><dataSet config="main" ignore_pattern="!.svn:!.git:!.ds_store:!*.scc:.*:&lt;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:.*:&lt;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:.*:&lt;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:.*:&lt;dir>_*:!CVS:!thumbs.db:!picasa.ini:!*~"><source path="C:\Users\probo\Desktop\SAE41_2022\src\app\src\debug\shaders"/></dataSet></merger>

View File

@@ -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

View File

@@ -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

View File

@@ -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

File diff suppressed because one or more lines are too long

View File

@@ -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

View File

@@ -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>

File diff suppressed because it is too large Load Diff

View File

@@ -22,11 +22,11 @@ com.example.tamere.app-lifecycle-runtime-2.5.1-20 C:\Users\probo\.gradle\caches\
com.example.tamere.app-drawerlayout-1.1.1-21 C:\Users\probo\.gradle\caches\transforms-3\f66ae2e3f3030ca408ea17e7c467639b\transformed\drawerlayout-1.1.1\res
com.example.tamere.app-lifecycle-viewmodel-2.5.1-22 C:\Users\probo\.gradle\caches\transforms-3\f94025579e5a4c230bbba5aa7dd1079d\transformed\lifecycle-viewmodel-2.5.1\res
com.example.tamere.app-annotation-experimental-1.3.0-23 C:\Users\probo\.gradle\caches\transforms-3\fd3daf95af5e4e1fd3f3860fc1410040\transformed\annotation-experimental-1.3.0\res
com.example.tamere.app-pngs-24 C:\Users\probo\Desktop\tamere\app\build\generated\res\pngs\debug
com.example.tamere.app-resValues-25 C:\Users\probo\Desktop\tamere\app\build\generated\res\resValues\debug
com.example.tamere.app-rs-26 C:\Users\probo\Desktop\tamere\app\build\generated\res\rs\debug
com.example.tamere.app-packageDebugResources-27 C:\Users\probo\Desktop\tamere\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
com.example.tamere.app-packageDebugResources-28 C:\Users\probo\Desktop\tamere\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
com.example.tamere.app-merged_res-29 C:\Users\probo\Desktop\tamere\app\build\intermediates\merged_res\debug
com.example.tamere.app-debug-30 C:\Users\probo\Desktop\tamere\app\src\debug\res
com.example.tamere.app-main-31 C:\Users\probo\Desktop\tamere\app\src\main\res
com.example.tamere.app-pngs-24 C:\Users\probo\Desktop\SAE41_2022\src\app\build\generated\res\pngs\debug
com.example.tamere.app-resValues-25 C:\Users\probo\Desktop\SAE41_2022\src\app\build\generated\res\resValues\debug
com.example.tamere.app-rs-26 C:\Users\probo\Desktop\SAE41_2022\src\app\build\generated\res\rs\debug
com.example.tamere.app-packageDebugResources-27 C:\Users\probo\Desktop\SAE41_2022\src\app\build\intermediates\incremental\debug\packageDebugResources\merged.dir
com.example.tamere.app-packageDebugResources-28 C:\Users\probo\Desktop\SAE41_2022\src\app\build\intermediates\incremental\debug\packageDebugResources\stripped.dir
com.example.tamere.app-merged_res-29 C:\Users\probo\Desktop\SAE41_2022\src\app\build\intermediates\merged_res\debug
com.example.tamere.app-debug-30 C:\Users\probo\Desktop\SAE41_2022\src\app\src\debug\res
com.example.tamere.app-main-31 C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\res

View File

@@ -2935,6 +2935,7 @@ id contiguous
id continuousVelocity
id coordinator
id cos
id counter
id counterclockwise
id cradle
id currentState

View File

@@ -1,9 +1,9 @@
-- Merging decision tree log ---
manifest
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
MERGED from [com.google.android.material:material:1.8.0] C:\Users\probo\.gradle\caches\transforms-3\4fbcf167c94e837ff1be43cd429a082f\transformed\material-1.8.0\AndroidManifest.xml:17:1-26:12
MERGED from [androidx.constraintlayout:constraintlayout:2.1.4] C:\Users\probo\.gradle\caches\transforms-3\d5cfd9b05f05865cd2d2bad992fdaec7\transformed\constraintlayout-2.1.4\AndroidManifest.xml:2:1-11:12
MERGED from [androidx.appcompat:appcompat-resources:1.6.1] C:\Users\probo\.gradle\caches\transforms-3\cb75003958f24a4c9df8991789c69529\transformed\appcompat-resources-1.6.1\AndroidManifest.xml:17:1-22:12
@@ -44,27 +44,27 @@ MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\probo\.gradle\ca
MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\probo\.gradle\caches\transforms-3\731434dfd3e772425987f9a36caa31ff\transformed\localbroadcastmanager-1.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.print:print:1.0.0] C:\Users\probo\.gradle\caches\transforms-3\40d3d7c3b32b2b3f996b647420cd5534\transformed\print-1.0.0\AndroidManifest.xml:17:1-22:12
MERGED from [androidx.annotation:annotation-experimental:1.3.0] C:\Users\probo\.gradle\caches\transforms-3\fd3daf95af5e4e1fd3f3860fc1410040\transformed\annotation-experimental-1.3.0\AndroidManifest.xml:17:1-22:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
package
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
android:versionName
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
xmlns:tools
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:3:5-51
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:3:5-51
android:versionCode
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:1-25:12
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
xmlns:android
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:2:11-69
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:2:11-69
application
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:5:5-23:19
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:5:5-23:19
MERGED from [com.google.android.material:material:1.8.0] C:\Users\probo\.gradle\caches\transforms-3\4fbcf167c94e837ff1be43cd429a082f\transformed\material-1.8.0\AndroidManifest.xml:24:5-20
MERGED from [com.google.android.material:material:1.8.0] C:\Users\probo\.gradle\caches\transforms-3\4fbcf167c94e837ff1be43cd429a082f\transformed\material-1.8.0\AndroidManifest.xml:24:5-20
MERGED from [androidx.constraintlayout:constraintlayout:2.1.4] C:\Users\probo\.gradle\caches\transforms-3\d5cfd9b05f05865cd2d2bad992fdaec7\transformed\constraintlayout-2.1.4\AndroidManifest.xml:9:5-20
@@ -82,41 +82,41 @@ MERGED from [androidx.versionedparcelable:versionedparcelable:1.1.1] C:\Users\pr
android:appComponentFactory
ADDED from [androidx.core:core:1.9.0] C:\Users\probo\.gradle\caches\transforms-3\85625968673fb9fd8db34217596f6efd\transformed\core-1.9.0\AndroidManifest.xml:28:18-86
android:supportsRtl
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:11:9-35
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:11:9-35
android:label
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:10:9-41
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:10:9-41
android:fullBackupContent
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:8:9-54
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:8:9-54
tools:targetApi
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:13:9-29
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:13:9-29
android:icon
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:9:9-43
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:9:9-43
android:allowBackup
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:6:9-35
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:6:9-35
android:theme
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:12:9-44
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:12:9-44
android:dataExtractionRules
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:7:9-65
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:7:9-65
activity#com.example.tamere.MainActivity
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:14:9-22:20
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:14:9-22:20
android:exported
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:16:13-36
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:16:13-36
android:name
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:15:13-41
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:15:13-41
intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:17:13-21:29
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:17:13-21:29
action#android.intent.action.MAIN
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:18:17-69
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:18:17-69
android:name
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:18:25-66
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:18:25-66
category#android.intent.category.LAUNCHER
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:20:17-77
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:20:17-77
android:name
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml:20:27-74
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml:20:27-74
uses-sdk
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
MERGED from [com.google.android.material:material:1.8.0] C:\Users\probo\.gradle\caches\transforms-3\4fbcf167c94e837ff1be43cd429a082f\transformed\material-1.8.0\AndroidManifest.xml:20:5-22:41
MERGED from [com.google.android.material:material:1.8.0] C:\Users\probo\.gradle\caches\transforms-3\4fbcf167c94e837ff1be43cd429a082f\transformed\material-1.8.0\AndroidManifest.xml:20:5-22:41
MERGED from [androidx.constraintlayout:constraintlayout:2.1.4] C:\Users\probo\.gradle\caches\transforms-3\d5cfd9b05f05865cd2d2bad992fdaec7\transformed\constraintlayout-2.1.4\AndroidManifest.xml:5:5-7:41
@@ -197,16 +197,16 @@ MERGED from [androidx.print:print:1.0.0] C:\Users\probo\.gradle\caches\transform
MERGED from [androidx.print:print:1.0.0] C:\Users\probo\.gradle\caches\transforms-3\40d3d7c3b32b2b3f996b647420cd5534\transformed\print-1.0.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.annotation:annotation-experimental:1.3.0] C:\Users\probo\.gradle\caches\transforms-3\fd3daf95af5e4e1fd3f3860fc1410040\transformed\annotation-experimental-1.3.0\AndroidManifest.xml:20:5-44
MERGED from [androidx.annotation:annotation-experimental:1.3.0] C:\Users\probo\.gradle\caches\transforms-3\fd3daf95af5e4e1fd3f3860fc1410040\transformed\annotation-experimental-1.3.0\AndroidManifest.xml:20:5-44
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
android:targetSdkVersion
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
android:minSdkVersion
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\tamere\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
ADDED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
INJECTED from C:\Users\probo\Desktop\SAE41_2022\src\app\src\main\AndroidManifest.xml
provider#androidx.startup.InitializationProvider
ADDED from [androidx.emoji2:emoji2:1.2.0] C:\Users\probo\.gradle\caches\transforms-3\7efe218e7ae35cb58dbf86d5ee36a529\transformed\emoji2-1.2.0\AndroidManifest.xml:24:9-32:20
MERGED from [androidx.lifecycle:lifecycle-process:2.4.1] C:\Users\probo\.gradle\caches\transforms-3\7495f4090f64d34b46f8102bfc12da1e\transformed\lifecycle-process-2.4.1\AndroidManifest.xml:26:9-34:20