From 665f88ab3bcc5520d33276d2787cf986f6ce1d9b Mon Sep 17 00:00:00 2001
From: TAMARA JERINIC <tamara.jerinic@gmail.com>
Date: Sat, 19 Nov 2022 14:24:04 +0100
Subject: Izmenjen profil korisnika, dodati resursi.

---
 .../app/src/main/res/drawable/button_chat.xml      |  22 ++
 .../app/src/main/res/drawable/button_follow.xml    |  18 ++
 .../app/src/main/res/drawable/button_unfollow.xml  |  22 ++
 .../main/res/drawable/profile_view_background.xml  |  15 ++
 .../src/main/res/layout/fragment_user_profile.xml  | 297 +++++++++------------
 5 files changed, 207 insertions(+), 167 deletions(-)
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_chat.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_follow.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/button_unfollow.xml
 create mode 100644 Client/BrzoDoLokacije/app/src/main/res/drawable/profile_view_background.xml

(limited to 'Client')

diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_chat.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_chat.xml
new file mode 100644
index 0000000..86bfbd5
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_chat.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="119dp"
+    android:height="45dp"
+    android:viewportWidth="119"
+    android:viewportHeight="45">
+    <group>
+        <path
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M4 18.5c0-10.22 8.28-18.5 18.5-18.5h74c10.22 0 18.5 8.28 18.5 18.5v0c0 10.22-8.28 18.5-18.5 18.5h-74c-10.22 0-18.5-8.28-18.5-18.5z"/>
+        <path
+            android:strokeColor="#FF093A4C"
+            android:strokeWidth="1"
+            android:pathData="M4.5 18.5c0-9.94 8.06-18 18-18h74c9.94 0 18 8.06 18 18v0c0 9.94-8.06 18-18 18h-74c-9.94 0-18-8.06-18-18z"/>
+    </group>
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M53.32 24V13.1h3.69c0.85 0 1.55 0.15 2.1 0.45 0.54 0.31 0.95 0.72 1.21 1.25 0.26 0.52 0.4 1.1 0.4 1.74 0 0.65-0.14 1.23-0.4 1.76-0.26 0.52-0.66 0.94-1.2 1.25-0.55 0.31-1.24 0.47-2.1 0.47H54.4v-1.18h2.6c0.58 0 1.05-0.1 1.4-0.3 0.36-0.2 0.62-0.48 0.78-0.82 0.16-0.35 0.24-0.74 0.24-1.18 0-0.43-0.08-0.82-0.24-1.17-0.16-0.34-0.42-0.61-0.78-0.8-0.36-0.2-0.83-0.3-1.43-0.3h-2.32V24h-1.32Zm12.59 0.17c-0.74 0-1.39-0.18-1.95-0.53-0.55-0.35-0.98-0.84-1.3-1.47-0.3-0.63-0.46-1.37-0.46-2.22 0-0.85 0.16-1.6 0.46-2.23 0.32-0.64 0.75-1.13 1.3-1.48 0.56-0.35 1.2-0.53 1.95-0.53 0.74 0 1.38 0.18 1.94 0.53 0.55 0.35 0.99 0.84 1.3 1.48 0.3 0.64 0.47 1.38 0.47 2.23 0 0.85-0.16 1.59-0.47 2.22-0.31 0.63-0.75 1.12-1.3 1.47-0.56 0.35-1.2 0.53-1.94 0.53Zm0-1.13c0.56 0 1.02-0.14 1.38-0.43 0.37-0.29 0.63-0.67 0.8-1.13 0.18-0.47 0.27-0.98 0.27-1.53s-0.09-1.05-0.26-1.53c-0.18-0.47-0.44-0.85-0.8-1.14-0.37-0.3-0.83-0.44-1.4-0.44-0.55 0-1.01 0.15-1.38 0.44-0.36 0.29-0.63 0.67-0.8 1.14-0.18 0.48-0.26 0.98-0.26 1.53s0.08 1.06 0.26 1.53c0.17 0.46 0.44 0.84 0.8 1.13 0.37 0.29 0.83 0.43 1.39 0.43ZM71.53 24v-8.18h1.22v1.23h0.08c0.15-0.4 0.42-0.73 0.81-0.98 0.4-0.25 0.83-0.38 1.32-0.38h0.35l0.32 0.02V17l-0.3-0.05c-0.15-0.02-0.3-0.04-0.47-0.04-0.4 0-0.75 0.09-1.07 0.26-0.3 0.16-0.55 0.39-0.73 0.68-0.18 0.28-0.27 0.61-0.27 0.98V24h-1.26Zm10.74-3.35v-4.83h1.26V24h-1.26v-1.38H82.2c-0.2 0.41-0.5 0.76-0.9 1.06-0.4 0.28-0.91 0.43-1.53 0.43-0.51 0-0.97-0.12-1.37-0.34-0.4-0.23-0.7-0.57-0.93-1.02-0.23-0.46-0.34-1.04-0.34-1.73v-5.2h1.25v5.11c0 0.6 0.17 1.07 0.5 1.43 0.34 0.35 0.77 0.53 1.3 0.53 0.3 0 0.62-0.08 0.95-0.24 0.32-0.16 0.6-0.4 0.82-0.73 0.22-0.33 0.33-0.75 0.33-1.27ZM87 21.02l-0.02-1.56h0.26l3.58-3.64h1.55l-3.81 3.85h-0.1L87 21.02ZM85.83 24V13.1h1.26V24h-1.26Zm5.2 0l-3.2-4.05 0.9-0.87 3.9 4.92h-1.6Zm5.37 0.2c-0.52 0-1-0.1-1.41-0.3-0.43-0.2-0.76-0.49-1.01-0.86-0.25-0.38-0.37-0.83-0.37-1.36 0-0.47 0.09-0.85 0.27-1.14 0.19-0.3 0.44-0.53 0.74-0.7 0.31-0.16 0.65-0.29 1.03-0.37 0.37-0.08 0.75-0.15 1.13-0.2L98 19.13c0.31-0.04 0.54-0.1 0.68-0.18 0.15-0.08 0.22-0.22 0.22-0.43v-0.04c0-0.52-0.14-0.93-0.43-1.22-0.28-0.3-0.72-0.44-1.3-0.44-0.6 0-1.07 0.13-1.4 0.4-0.35 0.26-0.59 0.54-0.73 0.84l-1.19-0.43c0.21-0.5 0.5-0.88 0.85-1.16 0.36-0.28 0.75-0.48 1.18-0.59 0.42-0.11 0.84-0.17 1.25-0.17 0.27 0 0.57 0.03 0.9 0.1 0.35 0.06 0.68 0.18 1 0.38 0.33 0.19 0.6 0.48 0.8 0.86 0.22 0.4 0.33 0.9 0.33 1.56V24h-1.26v-1.1h-0.06c-0.09 0.17-0.23 0.36-0.43 0.56-0.2 0.2-0.46 0.38-0.8 0.52-0.32 0.14-0.73 0.21-1.2 0.21Zm0.19-1.14c0.5 0 0.92-0.1 1.26-0.29 0.34-0.2 0.6-0.45 0.77-0.76 0.18-0.3 0.27-0.63 0.27-0.97v-1.15c-0.05 0.06-0.17 0.12-0.35 0.17-0.18 0.05-0.38 0.1-0.62 0.14l-0.67 0.1-0.53 0.06c-0.33 0.04-0.63 0.1-0.92 0.2-0.28 0.1-0.5 0.24-0.68 0.43-0.17 0.18-0.26 0.43-0.26 0.75 0 0.44 0.17 0.77 0.49 1 0.33 0.21 0.74 0.32 1.24 0.32Z"/>
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M39 11H23c-1.1 0-1.99 0.9-1.99 2L21 31l4-4h14c1.1 0 2-0.9 2-2V13c0-1.1-0.9-2-2-2Zm-3 12H26c-0.55 0-1-0.45-1-1s0.45-1 1-1h10c0.55 0 1 0.45 1 1s-0.45 1-1 1Zm0-3H26c-0.55 0-1-0.45-1-1s0.45-1 1-1h10c0.55 0 1 0.45 1 1s-0.45 1-1 1Zm0-3H26c-0.55 0-1-0.45-1-1s0.45-1 1-1h10c0.55 0 1 0.45 1 1s-0.45 1-1 1Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_follow.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_follow.xml
new file mode 100644
index 0000000..80553a5
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_follow.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="119dp"
+    android:height="45dp"
+    android:viewportWidth="119"
+    android:viewportHeight="45">
+    <group>
+        <path
+            android:fillColor="#FF093A4D"
+            android:pathData="M4 18.5c0-10.22 8.28-18.5 18.5-18.5h74c10.22 0 18.5 8.28 18.5 18.5v0c0 10.22-8.28 18.5-18.5 18.5h-74c-10.22 0-18.5-8.28-18.5-18.5z"/>
+    </group>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M64.32 23V12.1h3.69c0.85 0 1.55 0.15 2.1 0.45 0.54 0.31 0.95 0.72 1.21 1.25 0.26 0.52 0.4 1.1 0.4 1.74 0 0.65-0.14 1.23-0.4 1.76-0.26 0.52-0.66 0.94-1.2 1.25-0.55 0.31-1.24 0.47-2.1 0.47H65.4v-1.18h2.6c0.58 0 1.05-0.1 1.4-0.3 0.36-0.2 0.62-0.48 0.78-0.82 0.16-0.35 0.24-0.74 0.24-1.18 0-0.43-0.08-0.82-0.24-1.17-0.16-0.34-0.42-0.61-0.78-0.8-0.36-0.2-0.83-0.3-1.43-0.3h-2.32V23h-1.32Zm9.35 0v-8.18h1.22v1.23h0.08c0.15-0.4 0.42-0.73 0.81-0.98 0.4-0.25 0.83-0.38 1.32-0.38h0.35l0.31 0.02V16l-0.29-0.05c-0.15-0.02-0.3-0.04-0.47-0.04-0.4 0-0.76 0.09-1.07 0.26-0.3 0.16-0.55 0.39-0.73 0.68-0.18 0.28-0.27 0.61-0.27 0.98V23h-1.26Zm8 0.2c-0.53 0-1-0.1-1.42-0.3-0.42-0.2-0.76-0.49-1-0.86-0.26-0.38-0.38-0.83-0.38-1.36 0-0.47 0.1-0.85 0.28-1.14 0.18-0.3 0.43-0.53 0.74-0.7 0.3-0.16 0.65-0.29 1.02-0.37 0.38-0.08 0.75-0.15 1.13-0.2l1.21-0.14c0.32-0.04 0.54-0.1 0.69-0.18 0.14-0.08 0.21-0.22 0.21-0.43v-0.04c0-0.52-0.14-0.93-0.43-1.22-0.28-0.3-0.71-0.44-1.3-0.44-0.6 0-1.06 0.13-1.4 0.4-0.34 0.26-0.58 0.54-0.72 0.84l-1.2-0.43c0.22-0.5 0.5-0.88 0.86-1.16 0.35-0.28 0.75-0.48 1.17-0.59 0.42-0.11 0.84-0.17 1.26-0.17 0.26 0 0.56 0.03 0.9 0.1 0.35 0.06 0.68 0.18 1 0.38 0.32 0.19 0.59 0.48 0.8 0.86 0.21 0.4 0.32 0.9 0.32 1.56V23h-1.26v-1.1H84.1c-0.09 0.17-0.23 0.36-0.43 0.56-0.2 0.2-0.46 0.38-0.79 0.52s-0.73 0.21-1.2 0.21Zm0.18-1.14c0.5 0 0.92-0.1 1.26-0.29 0.34-0.2 0.6-0.45 0.78-0.76 0.17-0.3 0.26-0.63 0.26-0.97v-1.15c-0.05 0.06-0.17 0.12-0.35 0.17-0.18 0.05-0.38 0.1-0.62 0.14l-0.67 0.1-0.53 0.06c-0.33 0.04-0.63 0.1-0.92 0.2-0.28 0.1-0.5 0.24-0.68 0.43-0.17 0.18-0.25 0.43-0.25 0.75 0 0.44 0.16 0.77 0.48 1 0.33 0.21 0.74 0.32 1.24 0.32Zm9.41-7.24v1.06h-4.24v-1.06h4.24Zm-3-1.96h1.26v7.8c0 0.35 0.05 0.62 0.15 0.8 0.1 0.17 0.24 0.29 0.4 0.35 0.17 0.05 0.35 0.08 0.53 0.08 0.14 0 0.26 0 0.34-0.02l0.22-0.04 0.25 1.13-0.35 0.1c-0.16 0.03-0.35 0.05-0.58 0.05-0.36 0-0.7-0.08-1.05-0.23-0.34-0.16-0.62-0.39-0.84-0.7-0.22-0.31-0.33-0.7-0.33-1.18v-8.14ZM93.16 23v-8.18h1.25V23h-1.26Zm0.63-9.55c-0.24 0-0.45-0.08-0.63-0.25-0.17-0.16-0.26-0.36-0.26-0.6 0-0.23 0.09-0.43 0.26-0.6 0.18-0.17 0.39-0.25 0.63-0.25 0.25 0 0.46 0.08 0.63 0.25 0.18 0.17 0.27 0.37 0.27 0.6 0 0.24-0.09 0.44-0.27 0.6-0.17 0.17-0.38 0.25-0.63 0.25Z"/>
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M34 21.25v2.1c-0.9-0.33-1.87-0.43-2.82-0.3-0.96 0.14-1.86 0.5-2.64 1.05-0.79 0.55-1.43 1.29-1.87 2.14C26.23 27.1 26 28.04 26 29h-2c0-1.22 0.28-2.43 0.82-3.52 0.53-1.1 1.31-2.06 2.28-2.8 0.97-0.75 2.09-1.27 3.29-1.52 1.2-0.24 2.43-0.21 3.61 0.1ZM32 20c-3.32 0-6-2.68-6-6 0-3.31 2.68-6 6-6 3.31 0 6 2.69 6 6 0 3.32-2.69 6-6 6Zm0-2c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4Zm6 6v-3h2v3h3v2h-3v3h-2v-3h-3v-2h3Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_unfollow.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_unfollow.xml
new file mode 100644
index 0000000..d3e3bbb
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_unfollow.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="178dp"
+    android:height="45dp"
+    android:viewportWidth="178"
+    android:viewportHeight="45">
+    <group>
+        <path
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M4 18.5c0-10.22 8.28-18.5 18.5-18.5h133c10.22 0 18.5 8.28 18.5 18.5v0c0 10.22-8.28 18.5-18.5 18.5h-133c-10.22 0-18.5-8.28-18.5-18.5z"/>
+        <path
+            android:strokeColor="#FF093A4C"
+            android:strokeWidth="1"
+            android:pathData="M4.5 18.5c0-9.94 8.06-18 18-18h133c9.94 0 18 8.06 18 18v0c0 9.94-8.06 18-18 18h-133c-9.94 0-18-8.06-18-18z"/>
+    </group>
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M47.82 23V12.1h3.69c0.85 0 1.55 0.15 2.1 0.45 0.54 0.31 0.95 0.72 1.21 1.25 0.26 0.52 0.4 1.1 0.4 1.74 0 0.65-0.14 1.23-0.4 1.76-0.26 0.52-0.66 0.94-1.2 1.25-0.55 0.31-1.24 0.47-2.1 0.47H48.9v-1.18h2.6c0.58 0 1.05-0.1 1.4-0.3 0.36-0.2 0.62-0.48 0.78-0.82 0.16-0.35 0.24-0.74 0.24-1.18 0-0.43-0.08-0.82-0.24-1.17-0.16-0.34-0.42-0.61-0.78-0.8-0.36-0.2-0.83-0.3-1.43-0.3h-2.32V23h-1.32Zm9.35 0v-8.18h1.22v1.23h0.08c0.15-0.4 0.42-0.73 0.81-0.98 0.4-0.25 0.83-0.38 1.32-0.38h0.35l0.31 0.02V16l-0.29-0.05c-0.15-0.02-0.3-0.04-0.47-0.04-0.4 0-0.76 0.09-1.07 0.26-0.3 0.16-0.55 0.39-0.73 0.68-0.18 0.28-0.27 0.61-0.27 0.98V23h-1.26Zm8.76 0.17c-0.78 0-1.46-0.17-2.04-0.52-0.56-0.35-1-0.84-1.31-1.47-0.3-0.63-0.46-1.37-0.46-2.2 0-0.85 0.15-1.58 0.46-2.22 0.3-0.65 0.74-1.15 1.29-1.5 0.55-0.37 1.2-0.55 1.94-0.55 0.42 0 0.84 0.07 1.26 0.21 0.41 0.15 0.8 0.38 1.13 0.7 0.34 0.31 0.62 0.73 0.82 1.25 0.2 0.53 0.3 1.17 0.3 1.93v0.54h-6.3v-1.1h5.02c0-0.45-0.09-0.86-0.27-1.23-0.18-0.36-0.44-0.65-0.78-0.85-0.33-0.21-0.73-0.32-1.18-0.32-0.5 0-0.94 0.13-1.3 0.37-0.37 0.25-0.64 0.57-0.84 0.96-0.2 0.4-0.3 0.82-0.3 1.27v0.72c0 0.62 0.11 1.15 0.33 1.58 0.21 0.42 0.51 0.75 0.9 0.97 0.38 0.22 0.83 0.33 1.33 0.33 0.33 0 0.63-0.04 0.9-0.14s0.5-0.24 0.7-0.42c0.2-0.2 0.34-0.43 0.45-0.72l1.21 0.34c-0.12 0.42-0.34 0.78-0.64 1.09-0.3 0.3-0.67 0.55-1.12 0.72-0.44 0.18-0.94 0.26-1.5 0.26Zm6.48-3.15l-0.02-1.56h0.25l3.58-3.64h1.56l-3.82 3.85h-0.1l-1.45 1.35ZM71.23 23V12.1h1.26V23h-1.26Zm5.2 0l-3.2-4.05 0.9-0.87 3.9 4.92h-1.6Zm2.96 0v-8.18h1.26V23H79.4Zm0.64-9.55c-0.24 0-0.45-0.08-0.63-0.25-0.17-0.16-0.26-0.36-0.26-0.6 0-0.23 0.09-0.43 0.26-0.6 0.18-0.17 0.39-0.25 0.63-0.25 0.25 0 0.46 0.08 0.63 0.25 0.18 0.17 0.27 0.37 0.27 0.6 0 0.24-0.1 0.44-0.27 0.6-0.17 0.17-0.38 0.25-0.63 0.25Zm4.18 4.63V23h-1.26v-8.18h1.22v1.28h0.1c0.2-0.42 0.49-0.75 0.88-1 0.39-0.26 0.9-0.39 1.51-0.39 0.55 0 1.04 0.12 1.45 0.34 0.42 0.23 0.74 0.57 0.97 1.03 0.24 0.45 0.35 1.03 0.35 1.72V23h-1.26v-5.11c0-0.65-0.16-1.15-0.5-1.5-0.33-0.37-0.79-0.55-1.37-0.55-0.4 0-0.76 0.09-1.08 0.26-0.31 0.18-0.56 0.43-0.74 0.76-0.18 0.34-0.27 0.74-0.27 1.22ZM91.73 23v-8.18h1.25V23h-1.25Zm0.64-9.55c-0.25 0-0.46-0.08-0.64-0.25-0.17-0.16-0.26-0.36-0.26-0.6 0-0.23 0.09-0.43 0.26-0.6 0.18-0.17 0.4-0.25 0.64-0.25S92.82 11.83 93 12c0.17 0.17 0.26 0.37 0.26 0.6 0 0.24-0.09 0.44-0.26 0.6-0.18 0.17-0.39 0.25-0.63 0.25Zm7.14 12.62V14.82h1.21v1.3h0.15l0.38-0.55c0.17-0.22 0.4-0.42 0.72-0.6 0.3-0.17 0.73-0.26 1.27-0.26 0.68 0 1.3 0.17 1.82 0.52 0.52 0.34 0.93 0.83 1.23 1.46 0.3 0.64 0.44 1.38 0.44 2.24 0 0.87-0.15 1.62-0.44 2.25-0.3 0.64-0.7 1.13-1.23 1.47-0.52 0.35-1.12 0.52-1.8 0.52-0.53 0-0.95-0.09-1.27-0.26-0.31-0.18-0.56-0.38-0.73-0.6-0.17-0.23-0.3-0.42-0.39-0.57h-0.1v4.33H99.5Zm1.23-7.16c0 0.62 0.1 1.16 0.27 1.63 0.18 0.47 0.45 0.84 0.8 1.1 0.34 0.27 0.77 0.4 1.28 0.4 0.52 0 0.96-0.14 1.31-0.41 0.36-0.28 0.62-0.66 0.8-1.13 0.18-0.48 0.27-1 0.27-1.6 0-0.57-0.09-1.08-0.26-1.55-0.18-0.46-0.44-0.83-0.8-1.1-0.35-0.27-0.8-0.4-1.32-0.4s-0.95 0.12-1.3 0.38c-0.34 0.26-0.6 0.61-0.78 1.08-0.18 0.45-0.27 0.99-0.27 1.6Zm7.9 4.09v-8.18h1.22v1.23h0.09c0.15-0.4 0.41-0.73 0.8-0.98 0.4-0.25 0.84-0.38 1.33-0.38h0.34l0.32 0.02V16l-0.3-0.05c-0.14-0.02-0.3-0.04-0.47-0.04-0.4 0-0.75 0.09-1.06 0.26-0.31 0.16-0.56 0.39-0.74 0.68-0.18 0.28-0.27 0.61-0.27 0.98V23h-1.25Zm8 0.2c-0.52 0-1-0.1-1.42-0.3-0.42-0.2-0.75-0.49-1-0.86-0.25-0.38-0.38-0.83-0.38-1.36 0-0.47 0.1-0.85 0.28-1.14 0.19-0.3 0.43-0.53 0.74-0.7 0.31-0.16 0.65-0.29 1.02-0.37 0.38-0.08 0.76-0.15 1.14-0.2l1.2-0.14c0.32-0.04 0.55-0.1 0.69-0.18 0.15-0.08 0.22-0.22 0.22-0.43v-0.04c0-0.52-0.15-0.93-0.43-1.22-0.29-0.3-0.72-0.44-1.3-0.44-0.6 0-1.07 0.13-1.4 0.4-0.35 0.26-0.59 0.54-0.73 0.84l-1.2-0.43c0.22-0.5 0.5-0.88 0.86-1.16 0.36-0.28 0.75-0.48 1.17-0.59 0.43-0.11 0.85-0.17 1.26-0.17 0.26 0 0.56 0.03 0.9 0.1 0.35 0.06 0.68 0.18 1 0.38 0.32 0.19 0.6 0.48 0.8 0.86 0.22 0.4 0.33 0.9 0.33 1.56V23h-1.26v-1.1h-0.07c-0.08 0.17-0.22 0.36-0.42 0.56-0.2 0.2-0.47 0.38-0.8 0.52-0.33 0.14-0.73 0.21-1.2 0.21Zm0.19-1.14c0.5 0 0.91-0.1 1.25-0.29 0.35-0.2 0.6-0.45 0.78-0.76 0.18-0.3 0.27-0.63 0.27-0.97v-1.15c-0.05 0.06-0.17 0.12-0.35 0.17-0.18 0.05-0.39 0.1-0.62 0.14l-0.68 0.1-0.53 0.06c-0.32 0.04-0.63 0.1-0.91 0.2s-0.5 0.24-0.68 0.43c-0.17 0.18-0.26 0.43-0.26 0.75 0 0.44 0.16 0.77 0.49 1 0.32 0.21 0.74 0.32 1.24 0.32Zm9.17 1.11c-0.76 0-1.42-0.18-1.98-0.54-0.55-0.37-0.98-0.86-1.28-1.5-0.3-0.64-0.44-1.36-0.44-2.18 0-0.83 0.15-1.56 0.45-2.2 0.31-0.64 0.74-1.14 1.3-1.5 0.55-0.36 1.2-0.54 1.93-0.54 0.58 0 1.1 0.1 1.56 0.32 0.46 0.21 0.84 0.51 1.13 0.9 0.3 0.38 0.48 0.83 0.55 1.34h-1.26c-0.1-0.37-0.3-0.7-0.63-1-0.33-0.28-0.77-0.43-1.33-0.43-0.49 0-0.92 0.13-1.28 0.38-0.37 0.26-0.66 0.61-0.86 1.08-0.2 0.45-0.3 1-0.3 1.6 0 0.64 0.1 1.2 0.3 1.66 0.2 0.47 0.48 0.83 0.84 1.1 0.37 0.25 0.8 0.38 1.3 0.38 0.33 0 0.63-0.06 0.9-0.17 0.26-0.11 0.48-0.28 0.67-0.49 0.18-0.21 0.32-0.47 0.4-0.77h1.25c-0.07 0.49-0.25 0.92-0.53 1.3-0.27 0.4-0.64 0.7-1.1 0.92-0.45 0.23-0.98 0.34-1.59 0.34Zm-0.61-9.46l1.3-2.47h1.47l-1.67 2.47h-1.1Zm9.1 9.46c-0.79 0-1.47-0.17-2.04-0.52-0.57-0.35-1-0.84-1.32-1.47-0.3-0.63-0.45-1.37-0.45-2.2 0-0.85 0.15-1.58 0.45-2.22 0.31-0.65 0.74-1.15 1.3-1.5 0.55-0.37 1.2-0.55 1.93-0.55 0.43 0 0.85 0.07 1.26 0.21 0.42 0.15 0.8 0.38 1.14 0.7 0.34 0.31 0.61 0.73 0.81 1.25 0.2 0.53 0.3 1.17 0.3 1.93v0.54h-6.3v-1.1h5.03c0-0.45-0.1-0.86-0.28-1.23-0.18-0.36-0.44-0.65-0.78-0.85-0.33-0.21-0.72-0.32-1.18-0.32-0.5 0-0.93 0.13-1.3 0.37-0.36 0.25-0.64 0.57-0.84 0.96-0.19 0.4-0.29 0.82-0.29 1.27v0.72c0 0.62 0.1 1.15 0.32 1.58 0.22 0.42 0.52 0.75 0.9 0.97 0.39 0.22 0.83 0.33 1.34 0.33 0.33 0 0.63-0.04 0.9-0.14 0.26-0.1 0.5-0.24 0.7-0.42 0.19-0.2 0.34-0.43 0.44-0.72l1.22 0.34c-0.13 0.42-0.34 0.78-0.65 1.09-0.3 0.3-0.67 0.55-1.11 0.72-0.45 0.18-0.95 0.26-1.5 0.26Zm6.56-5.1V23h-1.26v-8.18H141v1.28h0.11c0.2-0.42 0.48-0.75 0.87-1 0.4-0.26 0.9-0.39 1.52-0.39 0.55 0 1.03 0.12 1.45 0.34 0.42 0.23 0.74 0.57 0.97 1.03 0.23 0.45 0.35 1.03 0.35 1.72V23H145v-5.11c0-0.65-0.17-1.15-0.5-1.5-0.33-0.37-0.8-0.55-1.38-0.55-0.4 0-0.76 0.09-1.07 0.26-0.31 0.18-0.56 0.43-0.74 0.76-0.18 0.34-0.27 0.74-0.27 1.22Zm7.51-3.25h1.26v8.78c0 0.5-0.09 0.94-0.26 1.3-0.17 0.38-0.43 0.66-0.78 0.86-0.34 0.2-0.78 0.3-1.3 0.3h-0.13-0.13V24.9h0.12 0.12c0.38 0 0.66-0.12 0.84-0.34 0.17-0.23 0.26-0.55 0.26-0.96v-8.78Zm0.62-1.37c-0.24 0-0.46-0.08-0.63-0.25-0.18-0.16-0.26-0.36-0.26-0.6 0-0.23 0.08-0.43 0.26-0.6 0.17-0.17 0.39-0.25 0.63-0.25 0.25 0 0.46 0.08 0.63 0.25 0.18 0.17 0.27 0.37 0.27 0.6 0 0.24-0.1 0.44-0.27 0.6-0.17 0.17-0.38 0.25-0.63 0.25Zm6.37 9.72c-0.79 0-1.47-0.17-2.04-0.52-0.56-0.35-1-0.84-1.31-1.47-0.3-0.63-0.46-1.37-0.46-2.2 0-0.85 0.15-1.58 0.46-2.22 0.3-0.65 0.74-1.15 1.29-1.5 0.55-0.37 1.2-0.55 1.94-0.55 0.42 0 0.84 0.07 1.26 0.21 0.41 0.15 0.8 0.38 1.13 0.7 0.34 0.31 0.62 0.73 0.82 1.25 0.2 0.53 0.3 1.17 0.3 1.93v0.54h-6.3v-1.1h5.02c0-0.45-0.09-0.86-0.27-1.23-0.18-0.36-0.44-0.65-0.78-0.85-0.34-0.21-0.73-0.32-1.18-0.32-0.5 0-0.94 0.13-1.3 0.37-0.37 0.25-0.64 0.57-0.84 0.96-0.2 0.4-0.3 0.82-0.3 1.27v0.72c0 0.62 0.11 1.15 0.33 1.58 0.21 0.42 0.51 0.75 0.9 0.97 0.38 0.22 0.83 0.33 1.33 0.33 0.33 0 0.63-0.04 0.9-0.14s0.5-0.24 0.7-0.42c0.2-0.2 0.34-0.43 0.45-0.72l1.21 0.34c-0.12 0.42-0.34 0.78-0.64 1.09-0.3 0.3-0.68 0.55-1.12 0.72-0.44 0.18-0.94 0.26-1.5 0.26Z"/>
+    <path
+        android:fillColor="#FF093A4C"
+        android:pathData="M32 20.25v2.1c-0.9-0.33-1.87-0.43-2.82-0.3-0.96 0.14-1.86 0.5-2.64 1.05-0.79 0.55-1.43 1.29-1.87 2.14C24.23 26.1 24 27.04 24 28h-2c0-1.22 0.28-2.43 0.82-3.52 0.53-1.1 1.31-2.06 2.28-2.8 0.97-0.75 2.09-1.27 3.29-1.52 1.2-0.24 2.43-0.21 3.61 0.1ZM30 19c-3.32 0-6-2.68-6-6 0-3.31 2.68-6 6-6 3.31 0 6 2.69 6 6 0 3.32-2.69 6-6 6Zm0-2c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4Zm7 6.59l2.12-2.13 1.42 1.42L38.4 25l2.13 2.12-1.42 1.42L37 26.4l-2.12 2.13-1.42-1.42L35.6 25l-2.13-2.12 1.42-1.42L37 23.6Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/profile_view_background.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/profile_view_background.xml
new file mode 100644
index 0000000..2af9f24
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/profile_view_background.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="#E6FFFFFF"/>
+    <padding android:left="2dp"
+        android:top="2dp"
+        android:right="2dp"
+        android:bottom="2dp"/>
+
+    <corners
+        android:topLeftRadius="30dp"
+        android:topRightRadius="30dp"
+        android:bottomLeftRadius="0dp"
+        android:bottomRightRadius="0dp"
+        />
+</shape>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
index 95516f0..15031e3 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_profile.xml
@@ -15,7 +15,7 @@
 
             android:id="@+id/imageView3"
             android:layout_width="match_parent"
-            android:layout_height="290dp"
+            android:layout_height="300dp"
             android:foreground="@drawable/b3"
             android:foregroundGravity="center_vertical|center|center_horizontal|fill"
             android:src="@drawable/b3"
@@ -23,32 +23,22 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <ImageView
-
-            android:id="@+id/imageView4"
-            android:layout_width="411dp"
-            android:layout_height="287dp"
-            app:layout_constraintBottom_toBottomOf="@+id/imageView3"
-            app:layout_constraintEnd_toEndOf="@id/imageView3"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="@+id/imageView3"
-            app:layout_constraintTop_toTopOf="@+id/imageView3"
-            app:layout_constraintVertical_bias="0.0" />
 
         <com.google.android.material.imageview.ShapeableImageView
 
             android:id="@+id/tvFragmentProfileInfoContainer"
             android:layout_width="0dp"
-            android:layout_height="220dp"
+            android:layout_height="199dp"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="156dp"
+            android:layout_marginTop="150dp"
             android:layout_marginEnd="20dp"
             android:adjustViewBounds="true"
-            android:background="#E8FFFFFF"
+            android:background="@drawable/profile_view_background"
+
             android:elevation="1dp"
             android:scaleType="fitEnd"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.494"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/imageView3"
             app:shapeAppearanceOverlay="@style/imageViewRoundedEdge" />
@@ -59,165 +49,24 @@
             android:layout_width="140dp"
             android:layout_height="140dp"
             android:layout_gravity="center"
+            android:layout_marginTop="80dp"
             android:elevation="10dp"
             app:cardCornerRadius="250dp"
-            app:layout_constraintBottom_toTopOf="@+id/tableLayout"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.498"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.77">
+            app:layout_constraintTop_toTopOf="parent">
 
             <ImageView
 
                 android:id="@+id/tvFragmentProfileProfilePicture"
-                android:layout_width="140dp"
-                android:layout_height="140dp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:elevation="10dp"
                 android:scaleType="centerCrop"
                 android:src="@drawable/ic_baseline_person_24"
                 tools:ignore="ContentDescription" />
         </androidx.cardview.widget.CardView>
 
-        <TableLayout
-            android:id="@+id/tableLayout"
-            android:layout_width="323dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="-10dp"
-
-            android:elevation="20dp"
-            android:gravity="center"
-            android:stretchColumns="1"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintEnd_toEndOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintHorizontal_bias="0.488"
-            app:layout_constraintStart_toStartOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer">
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-
-                android:gravity="center">
-
-                <TextView
-                    android:id="@+id/tvFragmentProfileName"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:text="Petar Petrović"
-
-                    android:textSize="25sp" />
-            </TableRow>
-
-            <TableRow
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-
-                android:gravity="center">
-
-                <com.google.android.material.button.MaterialButton
-                    android:layout_height="35dp"
-                    android:layout_gravity="start"
-                    android:width="150dp"
-                    android:height="10dp"
-                    android:background="@drawable/rounded_cyan_button"
-                    android:text="Prati" />
-
-                <com.google.android.material.button.MaterialButton android:layout_gravity="end"
-                    android:layout_height="35dp"
-                    android:width="150dp"
-                    android:height="10dp"
-                    android:background="@drawable/rounded_cyan_button"
-                    android:text="Poruka"
-                    />
-
-            </TableRow>
-        </TableLayout>
-
-        <LinearLayout
-            android:layout_marginTop="20dp"
-            android:elevation="30dp"
-            android:id="@+id/linearLayout3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:orientation="vertical"
-            app:layout_constraintTop_toBottomOf="@+id/tableLayout">
-<LinearLayout
-    android:orientation="horizontal"
-
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-            <TextView
-                android:id="@+id/tvFragmentProfilePosts"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="left"
-                android:layout_marginStart="40dp"
-                android:layout_marginEnd="20dp"
-                android:text="OBJAVE" />
-
-            <TextView
-                android:layout_marginStart="40dp"
-                android:layout_marginEnd="40dp"
-                android:id="@+id/tvFragmentProfileFollowers"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="PRATIOCI" />
-
-    <TextView
-        android:id="@+id/tvFragmentProfileFollow"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="40dp"
-        android:layout_gravity="right"
-        android:text="PRAĆENJA" />
-</LinearLayout>
-            <LinearLayout
-                android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="20dp"
-            android:gravity="center"
-            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tableLayout">
-
-            <TextView
-                android:id="@+id/tvFragmentProfilePostsNo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:layout_gravity="left"
-                android:layout_marginStart="60dp"
-                android:layout_marginEnd="35dp"
-
-                android:text="156" />
-
-            <TextView
-                android:id="@+id/tvFragmentProfileFollowersNo"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:text="50"
-                android:layout_gravity="left"
-                android:layout_marginStart="60dp"
-                android:layout_marginEnd="20dp"/>
-
-            <TextView
-                android:id="@+id/tvFragmentProfileFollowNo"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center"
-                android:layout_gravity="left"
-                android:layout_marginStart="40dp"
-                android:layout_marginEnd="20dp"
-                android:text="40" />
-            </LinearLayout>
-        </LinearLayout>
-
-
         <View
             android:id="@+id/divider"
             android:layout_width="409dp"
@@ -225,10 +74,10 @@
             android:background="?android:attr/listDivider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnFragmentProfileShowMyPosts" />
+            app:layout_constraintTop_toBottomOf="@+id/btnFragmentUserProfileShowPosts" />
 
         <Button
-            android:id="@+id/btnFragmentProfileShowMyPosts"
+            android:id="@+id/btnFragmentUserProfileShowPosts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -242,7 +91,7 @@
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
         <Button
-            android:id="@+id/btnFragmentProfileShowMyData"
+            android:id="@+id/btnFragmentUserProfileShowData"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
@@ -254,11 +103,11 @@
             android:textColor="@color/cardview_dark_background"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyRecensions"
+            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowRecensions"
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
         <Button
-            android:id="@+id/btnFragmentProfileShowMyRecensions"
+            android:id="@+id/btnFragmentUserProfileShowRecensions"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="36dp"
@@ -267,7 +116,7 @@
             android:stateListAnimator="@null"
             android:text="Recenzije"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
+            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowPosts"
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
         <FrameLayout
@@ -279,6 +128,120 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/divider">
         </FrameLayout>
+
+        <TableLayout
+            android:elevation="1dp"
+
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:layout_marginStart="30dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginEnd="30dp"
+            android:layout_marginBottom="8dp"
+            android:numColumns="3"
+
+            android:stretchColumns="1"
+            app:layout_constraintBottom_toBottomOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile">
+
+            <TableRow android:layout_column="1">
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileName"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:layout_column="1"
+                    android:layout_gravity="center"
+                    android:text="Petar Petrović"
+                    android:textSize="20sp"
+                    android:layout_marginBottom="5dp"/>
+            </TableRow>
+
+            <TableRow>
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_span="3">
+
+                    <ImageButton
+
+                        android:id="@+id/materialButton"
+                        android:layout_width="115dp"
+                        android:layout_height="40dp"
+                        android:layout_marginStart="16dp"
+                        android:background="@drawable/rounded_transparent_button"
+                        android:foreground="@drawable/button_follow"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.0"
+                        tools:ignore="TouchTargetSizeCheck" />
+
+                    <ImageButton
+                        android:layout_width="115dp"
+                        android:layout_height="40dp"
+                        android:layout_gravity="center"
+                        android:layout_marginEnd="16dp"
+                        android:height="40dp"
+                        android:background="@drawable/rounded_transparent_button"
+                        android:foreground="@drawable/button_chat"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.0"
+                        tools:ignore="SpeakableTextPresentCheck" />
+                </androidx.constraintlayout.widget.ConstraintLayout>
+            </TableRow>
+
+
+            <TableRow
+                android:layout_marginTop="5dp">
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfilePosts"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="OBJAVE" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollowers"
+                    android:layout_width="10dp"
+                    android:gravity="center"
+                    android:text="PRATIOCI" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollow"
+
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="PRAĆENJA" />
+            </TableRow>
+
+            <TableRow>
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfilePostsNo"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:textFontWeight="700"
+                    android:text="156" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollowersNo"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="50" />
+
+                <TextView
+                    android:id="@+id/tvFragmentUserProfileFollowNo"
+                    android:layout_width="110dp"
+                    android:gravity="center"
+                    android:text="40" />
+
+            </TableRow>
+
+        </TableLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
-- 
cgit v1.2.3