230405/cuidamais_med
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	.gradle/9.3.1/executionHistory/executionHistory.bin
#	.gradle/9.3.1/executionHistory/executionHistory.lock
#	.gradle/9.3.1/fileHashes/fileHashes.bin
#	.gradle/9.3.1/fileHashes/fileHashes.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/file-system.probe
#	app/build/intermediates/apk/debug/app-debug.apk
#	app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt
#	app/build/intermediates/incremental/packageDebug/tmp/debug/zip-cache/androidResources
#	app/build/intermediates/linked_resources_binary_format/debug/processDebugResources/linked-resources-binary-format-debug.ap_
#	app/build/intermediates/manifest_merge_blame_file/debug/processDebugMainManifest/manifest-merger-blame-debug-report.txt
#	build/reports/problems/problems-report.html
This commit is contained in:
230405
2026-03-25 12:39:23 +00:00
parent 2f8125d0e0 2f4d8ca214
commit 401f8f33f7
562 changed files with 49585 additions and 16891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

380
.idea/caches/deviceStreaming.xml generated
View File

@@ -1170,6 +1170,74 @@
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="OPPO" />
<option name="codename" value="oplus_lab_op574fl1" />
<option name="id" value="oplus_lab_op574fl1" />
<option name="labId" value="oppo" />
<option name="manufacturer" value="OPPO" />
<option name="name" value="A58" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="OnePlus" />
<option name="codename" value="oplus_lab_op5961l1" />
<option name="id" value="oplus_lab_op5961l1" />
<option name="labId" value="oneplus" />
<option name="manufacturer" value="OnePlus" />
<option name="name" value="11R 5G" />
<option name="screenDensity" value="560" />
<option name="screenX" value="1240" />
<option name="screenY" value="2772" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="OPPO" />
<option name="codename" value="oplus_lab_op5abfl1" />
<option name="id" value="oplus_lab_op5abfl1" />
<option name="labId" value="oppo" />
<option name="manufacturer" value="OPPO" />
<option name="name" value="Reno11 5G" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2412" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="OPPO" />
<option name="codename" value="oplus_lab_op5b05l1" />
<option name="id" value="oplus_lab_op5b05l1" />
<option name="labId" value="oppo" />
<option name="manufacturer" value="OPPO" />
<option name="name" value="A3 Pro 5G" />
<option name="screenDensity" value="320" />
<option name="screenX" value="720" />
<option name="screenY" value="1604" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="31" />
<option name="brand" value="google" />
@@ -1405,6 +1473,146 @@
</list>
</option>
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="samsung_lab_a13" />
<option name="id" value="samsung_lab_a13" />
<option name="labId" value="samsung" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy A13" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1080" />
<option name="screenY" value="2408" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="samsung_lab_b6q" />
<option name="id" value="samsung_lab_b6q" />
<option name="labId" value="samsung" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Flip6" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1080" />
<option name="screenY" value="2640" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="samsung_lab_e3q" />
<option name="id" value="samsung_lab_e3q" />
<option name="labId" value="samsung" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy S24 Ultra" />
<option name="screenDensity" value="450" />
<option name="screenX" value="1440" />
<option name="screenY" value="3120" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="33" />
<option name="brand" value="samsung" />
<option name="codename" value="samsung_lab_gta9p" />
<option name="formFactor" value="Tablet" />
<option name="id" value="samsung_lab_gta9p" />
<option name="labId" value="samsung" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab A9+ 5G" />
<option name="screenDensity" value="240" />
<option name="screenX" value="1200" />
<option name="screenY" value="1920" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="samsung_lab_gts9" />
<option name="formFactor" value="Tablet" />
<option name="id" value="samsung_lab_gts9" />
<option name="labId" value="samsung" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S9 5G" />
<option name="screenDensity" value="340" />
<option name="screenX" value="1600" />
<option name="screenY" value="2560" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="samsung_lab_gts9p" />
<option name="formFactor" value="Tablet" />
<option name="id" value="samsung_lab_gts9p" />
<option name="labId" value="samsung" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S9+ 5G" />
<option name="screenDensity" value="340" />
<option name="screenX" value="1752" />
<option name="screenY" value="2800" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="samsung_lab_gts9u" />
<option name="formFactor" value="Tablet" />
<option name="id" value="samsung_lab_gts9u" />
<option name="labId" value="samsung" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Tab S9 Ultra 5G" />
<option name="screenDensity" value="300" />
<option name="screenX" value="1848" />
<option name="screenY" value="2960" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="samsung" />
<option name="codename" value="samsung_lab_q6q" />
<option name="id" value="samsung_lab_q6q" />
<option name="labId" value="samsung" />
<option name="manufacturer" value="Samsung" />
<option name="name" value="Galaxy Z Fold6" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1856" />
<option name="screenY" value="2160" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="google" />
@@ -1520,6 +1728,108 @@
</list>
</option>
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="Infinix" />
<option name="codename" value="transsion_lab_infinix-x6856" />
<option name="id" value="transsion_lab_infinix-x6856" />
<option name="labId" value="transsion" />
<option name="manufacturer" value="INFINIX" />
<option name="name" value="NOTE 50 Pro+" />
<option name="screenDensity" value="440" />
<option name="screenX" value="1080" />
<option name="screenY" value="2436" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="TECNO" />
<option name="codename" value="transsion_lab_tecno-km4" />
<option name="id" value="transsion_lab_tecno-km4" />
<option name="labId" value="transsion" />
<option name="manufacturer" value="TECNO" />
<option name="name" value="Spark Go 2" />
<option name="screenDensity" value="280" />
<option name="screenX" value="720" />
<option name="screenY" value="1600" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="TECNO" />
<option name="codename" value="transsion_lab_tecno-lj7" />
<option name="id" value="transsion_lab_tecno-lj7" />
<option name="labId" value="transsion" />
<option name="manufacturer" value="TECNO" />
<option name="name" value="POVA 7" />
<option name="screenDensity" value="440" />
<option name="screenX" value="1080" />
<option name="screenY" value="2460" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="TECNO" />
<option name="codename" value="transsion_lab_tecno-lj9" />
<option name="id" value="transsion_lab_tecno-lj9" />
<option name="labId" value="transsion" />
<option name="manufacturer" value="TECNO" />
<option name="name" value="POVA 7 Ultra" />
<option name="screenDensity" value="440" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="vivo" />
<option name="codename" value="vivo_lab_v2342" />
<option name="id" value="vivo_lab_v2342" />
<option name="labId" value="vivo" />
<option name="manufacturer" value="vivo" />
<option name="name" value="V40 Lite" />
<option name="screenDensity" value="440" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="vivo" />
<option name="codename" value="vivo_lab_v2348" />
<option name="id" value="vivo_lab_v2348" />
<option name="labId" value="vivo" />
<option name="manufacturer" value="vivo" />
<option name="name" value="V40" />
<option name="screenDensity" value="420" />
<option name="screenX" value="1080" />
<option name="screenY" value="2400" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="34" />
<option name="brand" value="samsung" />
@@ -1532,6 +1842,76 @@
<option name="screenX" value="1080" />
<option name="screenY" value="2408" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="Xiaomi" />
<option name="codename" value="xiaomi_lab_garnet" />
<option name="id" value="xiaomi_lab_garnet" />
<option name="labId" value="xiaomi" />
<option name="manufacturer" value="Xiaomi" />
<option name="name" value="Redmi Note 13 Pro 5G" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1220" />
<option name="screenY" value="2712" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="34" />
<option name="brand" value="Xiaomi" />
<option name="codename" value="xiaomi_lab_pipa" />
<option name="formFactor" value="Tablet" />
<option name="id" value="xiaomi_lab_pipa" />
<option name="labId" value="xiaomi" />
<option name="manufacturer" value="Xiaomi" />
<option name="name" value="Pad 6" />
<option name="screenDensity" value="480" />
<option name="screenX" value="1220" />
<option name="screenY" value="2712" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="Xiaomi" />
<option name="codename" value="xiaomi_lab_ruyi" />
<option name="id" value="xiaomi_lab_ruyi" />
<option name="labId" value="xiaomi" />
<option name="manufacturer" value="Xiaomi" />
<option name="name" value="MIX Flip" />
<option name="screenDensity" value="520" />
<option name="screenX" value="1224" />
<option name="screenY" value="2912" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="accessStatus">
<list>
<option value="EULA_NOT_ACCEPTED" />
</list>
</option>
<option name="api" value="35" />
<option name="brand" value="Xiaomi" />
<option name="codename" value="xiaomi_lab_sheng" />
<option name="formFactor" value="Tablet" />
<option name="id" value="xiaomi_lab_sheng" />
<option name="labId" value="xiaomi" />
<option name="manufacturer" value="Xiaomi" />
<option name="name" value="Pad 6S Pro 12.4" />
<option name="screenDensity" value="400" />
<option name="screenX" value="2032" />
<option name="screenY" value="3048" />
</PersistentDeviceSelectionData>
<PersistentDeviceSelectionData>
<option name="api" value="33" />
<option name="brand" value="samsung" />