Merge branch 'develop' of http://gitlab.pmf.kg.ac.rs/BrzoDoLokacije2022/odyssey/brzodolokacije into develop

2 files changed, 46 insertions, 7 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
index a446f9a..bb917cf 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
@@ -128,7 +128,7 @@
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="@+id/divider"
-            app:layout_constraintVertical_bias="1.0"></FrameLayout>
+            app:layout_constraintVertical_bias="0.0"></FrameLayout>
 
         <TableLayout
 
@@ -228,22 +228,44 @@
                     <Button
 
                         android:id="@+id/btnActivityUserProfileFollow"
-                        android:layout_width="0dp"
+                        android:layout_width="280dp"
                         android:layout_height="30dp"
                         android:layout_marginStart="16dp"
-                        android:layout_marginEnd="8dp"
+                        android:clickable="true"
                         android:drawableLeft="@drawable/ic_outline_person_add_alt_24"
-                        android:text="PRATI"
                         android:insetTop="0dp"
                         android:insetBottom="0dp"
+                        android:backgroundTint="@color/button_main"
+                        android:text="PRATI"
+                        android:visibility="visible"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintStart_toStartOf="parent"
+                        app:layout_constraintTop_toTopOf="parent"
+                        app:layout_constraintVertical_bias="0.13"
                         app:shapeAppearanceOverlay="@style/Circular"
+                        tools:ignore="TouchTargetSizeCheck" />
+
+                    <Button
+
+                        android:id="@+id/btnActivityUserProfileUnFollow"
+                        android:layout_width="280dp"
+                        android:layout_height="30dp"
+                        android:layout_marginStart="16dp"
+                        android:clickable="false"
+                        android:drawableLeft="@drawable/ic_outline_person_remove_24"
+                        android:insetTop="0dp"
+                        android:insetBottom="0dp"
+                        android:text="NE PRATI više"
+                        android:backgroundTint="@color/unfollow"
+
                         app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toStartOf="@+id/activityUserProfileOpenChat"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintVertical_bias="0.13"
+                        app:shapeAppearanceOverlay="@style/Circular"
                         tools:ignore="TouchTargetSizeCheck" />
 
+
                     <ImageButton
                         android:id="@+id/activityUserProfileOpenChat"
                         android:layout_width="35dp"
@@ -252,11 +274,10 @@
                         android:layout_marginEnd="16dp"
                         android:height="40dp"
                         android:background="@drawable/rounded_button"
-                        android:backgroundTint="#4DB6AC"
+                        android:backgroundTint="@color/button_main"
                         android:src="@drawable/ic_round_message_24"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toEndOf="@+id/btnActivityUserProfileFollow"
                         app:layout_constraintTop_toTopOf="parent"
                         app:layout_constraintVertical_bias="0.0"
                         app:shapeAppearanceOverlay="@style/Circular"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts_profile_activity.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts_profile_activity.xml
new file mode 100644
index 0000000..2c5012e
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts_profile_activity.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.FragmentUserPostsProfileActivity">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvFragmentUserPostsProfileActivity"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
\ No newline at end of file