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 9441cf992d
21 changed files with 1601 additions and 1012 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/src/main/res/layout/fragment_profile.xml
View File

@@ -60,7 +60,6 @@
</LinearLayout>
</FrameLayout>
<!-- Account Settings Section -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -88,7 +87,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- Item 1 -->
<LinearLayout
android:id="@+id/layoutEditProfile"
android:layout_width="match_parent"
@@ -121,47 +119,9 @@
android:rotation="0" />
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="#F3F4F6" />
<!-- Item 2 -->
<LinearLayout
android:id="@+id/layoutSecurity"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:clickable="true"
android:gravity="center_vertical"
android:padding="16dp">
<ImageView
android:layout_width="24dp"
android:layout_height="24dp"
android:src="@android:drawable/ic_lock_idle_lock"
app:tint="#4B5563" />
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_weight="1"
android:text="Segurança e Senha"
android:textColor="#1F2937"
android:textSize="16sp" />
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@android:drawable/ic_media_play"
app:tint="#9CA3AF"
android:rotation="0" />
</LinearLayout>
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
<!-- App Settings Section -->
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -189,7 +149,6 @@
android:layout_height="wrap_content"
android:orientation="vertical">
<!-- Item 1 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -224,7 +183,6 @@
android:layout_height="1dp"
android:background="#F3F4F6" />
<!-- Item 2 -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -274,10 +232,10 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:gravity="center"
android:text="FindU Inc. © 2024"
android:text="FindU Inc. © 2026"
android:textColor="#D1D5DB"
android:textSize="12sp" />
</LinearLayout>
</androidx.core.widget.NestedScrollView>
</androidx.core.widget.NestedScrollView>