230408/PAP_JonatasSantos
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source 
# Conflicts:
#	.idea/deploymentTargetSelector.xml
#	app/src/main/java/com/example/pap_findu/LocationService.java
#	app/src/main/java/com/example/pap_findu/login_activity.java
#	app/src/main/java/com/example/pap_findu/ui/map/MapFragment.java
This commit is contained in:
230408
2026-03-13 16:58:26 +00:00
parent d6e9320b80 86221e5179
commit 86da99ee13
10 changed files with 621 additions and 305 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/deploymentTargetSelector.xml generated
View File

@@ -7,10 +7,10 @@
</SelectionState>
<SelectionState runConfigName="login_activity">
<option name="selectionMode" value="DIALOG" />
<DropdownSelection timestamp="2026-03-12T15:46:37.841197Z">
<DropdownSelection timestamp="2026-03-17T14:22:15.472961Z">
<Target type="DEFAULT_BOOT">
<handle>
<DeviceId pluginId="LocalEmulator" identifier="path=/Users/230408/.android/avd/Medium_Phone_2.avd" />
<DeviceId pluginId="LocalEmulator" identifier="path=/Users/230408/.android/avd/Pixel_7.avd" />
</handle>
</Target>
</DropdownSelection>