save

android/app/build/intermediates/incremental/mergeDebugJniLibFolders/merger.xml

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

android/app/build/intermediates/incremental/mergeDebugResources/compile-file-map.properties

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 #Wed Jan 20 10:20:16 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
@@ -32,3 +33,39 @@ 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/merged.dir/values/values.xml

@@ -704,6 +704,7 @@
     <string name="common_signin_button_text_long">Sign in with Google</string>
     <string name="copy_toast_msg">Link copied to clipboard</string>
     <string name="custom_url_scheme">com.gpr.gabinetedigital</string>
+    <string name="default_web_client_id" translatable="false">800733765231-92oa7ib62ob0pkouphb5i5sp01vkalid.apps.googleusercontent.com</string>
     <string name="error_icon_content_description">Error</string>
     <string name="exposed_dropdown_menu_content_description">Show dropdown menu</string>
     <string name="fab_transformation_scrim_behavior" translatable="false">com.google.android.material.transformation.FabTransformationScrimBehavior</string>
@@ -712,6 +713,12 @@
     <string name="fallback_menu_item_open_in_browser">Open in browser</string>
     <string name="fallback_menu_item_share_link">Share link</string>
     <string name="fcm_fallback_notification_channel_label">Miscellaneous</string>
+    <string name="firebase_database_url" translatable="false">https://gabinete-digital-2020.firebaseio.com</string>
+    <string name="gcm_defaultSenderId" translatable="false">800733765231</string>
+    <string name="google_api_key" translatable="false">AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok</string>
+    <string name="google_app_id" translatable="false">1:800733765231:android:e7ffc0b310037d9f13779a</string>
+    <string name="google_crash_reporting_api_key" translatable="false">AIzaSyD0pfW45DLoW6mqvZRklJdbfSTskW22Fok</string>
+    <string name="google_storage_bucket" translatable="false">gabinete-digital-2020.appspot.com</string>
     <string name="hide_bottom_view_on_scroll_behavior" translatable="false">com.google.android.material.behavior.HideBottomViewOnScrollBehavior</string>
     <string description="Content description for an icon that appears in the title area of a dialog" name="icon_content_description">Dialog Icon</string>
     <string description="Content description for new notification (no number count) [CHAR_LIMIT=NONE]" name="mtrl_badge_numberless_content_description">New notification</string>
@@ -756,6 +763,7 @@
     <string name="path_password_eye_mask_visible" translatable="false">M2,4.27 L2,4.27 L4.54,1.73 L4.54,1.73 L4.54,1 L23,1 L23,23 L1,23 L1,4.27 Z</string>
     <string name="path_password_strike_through" translatable="false">M3.27,4.27 L19.74,20.74</string>
     <string name="picture">Picture</string>
+    <string name="project_id" translatable="false">gabinete-digital-2020</string>
     <string name="request_permission">Allow this app to take pictures</string>
     <string name="search_menu_title">Search</string>
     <string name="status_bar_notification_info_overflow">999+</string>

android/app/build/intermediates/incremental/mergeDebugShaders/merger.xml

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

android/app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,8 +1,12 @@
 <<<<<<< 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
 path.3=classes_1.dex
 path.2=classes_0.dex
 path.1=classes.dex
@@ -11,7 +15,7 @@ renamed.3=classes4.dex
 renamed.2=classes3.dex
 renamed.1=classes2.dex
 renamed.0=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
+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