peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 04:57:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-01-26 11:04:54 +01:00
parent 0ef5b6628a
commit 63827c53dc
454 changed files with 14297 additions and 18822 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/build/intermediates/incremental/debug-mergeJavaRes/merge-state
BIN
View File
Binary file not shown.
android/app/build/intermediates/incremental/debug-mergeNativeLibs/merge-state
BIN
View File
Binary file not shown.
android/app/build/intermediates/incremental/mergeDebugAssets/merger.xml
+1 -9
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml
+1 -1
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\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\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\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\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\tiago.kayaya\development\gabinete-digital\android\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\tiago.kayaya\development\gabinete-digital\android\app\src\debug\jniLibs"/></dataSet></merger>
android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties
+1 -42
View File
@@ -1,9 +1,4 @@
<<<<<<< HEAD
<<<<<<< HEAD
#Wed Jan 20 10:20:16 WAT 2021
=======
#Mon Jan 25 11:41:48 WAT 2021
>>>>>>> feature/chat
#Mon Jan 25 12:12:31 WAT 2021
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
@@ -37,39 +32,3 @@ C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\layout\\activity_main.xml=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_main.xml.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_foreground.png=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_foreground.png.flat
C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\src\\main\\res\\drawable\\ic_launcher_background.xml=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_launcher_background.xml.flat
=======
#Wed Jan 20 14:13:03 WAT 2021
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable\\ic_launcher_background.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable_ic_launcher_background.xml.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\layout\\activity_main.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\layout_activity_main.xml.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xxxhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xxxhdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-mdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-mdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-hdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-hdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\xml\\file_paths.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_file_paths.xml.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-v24\\ic_launcher_foreground.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-v24_ic_launcher_foreground.xml.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xxhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xxhdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_round.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xxxhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xxxhdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_round.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xxhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xxhdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\xml\\config.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\xml_config.xml.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-xhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-xhdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_round.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-mdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-mdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher_round.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-anydpi-v26_ic_launcher_round.xml.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-anydpi-v26\\ic_launcher.xml=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-anydpi-v26_ic_launcher.xml.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xhdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xhdpi_ic_launcher_foreground.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_round.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher_foreground.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxxhdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxxhdpi_ic_launcher_foreground.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-land-xhdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-land-xhdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-xxhdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-xxhdpi_ic_launcher_foreground.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\drawable-port-hdpi\\splash.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\drawable-port-hdpi_splash.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_round.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_round.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-hdpi\\ic_launcher_foreground.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-hdpi_ic_launcher_foreground.png.flat
C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New\ folder\\gabinete-digital\\android\\app\\src\\main\\res\\mipmap-mdpi\\ic_launcher.png=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\res\\merged\\debug\\mipmap-mdpi_ic_launcher.png.flat
>>>>>>> feature/pushNotifications
android/app/build/intermediates/incremental/mergeDebugResources/merger.xml
+30 -30
View File
File diff suppressed because one or more lines are too long
android/app/build/intermediates/incremental/mergeDebugShaders/merger.xml
+1 -1
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\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\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\eudes.inacio\Gabinet-DigitalProject\New folder\gabinete-digital\android\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\tiago.kayaya\development\gabinete-digital\android\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\tiago.kayaya\development\gabinete-digital\android\app\src\debug\shaders"/></dataSet></merger>
android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
+5 -17
View File
@@ -1,16 +1,4 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
#Wed Jan 20 13:37:00 WAT 2021
=======
#Thu Jan 21 09:26:08 WAT 2021
>>>>>>> feature/chat
=======
#Wed Jan 20 15:30:14 WAT 2021
>>>>>>> feature/pushNotifications
=======
#Mon Jan 25 11:42:31 WAT 2021
>>>>>>> feature/chat
#Mon Jan 25 12:43:34 WAT 2021
path.3=classes_1.dex
path.2=classes_0.dex
path.1=classes.dex
@@ -19,7 +7,7 @@ renamed.3=classes4.dex
renamed.2=classes3.dex
renamed.1=classes2.dex
renamed.0=classes.dex
base.3=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_1.dex
base.2=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_0.dex
base.1=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\classes.dex
base.0=C\:\\Users\\eudes.inacio\\Gabinet-DigitalProject\\New folder\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
base.3=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_1.dex
base.2=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeLibDexDebug\\classes_0.dex
base.1=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeProjectDexDebug\\classes.dex
base.0=C\:\\Users\\tiago.kayaya\\development\\gabinete-digital\\android\\app\\build\\intermediates\\dex\\debug\\mergeExtDexDebug\\classes.dex
android/app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/javaResources0
BIN
View File
Binary file not shown.