Izmenjen izgled activity_add_post i activity_capture_post.

14 files changed, 228 insertions, 133 deletions

diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..6d9839f
--- /dev/null
+++ b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetDropDown">
+    <targetSelectedWithDropDown>
+      <Target>
+        <type value="QUICK_BOOT_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="VIRTUAL_DEVICE_PATH" />
+            <value value="C:\Users\TAMARA\.android\avd\Pixel_3a_XL_API_33.avd" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </targetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-11-27T22:12:40.688602400Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
index 2d305a6..995ef4d 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityAddPost.kt
@@ -15,6 +15,7 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.AppCompatImageView
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.setMargins
 import com.example.brzodolokacije.Models.Location
@@ -57,6 +58,9 @@ class ActivityAddPost : AppCompatActivity() {
     var longitude:Double=incorectCoord
     var latitude:Double=incorectCoord
     var progressDialog:ProgressDialog?=null
+    private lateinit var addDescription:Button
+
+
     //private var paths :ArrayList<String?>?=null
     private var place=0;
     override fun onCreate(savedInstanceState: Bundle?) {
@@ -75,7 +79,7 @@ class ActivityAddPost : AppCompatActivity() {
         showNextImage=findViewById<View>(R.id.nextImage) as Button
         showPreviousImage=findViewById<View>(R.id.previousImage) as Button
         switcher=findViewById<View>(R.id.isActivityAddPostSwitcher) as ImageSwitcher
-        location=findViewById<View>(R.id.etActivityAddPostLocation) as EditText
+        //location=findViewById<View>(R.id.etActivityAddPostLocation) as EditText
         description=findViewById<View>(R.id.etActivityAddPostDescription) as EditText
         post=findViewById<View>(R.id.btnActivityAddPostPost) as Button
         addLocation=findViewById<View>(R.id.btnActivityAddPostAddLocation) as Button
@@ -83,6 +87,13 @@ class ActivityAddPost : AppCompatActivity() {
         tagButtonAdd = findViewById<View>(R.id.btnActivityAddPostAddTag) as Button
         tagLayout =  findViewById<View>(R.id.llTags) as LinearLayout
 
+        addDescription=findViewById<View>(R.id.tvActivityAddPostDescriptiontext)as Button
+
+        tagText.isGone=true
+        tagText.isVisible=false
+        description.isGone=true
+        description.isVisible=false
+
         progressDialog= ProgressDialog(this)
         progressDialog!!.setMessage("Molimo sacekajte!!!")
         progressDialog!!.setCancelable(false)
@@ -100,9 +111,15 @@ class ActivityAddPost : AppCompatActivity() {
                 myIntent.putExtra("search",location.text.toString())
             startActivityForResult(myIntent,LOCATIONREQCODE)
         }
-
+        addDescription.setOnClickListener {
+            description.isGone=false
+            description.isVisible=true
+        }
         //dodavanje i brisanje tagova
         tagButtonAdd.setOnClickListener {
+            tagText.isGone=false
+            tagText.isVisible=true
+
             if(tagList.count()<5) {
                 var tagstr = tagText.text.toString()
                 var newbtn = Button(this)
@@ -179,15 +196,15 @@ class ActivityAddPost : AppCompatActivity() {
         }
 
         post.setOnClickListener{
-            locationString=location.text.toString().trim()
+            //locationString=location.text.toString().trim()
             descriptionString=description.text.toString().trim()
             //prazan unos?
-            if(locationString.isEmpty()) {
+           /* if(locationString.isEmpty()) {
                 location.hint="Unesite naziv lokaciju"
                 location.setHintTextColor(Color.RED)
-            }
+            }*/
             if(descriptionString.isEmpty()) {
-                description.hint="Unesite lokaciju"
+                description.hint="Unesite opis"
                 description.setHintTextColor(Color.RED)
             }
             if(longitude!=incorectCoord && latitude!=incorectCoord){
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
index b02abad..2321f18 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityCapturePost.kt
@@ -17,6 +17,7 @@ import androidx.activity.result.contract.ActivityResultContracts
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.core.view.setMargins
 import com.example.brzodolokacije.Models.Location
@@ -40,7 +41,7 @@ import java.io.InputStream
 class ActivityCapturePost : AppCompatActivity() {
 
     private lateinit var takePhoto: Button
-    private lateinit var location: EditText
+    //private lateinit var location: EditText
     private lateinit var description: EditText
     private lateinit var locationString: String
     private lateinit var descriptionString: String
@@ -54,6 +55,7 @@ class ActivityCapturePost : AppCompatActivity() {
     private lateinit var tagButtonAdd:Button
     private lateinit var tagList: MutableList<String>
     private var tagidcounter:Int = 0
+    private lateinit var addDescription:Button
 
     val incorectCoord:Double=1000.0
     val LOCATIONREQCODE=123
@@ -68,7 +70,7 @@ class ActivityCapturePost : AppCompatActivity() {
         tagButtons= mutableListOf()
         tagidcounter = 0
 
-        location = findViewById<View>(R.id.etActivityCapturePostLocation) as EditText
+        //location = findViewById<View>(R.id.etActivityCapturePostLocation) as EditText
         description = findViewById<View>(R.id.etActivityCapturePostDescription) as EditText
         post = findViewById<View>(R.id.btnActivityCapturePostPost) as Button
         showImage = findViewById<View>(R.id.ivActivityCapturePostImage) as ImageView
@@ -78,14 +80,28 @@ class ActivityCapturePost : AppCompatActivity() {
         tagButtonAdd = findViewById<View>(R.id.btnActivityAddPostAddTagCap) as Button
         tagLayout =  findViewById<View>(R.id.llTagsCap) as LinearLayout
 
+        addDescription=findViewById<View>(R.id.tvActivityCapturePostDescriptiontext)as Button
+
+
         progressDialog= ProgressDialog(this)
         progressDialog!!.setMessage("Molimo sacekajte!!!")
         progressDialog!!.setCancelable(false)
         progressDialog!!.setCanceledOnTouchOutside(false)
 
+        tagText.isGone=true
+        tagText.isVisible=false
+        description.isGone=true
+        description.isVisible=false
 
+        addDescription.setOnClickListener {
+            description.isGone=false
+            description.isVisible=true
+        }
         //dodavanje i brisanje tagova
         tagButtonAdd.setOnClickListener {
+            tagText.isGone=false
+            tagText.isVisible=true
+
             if(tagList.count()<5) {
                 var tagstr = tagText.text.toString()
                 var newbtn = Button(this)
@@ -168,8 +184,8 @@ class ActivityCapturePost : AppCompatActivity() {
 
         addLocation.setOnClickListener {
             val myIntent = Intent(this, MapsActivity::class.java)
-            if(location.text!=null && !location.text.trim().equals(""))
-                myIntent.putExtra("search",location.text.toString())
+           // if(location.text!=null && !location.text.trim().equals(""))
+              //  myIntent.putExtra("search",location.text.toString())
             startActivityForResult(myIntent,LOCATIONREQCODE)
         }
 
@@ -198,12 +214,12 @@ class ActivityCapturePost : AppCompatActivity() {
         }
 
         post.setOnClickListener {
-            locationString = location.text.toString().trim()
+           // locationString = location.text.toString().trim()
             descriptionString = description.text.toString().trim()
             //prazan unos?
             if (locationString.isEmpty()) {
-                location.hint = "Unesite lokaciju"
-                location.setHintTextColor(Color.RED)
+            //    location.hint = "Unesite lokaciju"
+            //    location.setHintTextColor(Color.RED)
             }else
             if (descriptionString.isEmpty()) {
                 description.hint = "Unesite opis"
@@ -224,8 +240,8 @@ class ActivityCapturePost : AppCompatActivity() {
             longitude=bundle!!.getDouble("longitude",incorectCoord)
             latitude=bundle!!.getDouble("latitude",incorectCoord)
             var locName=bundle!!.getString("name")
-            if(location.text.toString().trim().equals("") && locName!=null && !locName.toString().trim().equals(""))
-                location.setText(locName, TextView.BufferType.EDITABLE)
+            //if(location.text.toString().trim().equals("") && locName!=null && !locName.toString().trim().equals(""))
+            //    location.setText(locName, TextView.BufferType.EDITABLE)
         }
     }
     var f:File?=null
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
index 50c2b0e..56e9190 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivityUserProfile.kt
@@ -1,10 +1,17 @@
 package com.example.brzodolokacije.Activities
 
 import android.os.Bundle
+import android.widget.Button
+import android.widget.FrameLayout
+import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.TextView
+import androidx.annotation.DrawableRes
 import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
 import com.bumptech.glide.Glide
+import com.example.brzodolokacije.Fragments.FragmentShowUserPosts
+import com.example.brzodolokacije.Models.User
 import com.example.brzodolokacije.Models.UserReceive
 import com.example.brzodolokacije.R
 import com.example.brzodolokacije.Services.RetrofitHelper
@@ -16,7 +23,10 @@ class ActivityUserProfile : AppCompatActivity() {
     private lateinit var followersNumber:TextView
     private lateinit var followingNumber:TextView
     private lateinit var profilePicture:ImageView
-
+    private lateinit var followUser: ImageButton
+    private lateinit var showUserPosts: Button
+    private lateinit var fragmentContainer: FrameLayout
+    private lateinit var myObject:UserReceive
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_user_profile)
@@ -26,16 +36,20 @@ class ActivityUserProfile : AppCompatActivity() {
         followersNumber=findViewById(R.id.tvActivityUserProfileFollowersNo)
         followingNumber=findViewById(R.id.tvActivityUserProfileFollowNo)
         profilePicture=findViewById(R.id.tvActivityProfileProfilePicture)
+        followUser=findViewById(R.id.ibActivityUserProfileFollow)
+        showUserPosts=findViewById(R.id.btnActivityUserProfileShowPosts)
+        fragmentContainer=findViewById(R.id.flActivityProfileFragmentContainer)
+
         val jsonMyObject: String
         val extras = intent.extras
         if (extras != null) {
             jsonMyObject = extras.getString("user")!!
-            val myObject: UserReceive = Gson().fromJson(jsonMyObject, UserReceive::class.java)
+            myObject= Gson().fromJson(jsonMyObject, UserReceive::class.java)
 
             name.text=myObject.name
             postsNumber.text=myObject.postNumber.toString()
-            followersNumber.text="0"
-            followingNumber.text="0"
+            followersNumber.text=myObject.followers.toString()
+            followingNumber.text=myObject.following.toString()
 
             if(myObject.pfp!=null) {
                 Glide.with(this)
@@ -45,5 +59,19 @@ class ActivityUserProfile : AppCompatActivity() {
             }
         }
 
+        followUser.setOnClickListener{
+
+        }
+
+        showUserPosts.setOnClickListener {
+            val bundle = Bundle()
+            bundle.putString("user", Gson().toJson(myObject))
+            val fragment = Fragment()
+            fragment.arguments = bundle
+            getSupportFragmentManager().beginTransaction()
+                .replace(R.id.flActivityProfileFragmentContainer,FragmentShowUserPosts()).commit()
+
+        }
     }
+
 }
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowUserPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowUserPosts.kt
new file mode 100644
index 0000000..6afd619
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentShowUserPosts.kt
@@ -0,0 +1,28 @@
+package com.example.brzodolokacije.Fragments
+
+import android.content.Intent.getIntent
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.fragment.app.Fragment
+import com.example.brzodolokacije.Models.UserReceive
+import com.google.gson.Gson
+
+
+class FragmentShowUserPosts : Fragment() {
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        var view=inflater.inflate(com.example.brzodolokacije.R.layout.fragment_show_user_posts, container, false)
+
+        return view
+    }
+
+
+
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
index 43c2109..88685e4 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Services/RetrofitHelper.kt
@@ -7,8 +7,8 @@ import retrofit2.converter.gson.GsonConverterFactory
 
 
 object RetrofitHelper {
-    val baseUrl="http://10.0.2.2:5279"
-    //val baseUrl="http://147.91.204.115:10082"
+    //val baseUrl="http://10.0.2.2:5279"
+    val baseUrl="http://147.91.204.115:10082"
     private var retrofit_noauth: IBackendApi? = null
     private var retrofit_auth: IBackendApi? = null
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_description_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_description_24.xml
new file mode 100644
index 0000000..6c09587
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_description_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#F1DB24"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_tag_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_tag_24.xml
new file mode 100644
index 0000000..608a7a3
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_tag_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#F1DB24"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M20,10L20,8h-4L16,4h-2v4h-4L10,4L8,4v4L4,8v2h4v4L4,14v2h4v4h2v-4h4v4h2v-4h4v-2h-4v-4h4zM14,14h-4v-4h4v4z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
index fbe2230..96ac3ff 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_add_post.xml
@@ -46,66 +46,47 @@
         tools:ignore="SpeakableTextPresentCheck" />
 
     <Button
-        android:clickable="false"
         android:id="@+id/btnActivityAddPostUploadFromGallery"
         android:layout_width="177dp"
         android:layout_height="19dp"
+        android:clickable="false"
         android:text="Otvori galeriju"
         android:visibility="invisible"
         app:cornerRadius="20dp"
-        app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostLocationtext"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddLocation"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
-        android:id="@+id/tvActivityAddPostLocationtext"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="16dp"
-        android:text="Lokacija"
-        app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostLocation"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent" />
-
-    <EditText
-        android:id="@+id/etActivityAddPostLocation"
-        android:layout_width="200dp"
-        android:layout_height="50dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:ems="10"
-        android:hint="Reykjavik, Iceland"
-        android:inputType="textEmailAddress"
-        app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext"
-        app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/btnActivityAddPostAddLocation"
         android:layout_width="wrap_content"
         android:layout_height="50dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginEnd="16dp"
-        android:background="@drawable/rounded_cyan_button"
-        android:backgroundTint="#1C789A"
+        android:stateListAnimator="@null"
+        android:backgroundTint="@color/white"
+        android:drawableLeft="@drawable/ic_baseline_location_on_24"
         android:text="Dodaj lokaciju"
+        android:textColor="#757471"
         app:layout_constraintBottom_toTopOf="@+id/tvActivityAddPostDescriptiontext"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/etActivityAddPostLocation" />
-
+        app:layout_constraintHorizontal_bias="0.074"
+        app:layout_constraintStart_toStartOf="parent" />
 
-    <TextView
+    <Button
         android:id="@+id/tvActivityAddPostDescriptiontext"
-        android:layout_width="match_parent"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"
-        android:text="Opis"
+        android:backgroundTint="@color/white"
+        android:drawableLeft="@drawable/ic_baseline_description_24"
+        android:stateListAnimator="@null"
+        android:text="Dodaj opis"
+        android:textColor="#757471"
         app:layout_constraintBottom_toTopOf="@+id/etActivityAddPostDescription"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent" />
 
     <EditText
@@ -117,7 +98,8 @@
         android:ems="10"
         android:hint="Reykjavik, Iceland"
         android:inputType="textEmailAddress"
-        app:layout_constraintBottom_toTopOf="@+id/llTags"
+        android:visibility="gone"
+        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTag"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
@@ -164,29 +146,27 @@
         android:id="@+id/acTags"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="20dp"
-        android:layout_marginRight="20dp"
+        android:layout_marginStart="28dp"
         android:hint="Planina,Reka,Park..."
+        android:maxLength="12"
         android:minHeight="48dp"
-        android:maxLength= "12"
+        android:visibility="gone"
         app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
-        app:layout_constraintEnd_toStartOf="@+id/btnActivityAddPostAddTag"
         app:layout_constraintStart_toStartOf="parent" />
 
     <Button
         android:id="@+id/btnActivityAddPostAddTag"
         android:layout_width="wrap_content"
         android:layout_height="40dp"
-        android:layout_marginTop="5dp"
-        android:layout_marginEnd="20dp"
-        android:layout_marginStart="20dp"
-        android:layout_marginBottom="5dp"
-        android:background="@drawable/rounded_cyan_button"
-        android:backgroundTint="#1C789A"
+        android:layout_marginStart="16dp"
+        android:backgroundTint="@color/white"
+        android:drawableLeft="@drawable/ic_baseline_tag_24"
+        android:stateListAnimator="@null"
+
         android:text="Dodaj tag"
-        app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostPost"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/llTags" />
+        android:textColor="#757471"
+        app:layout_constraintBottom_toTopOf="@+id/acTags"
+        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/activity_capture_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
index 2b64a27..e93fd54 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_capture_post.xml
@@ -14,8 +14,10 @@
             android:scaleType="fitCenter"
             app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostCapture"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.0"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintVertical_bias="1.0"
             tools:ignore="ImageContrastCheck"
             tools:srcCompat="@tools:sample/avatars" />
 
@@ -23,68 +25,46 @@
             android:id="@+id/btnActivityCapturePostCapture"
             android:layout_width="68dp"
             android:layout_height="15dp"
+            android:clickable="false"
             android:visibility="invisible"
             app:cornerRadius="30dp"
             app:icon="@android:drawable/ic_menu_camera"
             app:iconTint="#FFFFFF"
-            android:clickable="false"
-            app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostLocationtext"
+            app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostAddLocation"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.498"
             app:layout_constraintStart_toStartOf="parent"
             tools:ignore="SpeakableTextPresentCheck" />
 
-        <TextView
-            android:id="@+id/tvActivityCapturePostLocationtext"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:text="Lokacija"
-            app:layout_constraintBottom_toTopOf="@+id/etActivityCapturePostLocation"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent" />
 
-        <EditText
-            android:id="@+id/etActivityCapturePostLocation"
-            android:layout_width="200dp"
-            android:layout_height="50dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:ems="10"
-            android:hint="Reykjavik, Iceland"
-            android:importantForAutofill="no"
-            android:inputType="textEmailAddress"
-            app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostDescriptiontext"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            tools:ignore="DuplicateSpeakableTextCheck,TextContrastCheck" />
         <Button
             android:id="@+id/btnActivityCapturePostAddLocation"
             android:layout_width="wrap_content"
             android:layout_height="50dp"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:background="@drawable/rounded_cyan_button"
-            android:backgroundTint="#1C789A"
+            android:backgroundTint="@color/white"
+            android:drawableLeft="@drawable/ic_baseline_location_on_24"
+            android:stateListAnimator="@null"
             android:text="Dodaj lokaciju"
+            android:textColor="#757471"
             app:layout_constraintBottom_toTopOf="@+id/tvActivityCapturePostDescriptiontext"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/etActivityCapturePostLocation" />
-
+            app:layout_constraintHorizontal_bias="0.092"
+            app:layout_constraintStart_toStartOf="parent" />
 
-        <TextView
+        <Button
             android:id="@+id/tvActivityCapturePostDescriptiontext"
-            android:layout_width="match_parent"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:text="Opis"
+            android:backgroundTint="@color/white"
+            android:drawableLeft="@drawable/ic_baseline_description_24"
+            android:stateListAnimator="@null"
+            android:text="Dodaj opis"
+            android:textColor="#757471"
             app:layout_constraintBottom_toTopOf="@+id/etActivityCapturePostDescription"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1.0"
+            app:layout_constraintHorizontal_bias="0.017"
             app:layout_constraintStart_toStartOf="parent" />
 
         <EditText
@@ -95,6 +75,7 @@
             android:layout_marginEnd="16dp"
             android:ems="10"
             android:hint="Reykjavik, Iceland"
+            android:visibility="gone"
             android:importantForAutofill="no"
             android:inputType="textEmailAddress"
             app:layout_constraintBottom_toTopOf="@+id/llTagsCap"
@@ -142,36 +123,38 @@
             android:layout_marginLeft="20dp"
             android:layout_marginRight="20dp"
             android:orientation="horizontal"
-            app:layout_constraintBottom_toTopOf="@+id/acTagsCap"
+            app:layout_constraintBottom_toTopOf="@+id/btnActivityAddPostAddTagCap"
             app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.4"
             app:layout_constraintStart_toStartOf="parent"></LinearLayout>
 
         <EditText
             android:id="@+id/acTagsCap"
-            android:layout_width="0dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
+            android:layout_marginBottom="28dp"
             android:hint="Planina,Reka,Park..."
+            android:maxLength="12"
             android:minHeight="48dp"
-            android:maxLength= "12"
+            android:visibility="gone"
             app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostPost"
-            app:layout_constraintEnd_toStartOf="@+id/btnActivityAddPostAddTagCap"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.08"
             app:layout_constraintStart_toStartOf="parent" />
 
         <Button
             android:id="@+id/btnActivityAddPostAddTagCap"
             android:layout_width="wrap_content"
             android:layout_height="40dp"
-            android:layout_marginTop="5dp"
-            android:layout_marginEnd="20dp"
-            android:layout_marginStart="20dp"
-            android:layout_marginBottom="5dp"
-            android:background="@drawable/rounded_cyan_button"
-            android:backgroundTint="#1C789A"
+            android:layout_marginBottom="20dp"
+            android:backgroundTint="@color/white"
+            android:drawableLeft="@drawable/ic_baseline_tag_24"
+            android:stateListAnimator="@null"
             android:text="Dodaj tag"
-            app:layout_constraintBottom_toTopOf="@+id/btnActivityCapturePostPost"
+            android:textColor="#757471"
+            app:layout_constraintBottom_toTopOf="@+id/acTagsCap"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/llTagsCap" />
+            app:layout_constraintHorizontal_bias="0.076"
+            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/activity_user_profile.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_user_profile.xml
index 8762183..16f4b1e 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
@@ -74,10 +74,10 @@
             android:background="?android:attr/listDivider"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/btnFragmentUserProfileShowPosts" />
+            app:layout_constraintTop_toBottomOf="@+id/btnActivityUserProfileShowPosts" />
 
         <Button
-            android:id="@+id/btnFragmentUserProfileShowPosts"
+            android:id="@+id/btnActivityUserProfileShowPosts"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="20dp"
@@ -116,11 +116,11 @@
             android:stateListAnimator="@null"
             android:text="Recenzije"
             android:textColor="@color/cardview_dark_background"
-            app:layout_constraintStart_toEndOf="@+id/btnFragmentUserProfileShowPosts"
+            app:layout_constraintStart_toEndOf="@+id/btnActivityUserProfileShowPosts"
             app:layout_constraintTop_toBottomOf="@+id/tvFragmentProfileInfoContainer" />
 
         <FrameLayout
-            android:id="@+id/flFragmentProfileFragmentContainer"
+            android:id="@+id/flActivityProfileFragmentContainer"
             android:layout_width="409dp"
             android:layout_height="319dp"
             app:layout_constraintBottom_toBottomOf="parent"
@@ -169,7 +169,7 @@
 
                     <ImageButton
 
-                        android:id="@+id/materialButton"
+                        android:id="@+id/ibActivityUserProfileFollow"
                         android:layout_width="115dp"
                         android:layout_height="40dp"
                         android:layout_marginStart="16dp"
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_user_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_user_posts.xml
new file mode 100644
index 0000000..59450d3
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_show_user_posts.xml
@@ -0,0 +1,17 @@
+<?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.FragmentShowUserPosts">
+
+    <!-- TODO: Update blank fragment layout -->
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</FrameLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
index 9d26ddc..a2f20f3 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/post_item_home_page.xml
@@ -25,10 +25,9 @@
     <com.google.android.material.imageview.ShapeableImageView
         android:id="@+id/ivPIHPBackground"
         android:layout_width="0dp"
-        android:layout_height="180dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="14dp"
-        android:layout_marginEnd="12dp"
+        android:layout_height="186dp"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="4dp"
         android:elevation="3dp"
         android:scaleType="fitXY"
         app:layout_constraintBottom_toBottomOf="@+id/imageView9"
@@ -36,7 +35,7 @@
         app:layout_constraintHorizontal_bias="1.0"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.04"
+        app:layout_constraintVertical_bias="0.045"
         app:shapeAppearanceOverlay="@style/Circular"
         app:srcCompat="@drawable/b1" />
 
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml b/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml
index cad0a8a..dacd4b5 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/styles.xml
@@ -11,7 +11,7 @@
         <item name="color">@color/white</item>
     </style>
     <style name="Circular">
-        <item name="cornerSize">20dp</item>
+        <item name="cornerSize">10dp</item>
 
     </style>
     <style name="roundedBottom">