koflikt

8 files changed, 930 insertions, 470 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml
new file mode 100644
index 0000000..39362b7
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_change_user_data.xml
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    tools:context=".Activities.ActivityChangeUserData">
+
+    <ImageView
+        android:id="@+id/btnActivityShowFollowersAndFollowingBackToUser"
+        android:layout_width="35dp"
+        android:layout_height="35dp"
+        android:clickable="true"
+        android:src="@drawable/ic_baseline_arrow_back"
+        android:textAllCaps="false"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
+
+    <TextView
+        android:id="@+id/tvActivityUserProfileName"
+        style="@style/title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_column="1"
+        android:layout_gravity="center"
+        android:layout_marginTop="2dp"
+
+        android:text="Izmeni profil"
+        app:layout_constraintStart_toEndOf="@+id/btnActivityShowFollowersAndFollowingBackToUser"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/cvFragmentHomePageProfile"
+        android:layout_width="130dp"
+        android:layout_height="130dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="24dp"
+        android:elevation="10dp"
+        app:cardCornerRadius="250dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityUserProfileName">
+
+        <ImageView
+
+            android:id="@+id/tvActivityProfileProfilePicture"
+            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>
+
+    <androidx.cardview.widget.CardView
+        android:id="@+id/ChangeProfileEditImage"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        android:layout_gravity="center"
+        android:layout_marginTop="90dp"
+        android:elevation="5dp"
+        app:cardCornerRadius="250dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/cvFragmentHomePageProfile"
+        app:layout_constraintTop_toTopOf="@+id/cvFragmentHomePageProfile">
+
+        <ImageView
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_gravity="bottom|right"
+            android:background="@color/white"
+            android:elevation="20dp"
+            android:src="@drawable/ic_outline_edit_24" />
+    </androidx.cardview.widget.CardView>
+
+    <TextView
+        android:id="@+id/changeDataName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="60dp"
+        android:layout_marginEnd="337dp"
+        android:text="Ime"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/cvFragmentHomePageProfile" />
+
+    <EditText
+        android:id="@+id/tvActivityChangeUserDataName"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:inputType="textPersonName"
+        android:text="Name"
+        app:layout_constraintEnd_toStartOf="@+id/btnActivityChangeUserDataName"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataName" />
+
+    <TextView
+        android:id="@+id/changeDataUsername"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="40dp"
+        android:layout_marginEnd="333dp"
+        android:text="Korisničko ime"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataName" />
+
+    <EditText
+        android:id="@+id/tvActivityChangeUserDataUsername"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:ems="10"
+        android:inputType="textPersonName"
+        android:text="Name"
+        app:layout_constraintEnd_toStartOf="@+id/btnActivityChangeUserDataUsername"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataUsername" />
+
+    <Button
+        android:id="@+id/button"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="140dp"
+        android:text="Izmeni lozinku"
+        app:shapeAppearanceOverlay="@style/Circular"
+
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataUsername" />
+
+    <Button
+        android:id="@+id/button2"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="4dp"
+        app:shapeAppearanceOverlay="@style/Circular"
+
+        android:text="Sačuvaj izmene"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/button" />
+
+    <ImageView
+        android:clickable="true"
+        android:id="@+id/btnActivityChangeUserDataName"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataName"
+        app:srcCompat="@drawable/ic_outline_edit_24" />
+    <ImageView
+        android:id="@+id/btnActivityChangeUserDataNameConfirm"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataName"
+        app:srcCompat="@drawable/ic_round_check_24" />
+
+    <ImageView
+        android:clickable="true"
+        android:id="@+id/btnActivityChangeUserDataUsername"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataUsername"
+        app:srcCompat="@drawable/ic_outline_edit_24" />
+    <ImageView
+        android:id="@+id/btnActivityChangeUserDataUsernameConfirm"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="12dp"
+        android:layout_marginEnd="4dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/changeDataUsername"
+        app:srcCompat="@drawable/ic_round_check_24" />
+
+    <TextView
+        android:id="@+id/btnActivityChangeUserDataNameError"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataName" />
+
+    <TextView
+        android:id="@+id/btnActivityChangeUserDataUsernameError"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="TextView"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tvActivityChangeUserDataUsername" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
index 3824f69..744a2a2 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_single_post.xml
@@ -1,322 +1,194 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+   xmlns:tools="http://schemas.android.com/tools"
     android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="@dimen/component_padding"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_height="match_parent"
+   xmlns:app="http://schemas.android.com/apk/res-auto"
     tools:context=".Activities.ActivitySinglePost">
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:fillViewport="true">
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-        <androidx.recyclerview.widget.RecyclerView
+
+    <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/rvMain"
         android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_margin="0dp"
         android:paddingBottom="@dimen/component_padding"
-        android:layout_height="400dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-    </androidx.recyclerview.widget.RecyclerView>
-
-
-
-<androidx.constraintlayout.widget.ConstraintLayout
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    app:layout_constraintTop_toBottomOf="@id/rvMain"
-    tools:layout_editor_absoluteX="0dp">
-
-    <TextView
-        android:id="@+id/tvLocationParent"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="top|start"
-        android:padding="@dimen/text_padding"
-        android:text="Drzava, grad"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvLocationType" />
-
-    <TextView
-        android:id="@+id/tvTitle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="top|start"
-        android:padding="@dimen/text_padding"
-        android:text="Naslov"
-        android:textSize="@dimen/header1_size"
-        android:textStyle="bold"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <TextView
-        android:id="@+id/tvLocationType"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="top|start"
-        android:padding="@dimen/text_padding"
-        android:text="Tip lokacije"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
-
-    <TextView
-        android:id="@+id/tvUser"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:clickable="true"
-        android:gravity="top|start"
-        android:padding="@dimen/text_padding"
-        android:text="User"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvLocationParent" />
-
-    <ImageView
-        android:id="@+id/ivFavourite"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:layout_marginBottom="17dp"
-        android:layout_marginRight="30dp"
-        android:layout_marginTop="30dp"
-        android:clickable="true"
-        android:src="@drawable/ic_baseline_favorite_border_24"
-        app:layout_constraintBottom_toTopOf="@+id/tvLocationType"
+        app:layout_constraintBottom_toTopOf="@+id/linearLayout2"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.0" />
 
     <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/constraintLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="36dp"
+        android:id="@+id/linearLayout2"
+        android:layout_width="408dp"
+        android:layout_height="723dp"
+        android:layout_marginBottom="8dp"
+        android:background="@drawable/view_top_corner_radius"
+        android:elevation="30dp"
+        android:padding="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tvLocationParent">
+        app:layout_constraintHorizontal_bias="0.0"
+        app:layout_constraintStart_toStartOf="parent">
 
-        <LinearLayout
-            android:id="@+id/linearLayout"
+
+        <TextView
+            android:id="@+id/tvTitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:orientation="horizontal"
+            android:layout_marginTop="24dp"
+            android:gravity="top|start"
+            android:padding="@dimen/text_padding"
+            android:text="Naslov"
+            style="@style/title"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <ImageView
-                android:id="@+id/star1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:src="@android:drawable/btn_star_big_on" />
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <ImageView
-                android:id="@+id/star2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:src="@android:drawable/btn_star_big_on" />
+        <ImageView
+            android:id="@+id/imageView12"
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:src="@drawable/ic_baseline_location_on_24"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
 
-            <ImageView
-                android:id="@+id/star3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:src="@android:drawable/btn_star_big_on" />
+        <TextView
+            android:id="@+id/tvLocationParent"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="top|start"
+            android:padding="@dimen/text_padding"
+            android:text="Drzava, grad"
+            app:layout_constraintStart_toEndOf="@+id/imageView12"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
 
-            <ImageView
-                android:id="@+id/star4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:src="@android:drawable/btn_star_big_on" />
+        <TextView
+            android:id="@+id/tvLocationType"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:gravity="top|start"
+            android:padding="@dimen/text_padding"
+            android:text="Tip lokacije"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
 
-            <ImageView
-                android:id="@+id/star5"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:src="@android:drawable/btn_star_big_on" />
-        </LinearLayout>
+        <TextView
+            android:id="@+id/tvUser"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:clickable="true"
+            android:gravity="top|start"
+            android:padding="@dimen/text_padding"
+            android:text="User"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvLocationType" />
 
         <TextView
             android:id="@+id/tvRating"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
+            android:layout_marginEnd="4dp"
             android:padding="@dimen/text_padding"
             android:text="4.2"
             android:textStyle="bold"
             app:layout_constraintEnd_toStartOf="@+id/tvNumberOfRatings"
-            tools:layout_editor_absoluteY="4dp" />
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/tvNumberOfRatings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_marginTop="24dp"
             android:padding="@dimen/text_padding"
             android:text="(10,500)"
             app:layout_constraintEnd_toEndOf="parent"
-            tools:layout_editor_absoluteY="4dp" />
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/constraintLayout3"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@drawable/rounded_picture_background"
-            android:elevation="5dp"
-            android:padding="@dimen/component_padding"
-            app:layout_constraintTop_toBottomOf="@+id/linearLayout"
-            tools:layout_editor_absoluteX="0dp">
-
-            <TextView
-                android:id="@+id/tvDescriptionLabel"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:gravity="top|start"
-                android:padding="@dimen/text_padding"
-                android:text="Opis"
-                android:textStyle="bold" />
-
-            <TextView
-                android:id="@+id/tvDescription"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView"
-                app:layout_constraintTop_toBottomOf="@+id/tvDescriptionLabel" />
-
-        </androidx.constraintlayout.widget.ConstraintLayout>
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/activitySinglePostChangeHeightUp"
+            android:layout_width="100dp"
+            android:layout_height="30dp"
+            android:clickable="true"
+            android:src="@drawable/ic_round_keyboard_arrow_up_24"
+            android:text="Button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <ImageView
+            android:id="@+id/activitySinglePostChangeHeightDown"
+            android:layout_width="100dp"
+            android:layout_height="30dp"
+            android:clickable="true"
+            android:src="@drawable/ic_round_keyboard_arrow_down_24"
+            android:text="Button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        <LinearLayout
-            android:id="@+id/linearLayout2"
+        <org.osmdroid.views.MapView
+            android:id="@+id/MapDialogueMapView"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_weight="1"
-            android:orientation="horizontal"
-            android:paddingVertical="@dimen/component_padding"
-            app:layout_constraintTop_toBottomOf="@id/constraintLayout3">
-
-            <ImageButton
-                android:id="@+id/rateStar1"
-                android:layout_width="30dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:scaleType="centerCrop"
-                android:src="@drawable/empty_star" />
-
-            <ImageButton
-                android:id="@+id/rateStar2"
-                android:layout_width="30dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:scaleType="centerCrop"
-                android:src="@drawable/empty_star" />
-
-            <ImageButton
-                android:id="@+id/rateStar3"
-                android:layout_width="30dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:scaleType="centerCrop"
-                android:src="@drawable/empty_star" />
-
-            <ImageButton
-                android:id="@+id/rateStar4"
-                android:layout_width="30dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:scaleType="centerCrop"
-                android:src="@drawable/empty_star" />
-
-            <ImageButton
-                android:id="@+id/rateStar5"
-                android:layout_width="30dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:scaleType="centerCrop"
-                android:src="@drawable/empty_star" />
-
-            <Button
-                android:id="@+id/submitRating"
-                android:layout_width="30dp"
-                android:layout_height="40dp"
-                android:layout_gravity="center_vertical"
-                android:layout_weight="1"
-                android:backgroundTint="@color/white"
-                android:text="ok"
-                android:textColor="@color/black" />
-        </LinearLayout>
+            android:layout_height="150dp"
+            android:layout_marginTop="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvUser" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:layout_constraintTop_toBottomOf="@id/linearLayout2">
+            android:layout_height="400dp"
+            android:layout_marginTop="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/MapDialogueMapView">
 
-            <LinearLayout
-                android:id="@+id/postCommentLayout"
-                android:layout_width="match_parent"
+            <Button
+                android:id="@+id/btnActivitySinglePostDescription"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                app:layout_constraintStart_toStartOf="parent">
-
-                <EditText
-                    android:id="@+id/NewComment"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:hint="Unesite komentar ovde" />
-
-                <ImageButton
-                    android:id="@+id/btnPostComment"
-                    android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:backgroundTint="@color/white"
-                    android:scaleType="fitCenter"
-                    android:src="@drawable/post_comment" />
-            </LinearLayout>
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="8dp"
+                android:backgroundTint="#FFFFFF"
+                android:stateListAnimator="@null"
+                android:text="opis"
+                android:textColor="@color/cardview_dark_background"
+                app:layout_constraintBottom_toTopOf="@+id/flFragmentProfileFragmentContainer"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
 
-
-            <TextView
-                android:id="@+id/tvCommentLabel"
-                android:layout_width="wrap_content"
+            <Button
+                android:id="@+id/btnActivitySinglePostComments"
+                android:layout_width="150dp"
                 android:layout_height="wrap_content"
-                android:padding="@dimen/text_padding"
+                android:layout_marginTop="8dp"
+                android:layout_marginEnd="8dp"
+                android:layout_marginBottom="8dp"
+                android:backgroundTint="#FFFFFF"
+                android:stateListAnimator="@null"
                 android:text="Komentari"
-                android:textStyle="bold"
-                app:layout_constraintTop_toBottomOf="@id/postCommentLayout" />
-
-            <TextView
-                android:id="@+id/tvCommentCount"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="@dimen/text_padding"
-                android:text="0"
-                app:layout_constraintStart_toEndOf="@id/tvCommentLabel"
-                app:layout_constraintTop_toBottomOf="@id/postCommentLayout" />
-
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/rvComments"
-                android:layout_width="match_parent"
-                android:layout_height="0dp"
-                android:nestedScrollingEnabled="false"
-                app:layout_constraintTop_toBottomOf="@id/tvCommentLabel">
-
-            </androidx.recyclerview.widget.RecyclerView>
+                android:textColor="@color/cardview_dark_background"
+                app:layout_constraintBottom_toTopOf="@+id/flFragmentProfileFragmentContainer"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="parent" />
+
+            <FrameLayout
+                android:id="@+id/flFragmentProfileFragmentContainer"
+                android:layout_width="409dp"
+                android:layout_height="330dp"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/btnActivitySinglePostComments"
+                app:layout_constraintVertical_bias="1.0"></FrameLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.core.widget.NestedScrollView>
-</androidx.constraintlayout.widget.ConstraintLayout>
+
+ </androidx.constraintlayout.widget.ConstraintLayout>
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 cbcafc5..5c0ceb8 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
@@ -12,10 +12,10 @@
         android:layout_height="match_parent">
 
         <ImageView
-
+            android:scaleType="centerCrop"
             android:id="@+id/imageView3"
             android:layout_width="match_parent"
-            android:layout_height="250dp"
+            android:layout_height="180dp"
             android:foreground="@drawable/b3"
             android:foregroundGravity="center_vertical|center|center_horizontal|fill"
             android:src="@drawable/b3"
@@ -28,15 +28,15 @@
 
             android:id="@+id/tvFragmentProfileInfoContainer"
             android:layout_width="0dp"
-            android:layout_height="240dp"
+            android:layout_height="199dp"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="120dp"
+            android:layout_marginTop="90dp"
             android:layout_marginEnd="20dp"
             android:adjustViewBounds="true"
-            android:background="@drawable/profile_view_background"
-
+            android:background="#E8FFFFFF"
             android:elevation="1dp"
             android:scaleType="fitEnd"
+
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
@@ -46,10 +46,10 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/cvFragmentHomePageProfile"
-            android:layout_width="130dp"
-            android:layout_height="130dp"
+            android:layout_width="120dp"
+            android:layout_height="120dp"
             android:layout_gravity="center"
-            android:layout_marginTop="60dp"
+            android:layout_marginTop="24dp"
             android:elevation="10dp"
             app:cardCornerRadius="250dp"
             app:layout_constraintEnd_toEndOf="parent"
@@ -74,55 +74,54 @@
             android:background="?android:attr/listDivider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnActivityUserProfileShowPosts" />
+            app:layout_constraintTop_toBottomOf="@+id/buttons" />
+
+        <LinearLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:weightSum="3"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer">
 
         <Button
+            android:layout_weight="1"
             android:id="@+id/btnActivityUserProfileShowPosts"
-            android:layout_width="wrap_content"
+            android:layout_width="120dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="4dp"
             android:backgroundTint="#FFFFFF"
             android:stateListAnimator="@null"
             android:text="Objave"
-
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+             />
 
         <Button
+            android:layout_weight="1"
             android:id="@+id/btnFragmentUserProfileShowData"
-            android:layout_width="wrap_content"
+            android:layout_width="110dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="20dp"
             android:backgroundTint="#FFFFFF"
             android:stateListAnimator="@null"
-            android:text="Podaci"
-
+            android:text="Nalog"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowRecensions"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+            />
 
         <Button
             android:id="@+id/btnFragmentUserProfileShowRecensions"
-            android:layout_width="wrap_content"
+            android:layout_width="120dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="4dp"
             android:backgroundTint="#FFFFFF"
             android:stateListAnimator="@null"
             android:text="Recenzije"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toEndOf="@+id/btnActivityUserProfileShowPosts"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
-
+           />
+        </LinearLayout>
         <FrameLayout
+            android:layout_weight="1"
             android:id="@+id/flActivityProfileFragmentContainer"
-            android:layout_width="409dp"
-            android:layout_height="319dp"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
@@ -132,135 +131,156 @@
 
         <TableLayout
 
-            android:layout_width="363dp"
-
-            android:layout_height="wrap_content"
-            android:layout_marginStart="30dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginEnd="30dp"
-            android:layout_marginBottom="8dp"
+            android:layout_width="350dp"
+            android:layout_height="140dp"
+            android:layout_marginStart="35dp"
+            android:layout_marginEnd="35dp"
             android:elevation="1dp"
             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"
-            app:layout_constraintVertical_bias="0.35000002">
+            app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintVertical_bias="0.88">
 
             <TableRow
-                android:layout_width="match_parent"
+                                android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:layout_column="1">
+                android:layout_column="1"
+                >
 
                 <TextView
                     android:id="@+id/tvActivityUserProfileName"
                     android:layout_width="wrap_content"
                     android:layout_height="match_parent"
-                    android:layout_column="1"
                     android:layout_gravity="center"
                     android:text="Petar Petrović"
-                    android:textStyle="bold"
-                    android:textSize="23sp" />
+                    android:textSize="23sp"
+                    android:textStyle="bold" />
             </TableRow>
 
 
-            <TableRow android:layout_marginTop="20dp">
-
+            <TableRow
+                android:gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginTop="5dp">
+            <LinearLayout
+                android:orientation="horizontal"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:weightSum="3"
+                >
                 <TextView
                     android:id="@+id/tvFragmentUserProfilePosts"
-                    android:layout_width="105dp"
+                    android:layout_weight="1"
+                    android:backgroundTint="@color/white"
                     android:gravity="center"
-                    android:text="OBJAVE"
+                    android:layout_width="110dp"
+                    android:layout_height="wrap_content"
+                    android:textSize="14sp"
                     android:stateListAnimator="@null"
-                    android:backgroundTint="@color/white"
-                    android:textColor="#757471"/>
+                    android:text="OBJAVE"
+
+                    android:textColor="#757471" />
 
                 <Button
                     android:id="@+id/tvActivityUserProfileFollowers"
                     android:layout_width="110dp"
-                    android:layout_height="28dp"
+                    android:layout_height="27dp"
                     android:layout_margin="0dp"
                     android:backgroundTint="@color/white"
                     android:clickable="true"
+                    android:layout_weight="1"
                     android:gravity="center"
                     android:padding="0dp"
                     android:stateListAnimator="@null"
                     android:text="PRATIOCI"
                     android:textColor="#757471"
-
+                    android:textSize="14sp"
                     tools:ignore="TouchTargetSizeCheck" />
 
                 <Button
+                    android:textSize="14sp"
                     android:id="@+id/tvActivityUserProfileFollow"
                     android:layout_width="110dp"
-                    android:layout_height="28dp"
+                    android:layout_height="27dp"
                     android:layout_margin="0dp"
                     android:backgroundTint="@color/white"
                     android:clickable="true"
+                    android:layout_weight="1"
                     android:gravity="center"
                     android:padding="0dp"
                     android:stateListAnimator="@null"
                     android:text="PRAĆENJA"
                     android:textColor="#757471"
                     tools:ignore="TouchTargetSizeCheck" />
+            </LinearLayout>
+
             </TableRow>
 
             <TableRow
-                android:layout_height="wrap_content"
-                >
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_gravity="center"
+                android:layout_height="wrap_content">
+            <LinearLayout>
                 <TextView
                     android:id="@+id/tvActivityUserProfilePostsNo"
                     android:layout_width="110dp"
                     android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="156"
+
                     android:textSize="20dp"
                     android:textStyle="bold" />
 
                 <TextView
-                    android:id="@+id/tvActivityUserProfileFollowersNo"
                     android:layout_width="110dp"
+                    android:layout_height="wrap_content"
+                    android:id="@+id/tvActivityUserProfileFollowersNo"
                     android:gravity="center"
                     android:text="50"
                     android:textSize="20dp"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/tvActivityUserProfileFollowNo"
                     android:layout_width="110dp"
+                    android:layout_height="wrap_content"
                     android:gravity="center"
                     android:text="40"
                     android:textSize="20dp"
-                    android:textStyle="bold"/>
-
+                    android:textStyle="bold" />
+            </LinearLayout>
             </TableRow>
 
-            <TableRow
-                android:layout_height="wrap_content"
-                android:layout_marginTop="10dp"
-                >
 
-                <androidx.constraintlayout.widget.ConstraintLayout android:layout_span="3">
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="10dp"
+                    android:layout_marginStart="10dp"
+                    android:layout_marginEnd="10dp"
+                    android:layout_gravity="center">
 
                     <Button
 
                         android:id="@+id/btnActivityUserProfileFollow"
                         android:layout_width="280dp"
-                        android:layout_height="30dp"
-                        android:layout_marginStart="16dp"
+                        android:layout_height="35dp"
+                        android:backgroundTint="@color/button_main"
                         android:clickable="true"
                         android:drawableLeft="@drawable/ic_outline_person_add_alt_24"
                         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:layout_constraintVertical_bias="0.0"
                         app:shapeAppearanceOverlay="@style/Circular"
                         tools:ignore="TouchTargetSizeCheck" />
 
@@ -268,29 +288,26 @@
 
                         android:id="@+id/btnActivityUserProfileUnFollow"
                         android:layout_width="280dp"
-                        android:layout_height="30dp"
-                        android:layout_marginStart="16dp"
+                        android:layout_height="35dp"
+                        android:backgroundTint="@color/unfollow"
                         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"
 
+                        android:text="NE PRATI više"
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintStart_toStartOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.13"
+                        app:layout_constraintVertical_bias="0.0"
                         app:shapeAppearanceOverlay="@style/Circular"
                         tools:ignore="TouchTargetSizeCheck" />
 
-
                     <ImageButton
                         android:id="@+id/activityUserProfileOpenChat"
                         android:layout_width="35dp"
-                        android:layout_height="30dp"
+                        android:layout_height="35dp"
                         android:layout_gravity="center"
-                        android:layout_marginEnd="16dp"
                         android:height="40dp"
                         android:background="@drawable/rounded_button"
                         android:backgroundTint="@color/button_main"
@@ -298,11 +315,10 @@
                         app:layout_constraintBottom_toBottomOf="parent"
                         app:layout_constraintEnd_toEndOf="parent"
                         app:layout_constraintTop_toTopOf="parent"
-                        app:layout_constraintVertical_bias="0.0"
                         app:shapeAppearanceOverlay="@style/Circular"
                         tools:ignore="SpeakableTextPresentCheck,TouchTargetSizeCheck" />
+
                 </androidx.constraintlayout.widget.ConstraintLayout>
-            </TableRow>
         </TableLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml
index f39acf2..12c37e8 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_home_page.xml
@@ -82,7 +82,7 @@
         app:layout_constraintTop_toBottomOf="@+id/brzodolokacije">
 
 
-        <com.google.android.material.textfield.TextInputEditText
+        <AutoCompleteTextView
             android:id="@+id/etFragmentHomePageSearch"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -92,6 +92,7 @@
             android:paddingLeft="15dp" />
 
         <com.google.android.material.button.MaterialButton
+            android:id="@+id/mbFragmentHomePageSearchButton"
             android:layout_width="49dp"
             android:layout_height="match_parent"
             android:layout_gravity="right"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
index 4a91f49..eaf014d 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_my_profile_info.xml
@@ -4,27 +4,64 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:orientation="vertical"
     tools:context=".Fragments.FragmentMyProfileInfo">
 
-    <!-- TODO: Update blank fragment layout -->
-
-    <TextView
-        android:id="@+id/textView5"
+    <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="Moji podaci"
-        tools:layout_editor_absoluteX="0dp"
-        tools:layout_editor_absoluteY="0dp" />
+        android:layout_height="0dp"
+        android:orientation="vertical"
+        app:layout_constraintBottom_toTopOf="@+id/buttonLogOut"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <Button
+            android:id="@+id/changeAccountData"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_outline_account_circle_24"
+            android:text="Izmena Naloga" />
+
+        <Button
+            android:id="@+id/ChangePassword"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_outline_change_circle_24"
+            android:text="Promena Lozinke" />
+
+        <Button
+            android:id="@+id/getAccoutStatistics"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_outline_stats_24"
+            android:text="Pregled statistike" />
+
+        <Button
+            android:id="@+id/getMyFavorite"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_round_favorite_border_24"
+            android:text="Objave koje vam se sviđaju" />
+
+        <Button
+            android:id="@+id/inviteFriends"
+            style="@style/clean_button_margin"
+            android:drawableLeft="@drawable/ic_outline_share_24"
+            android:text="Pozovite prijatelje" />
+    </LinearLayout>
 
     <Button
         android:id="@+id/buttonLogOut"
-        android:layout_width="wrap_content"
+        style="@style/Circular"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="Log out"
-        app:layout_constraintBottom_toBottomOf="@+id/textView5"
-        app:layout_constraintEnd_toEndOf="@+id/textView5"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/textView5" />
+        android:layout_gravity="bottom"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:drawableLeft="@drawable/ic_baseline_logout_24"
+        android:text="Izlogujte se"
+        android:drawableTint="@color/white"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
index 7531cf5..8fe6ee6 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_profile.xml
@@ -15,7 +15,7 @@
 
             android:id="@+id/imageView3"
             android:layout_width="match_parent"
-            android:layout_height="290dp"
+            android:layout_height="190dp"
             android:foreground="@drawable/b3"
             android:foregroundGravity="center_vertical|center|center_horizontal|fill"
             android:src="@drawable/b3"
@@ -26,8 +26,8 @@
         <ImageView
 
             android:id="@+id/imageView4"
-            android:layout_width="411dp"
-            android:layout_height="287dp"
+            android:layout_width="match_parent"
+            android:layout_height="190dp"
             app:layout_constraintBottom_toBottomOf="@+id/imageView3"
             app:layout_constraintEnd_toEndOf="@id/imageView3"
             app:layout_constraintHorizontal_bias="0.0"
@@ -41,7 +41,7 @@
             android:layout_width="0dp"
             android:layout_height="199dp"
             android:layout_marginStart="20dp"
-            android:layout_marginTop="156dp"
+            android:layout_marginTop="90dp"
             android:layout_marginEnd="20dp"
             android:adjustViewBounds="true"
             android:background="#E8FFFFFF"
@@ -56,10 +56,9 @@
 
         <androidx.cardview.widget.CardView
             android:id="@+id/cvFragmentHomePageProfile"
-            android:layout_width="140dp"
-            android:layout_height="140dp"
+            android:layout_width="120dp"
+            android:layout_height="120dp"
             android:layout_gravity="center"
-            android:layout_marginTop="24dp"
             android:elevation="10dp"
             app:cardCornerRadius="250dp"
             app:layout_constraintBottom_toTopOf="@+id/tableLayout"
@@ -67,14 +66,14 @@
             app:layout_constraintHorizontal_bias="0.498"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintVertical_bias="0.887">
+            app:layout_constraintVertical_bias="0.65999997">
 
             <ImageView
 
                 android:id="@+id/tvFragmentProfileProfilePicture"
-                android:layout_width="140dp"
-                android:layout_height="140dp"
-                android:elevation="10dp"
+                android:layout_width="120dp"
+                android:layout_height="120dp"
+                android:elevation="20dp"
                 android:scaleType="centerCrop"
                 android:src="@drawable/ic_baseline_person_24"
                 tools:ignore="ContentDescription" />
@@ -99,7 +98,7 @@
 
         <TableLayout
             android:id="@+id/tableLayout"
-            android:layout_width="323dp"
+            android:layout_width="0dp"
             android:layout_height="120dp"
             android:elevation="20dp"
             android:gravity="center"
@@ -107,18 +106,23 @@
             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_constraintStart_toStartOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintTop_toTopOf="@+id/tvFragmentProfileInfoContainer"
+            app:layout_constraintVertical_bias="0.87">
 
             <TableRow
                 android:layout_width="fill_parent"
                 android:layout_height="wrap_content"
-
                 android:gravity="center">
 
                 <TextView
                     android:id="@+id/tvFragmentProfileName"
+                    android:textSize="23sp"
+                    android:textStyle="bold"
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
+                    android:gravity="center"
+                    android:layout_marginBottom="10dp"
                     android:text="Petar Petrović" />
             </TableRow>
 
@@ -133,119 +137,182 @@
                     android:layout_width="match_parent"
                     android:layout_height="match_parent"
                     android:gravity="center"
-                    android:text="#PetarP" />
+                    android:text="PetarP"
+                    android:textSize="17sp" />
             </TableRow>
 
-            <Space android:layout_height="20dp"></Space>
-
             <TableRow
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center">
+                android:layout_height="100dp">
 
-                <TextView
-                    android:id="@+id/tvFragmentProfilePosts"
-                    android:gravity="center"
-                    android:text="OBJAVE" />
+                <Button
+                    android:layout_height="8dp"
+                    android:background="@drawable/rounded_transparent_button"
+                    android:clickable="false"
+                    android:visibility="invisible" />
+            </TableRow>
 
-                <TextView
-                    android:id="@+id/tvFragmentProfileFollowers"
-                    android:gravity="center"
-                    android:clickable="true"
-                    android:text="PRATIOCI" />
 
-                <TextView
-                    android:id="@+id/tvFragmentProfileFollow"
-                    android:gravity="center"
-                    android:text="PRAĆENJA" />
+            <TableRow
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:weightSum="1">
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:weightSum="3">
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfilePosts"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:width="100dp"
+                        android:textSize="15dp"
+                        android:textColor="#757471"
+                        android:gravity="center"
+                        android:text="OBJAVE" />
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfileFollowers"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:width="100dp"
+                        android:textSize="15sp"
+                        android:clickable="true"
+                        android:textColor="#757471"
+                        android:gravity="center"
+                        android:text="PRATIOCI" />
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfileFollow"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:width="100dp"
+                        android:gravity="center"
+                        android:textSize="15sp"
+                        android:textColor="#757471"
+                        android:text="PRAĆENJA" />
+                </LinearLayout>
             </TableRow>
 
             <TableRow
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:gravity="center">
-
-                <TextView
-                    android:id="@+id/tvFragmentProfilePostsNo"
-                    android:gravity="center"
-                    android:text="156" />
-
-                <TextView
-                    android:id="@+id/tvFragmentProfileFollowersNo"
-                    android:gravity="center"
-                    android:text="50" />
-
-                <TextView
-                    android:id="@+id/tvFragmentProfileFollowNo"
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center"
-                    android:text="40" />
+                android:gravity="center"
+                android:weightSum="1">
+
+                <LinearLayout>
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfilePostsNo"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="156"
+                        android:textSize="20dp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfileFollowersNo"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="50"
+                        android:textSize="20dp"
+                        android:textStyle="bold" />
+
+                    <TextView
+                        android:id="@+id/tvFragmentProfileFollowNo"
+                        android:layout_width="110dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="center"
+                        android:text="40"
+                        android:textSize="20dp"
+                        android:textStyle="bold" />
+                </LinearLayout>
             </TableRow>
         </TableLayout>
 
 
-        <View
-            android:id="@+id/divider"
-            android:layout_width="409dp"
-            android:layout_height="40dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnFragmentProfileShowMyPosts" />
-
-        <Button
-            android:id="@+id/btnFragmentProfileShowMyPosts"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginStart="20dp"
-            android:layout_marginTop="4dp"
-            android:backgroundTint="#FFFFFF"
-            android:stateListAnimator="@null"
-            android:text="Objave"
-
-            android:textColor="@color/cardview_dark_background"
+            android:weightSum="3"
+            app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer">
 
-        <Button
-            android:id="@+id/btnFragmentProfileShowMyData"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:layout_marginEnd="20dp"
-            android:backgroundTint="#FFFFFF"
-            android:stateListAnimator="@null"
-            android:text="Podaci"
+            <Button
+                android:id="@+id/btnFragmentProfileShowMyPosts"
+                android:layout_width="110dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:backgroundTint="#FFFFFF"
+                android:stateListAnimator="@null"
+                android:text="Objave"
+                android:textColor="@color/cardview_dark_background"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
+            <Button
+                android:id="@+id/btnFragmentProfileShowMyRecensions"
+                android:layout_width="110dp"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_weight="1"
+                android:backgroundTint="#FFFFFF"
+                android:stateListAnimator="@null"
+                android:text="Istorija"
+                android:textColor="@color/cardview_dark_background"
+                app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
+                app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+
+            <Button
+                android:id="@+id/btnFragmentProfileShowMyData"
+                android:layout_width="110dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:backgroundTint="#FFFFFF"
+                android:stateListAnimator="@null"
 
-            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_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+                android:text="Nalog"
+                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_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
-        <Button
-            android:id="@+id/btnFragmentProfileShowMyRecensions"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="36dp"
-            android:layout_marginTop="4dp"
-            android:backgroundTint="#FFFFFF"
-            android:stateListAnimator="@null"
-            android:text="Istorija"
-            android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentProfileShowMyPosts"
-            app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
+        </LinearLayout>
 
         <FrameLayout
             android:id="@+id/flFragmentProfileFragmentContainer"
-            android:layout_width="409dp"
-            android:layout_height="319dp"
-            android:layout_marginTop="40dp"
+            android:layout_width="match_parent"
+            android:layout_height="0dp"
+            android:layout_marginTop="4dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="@+id/divider">
-        </FrameLayout>
+            app:layout_constraintTop_toBottomOf="@+id/divider6"></FrameLayout>
+
+        <View
+            android:id="@+id/divider6"
+            android:layout_width="409dp"
+            android:layout_height="1dp"
+            android:layout_marginTop="4dp"
+            android:background="?android:attr/listDivider"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/buttons" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml
new file mode 100644
index 0000000..cb5db29
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_comments.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".FragmentSinglePostComments">
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+
+        <TextView
+            android:id="@+id/tvCommentLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/text_padding"
+            android:text="Komentari"
+            android:textStyle="bold"
+            style="@style/title"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tvCommentCount"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:padding="@dimen/text_padding"
+            android:text="0"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
+            app:layout_constraintStart_toEndOf="@+id/tvCommentLabel"
+            app:layout_constraintTop_toTopOf="parent" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/rvComments"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:nestedScrollingEnabled="false"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        tools:layout_editor_absoluteY="282dp">
+
+    </androidx.recyclerview.widget.RecyclerView>
+
+    <LinearLayout
+        android:id="@+id/postCommentLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <EditText
+            android:id="@+id/NewComment"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="Unesite komentar ovde" />
+
+        <ImageButton
+            android:id="@+id/btnPostComment"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:backgroundTint="@color/white"
+            android:scaleType="fitCenter"
+            android:src="@drawable/post_comment" />
+
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml
new file mode 100644
index 0000000..c2ad49b
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_single_post_description.xml
@@ -0,0 +1,187 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Fragments.FragmentSinglePostDescription">
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraintLayout3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/rounded_picture_background"
+        android:padding="@dimen/component_padding"
+        app:layout_constraintTop_toBottomOf="@+id/linearLayout"
+        tools:layout_editor_absoluteX="0dp">
+
+        <TextView
+            android:id="@+id/tvDescriptionLabel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="362dp"
+            android:gravity="top|start"
+            android:padding="@dimen/text_padding"
+            android:text="Opis"
+            android:textSize="@dimen/header1_size"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/tvDescription"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="TextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextViewTextView"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvDescriptionLabel" />
+
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="32dp"
+            android:text="Oceni"
+            android:textColor="@color/cardview_dark_background"
+            android:textSize="@dimen/header1_size"
+            android:textStyle="bold"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.005"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tvDescription" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:orientation="horizontal"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/title">
+
+            <ImageView
+                android:id="@+id/rateStar1"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_round_star_outline_24" />
+
+            <ImageView
+                android:id="@+id/rateStar2"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_round_star_outline_24" />
+
+            <ImageView
+                android:id="@+id/rateStar3"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_round_star_outline_24" />
+
+            <ImageView
+                android:id="@+id/rateStar4"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_round_star_outline_24" />
+
+            <ImageView
+                android:id="@+id/rateStar5"
+                android:layout_width="50dp"
+                android:layout_height="50dp"
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_round_star_outline_24" />
+
+
+        </LinearLayout>
+        <!--<LinearLayout
+            android:id="@+id/linearLayout2"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_marginTop="24dp"
+
+
+            android:paddingVertical="@dimen/component_padding"
+            app:layout_constraintTop_toBottomOf="@id/constraintLayout3"
+            tools:layout_editor_absoluteX="10dp">
+
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Oceni"
+                style="@style/title"
+                android:textColor="@color/cardview_dark_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tvDescriptionLabel" />
+
+            <ImageButton
+                android:id="@+id/rateStar1"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+
+                android:scaleType="centerCrop"
+                android:src="@drawable/empty_star" />
+
+            <ImageButton
+                android:id="@+id/rateStar2"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+
+                android:scaleType="centerCrop"
+                android:src="@drawable/empty_star" />
+
+            <ImageButton
+                android:id="@+id/rateStar3"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+
+                android:scaleType="centerCrop"
+                android:src="@drawable/empty_star" />
+
+            <ImageButton
+                android:id="@+id/rateStar4"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+
+                android:scaleType="centerCrop"
+                android:src="@drawable/empty_star" />
+
+            <ImageButton
+                android:id="@+id/rateStar5"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+
+                android:scaleType="centerCrop"
+                android:src="@drawable/ic_round_star_outline_24">
+
+            <Button
+                android:id="@+id/submitRating"
+                android:layout_width="30dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center_vertical"
+                android:layout_weight="1"
+
+                android:text="ok"/>
+        </LinearLayout>-->
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+</FrameLayout>
\ No newline at end of file