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

# Conflicts:
#	Client/BrzoDoLokacije/app/build.gradle

15 files changed, 343 insertions, 53 deletions

diff --git a/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml b/Client/BrzoDoLokacije/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..a3aab99
--- /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">
+    <runningDeviceTargetSelectedWithDropDown>
+      <Target>
+        <type value="RUNNING_DEVICE_TARGET" />
+        <deviceKey>
+          <Key>
+            <type value="SERIAL_NUMBER" />
+            <value value="prvcgybaa6f6zhpv" />
+          </Key>
+        </deviceKey>
+      </Target>
+    </runningDeviceTargetSelectedWithDropDown>
+    <timeTargetWasSelectedWithDropDown value="2022-11-09T23:36:53.200298Z" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/build.gradle b/Client/BrzoDoLokacije/app/build.gradle
index ccc90fc..523fa3b 100644
--- a/Client/BrzoDoLokacije/app/build.gradle
+++ b/Client/BrzoDoLokacije/app/build.gradle
@@ -2,6 +2,7 @@ plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
     id 'org.jetbrains.kotlin.android.extensions'
+    id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin'
 }
 
 android {
@@ -47,6 +48,7 @@ dependencies {
     implementation 'com.google.android.material:material:1.7.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
+    implementation 'com.google.android.gms:play-services-maps:18.1.0'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
diff --git a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
index aa4598b..ef57e6c 100644
--- a/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
+++ b/Client/BrzoDoLokacije/app/src/main/AndroidManifest.xml
@@ -2,24 +2,29 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
-    <!--DOZVOLE-->
+    <!-- DOZVOLE -->
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="18" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_MEDIA_LOCATION" />
-    <uses-permission android:name="android.permission.CAMERA"
-
+    <uses-permission
+        android:name="android.permission.CAMERA"
         android:required="true"
-        android:requiredFeature="true"/>
-
-    <!--SVOJSTVA-->
+        android:requiredFeature="true" /> <!-- SVOJSTVA -->
+    <uses-feature
+        android:name="android.hardware.camera"
+        android:required="true" />
 
-    <uses-feature android:name="android.hardware.camera" android:required="true"></uses-feature>
+    <queries>
+        <intent>
+            <action android:name="android.media.action.IMAGE_CAPTURE" />
+        </intent>
+    </queries>
 
-    <!--AKTIVNOSTI-->
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -31,6 +36,26 @@
         android:theme="@style/Theme.BrzoDoLokacije"
         android:usesCleartextTraffic="true"
         tools:targetApi="31">
+
+        <!--
+             TODO: Before you run your application, you need a Google Maps API key.
+
+             To get one, follow the directions here:
+
+                https://developers.google.com/maps/documentation/android-sdk/get-api-key
+
+             Once you have your API key (it starts with "AIza"), define a new property in your
+             project's local.properties file (e.g. MAPS_API_KEY=Aiza...), and replace the
+             "YOUR_API_KEY" string in this file with "${MAPS_API_KEY}".
+        -->
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="YOUR_API_KEY" />
+
+        <activity
+            android:name=".Activities.MapsActivity"
+            android:exported="false"
+            android:label="@string/title_activity_maps" />
         <activity
             android:name=".Activities.ActivityCapturePost"
             android:exported="false">
@@ -39,9 +64,7 @@
                 android:value="" />
         </activity>
         <activity android:name=".Activities.ActivitySinglePost" />
-        <activity
-            android:name=".Activities.ActivityAddPost"
-/>
+        <activity android:name=".Activities.ActivityAddPost" />
         <activity
             android:name=".Activities.SplashPage"
             android:exported="true">
@@ -74,16 +97,8 @@
             android:grantUriPermissions="true">
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
-                android:resource="@xml/file_paths"></meta-data>
+                android:resource="@xml/file_paths" />
         </provider>
-
-
     </application>
-    <queries>
-        <intent>
-            <action android:name="android.media.action.IMAGE_CAPTURE" />
-        </intent>
-    </queries>
-
 
 </manifest>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
new file mode 100644
index 0000000..b9205f6
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/MapsActivity.kt
@@ -0,0 +1,49 @@
+package com.example.brzodolokacije.Activities
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+
+import com.google.android.gms.maps.CameraUpdateFactory
+import com.google.android.gms.maps.GoogleMap
+import com.google.android.gms.maps.OnMapReadyCallback
+import com.google.android.gms.maps.SupportMapFragment
+import com.google.android.gms.maps.model.LatLng
+import com.google.android.gms.maps.model.MarkerOptions
+import com.example.brzodolokacije.R
+import com.example.brzodolokacije.databinding.ActivityMapsBinding
+
+class MapsActivity : AppCompatActivity(), OnMapReadyCallback {
+
+    private lateinit var mMap: GoogleMap
+    private lateinit var binding: ActivityMapsBinding
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        binding = ActivityMapsBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        // Obtain the SupportMapFragment and get notified when the map is ready to be used.
+        val mapFragment = supportFragmentManager
+            .findFragmentById(R.id.map) as SupportMapFragment
+        mapFragment.getMapAsync(this)
+    }
+
+    /**
+     * Manipulates the map once available.
+     * This callback is triggered when the map is ready to be used.
+     * This is where we can add markers or lines, add listeners or move the camera. In this case,
+     * we just add a marker near Sydney, Australia.
+     * If Google Play services is not installed on the device, the user will be prompted to install
+     * it inside the SupportMapFragment. This method will only be triggered once the user has
+     * installed Google Play services and returned to the app.
+     */
+    override fun onMapReady(googleMap: GoogleMap) {
+        mMap = googleMap
+
+        // Add a marker in Sydney and move the camera
+        val sydney = LatLng(-34.0, 151.0)
+        mMap.addMarker(MarkerOptions().position(sydney).title("Marker in Sydney"))
+        mMap.moveCamera(CameraUpdateFactory.newLatLng(sydney))
+    }
+}
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
index 481591d..0a69722 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/NavigationActivity.kt
@@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.view.View
 import android.widget.Button
+import android.widget.ImageButton
 import android.widget.Toast
 import androidx.fragment.app.Fragment
 import com.example.brzodolokacije.Fragments.*
@@ -20,7 +21,9 @@ class NavigationActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_navigation)
-
+        Toast.makeText(
+            applicationContext, "Open  ", Toast.LENGTH_LONG
+        ).show();
         val fragmentShowPosts=FragmentShowPosts()
         val browseFragment=FragmentBrowse()
         val addPostFragment= FragmentAddNew()
@@ -47,16 +50,15 @@ class NavigationActivity : AppCompatActivity() {
             commit()
         }
 
-    private fun showBottomSheetAddNew(){
-        var bottomSheetDialog:BottomSheetDialog
-        val bottomSheetView = layoutInflater.inflate(R.layout.bottom_sheet_add_new, null)
-        bottomSheetDialog=BottomSheetDialog(this)
-        bottomSheetDialog.setContentView(R.layout.bottom_sheet_add_new)
-        bottomSheetDialog.show()
-
+    private fun showBottomSheetAddPost(){
+        var bottomSheetDialog2:BottomSheetDialog
+        bottomSheetDialog2=BottomSheetDialog(this)
+        bottomSheetDialog2.setContentView(R.layout.bottom_sheet_add_new_post)
+        bottomSheetDialog2.show()
 
-        var openAddPost=bottomSheetDialog.findViewById<View>(R.id.btnBottomSheetAddNewOpenAddPost) as Button
-        var capturePost=bottomSheetDialog.findViewById<View>(R.id.btnBottomSheetAddNewOpenCapturePost) as Button
+        var close=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostClose) as ImageButton
+        var openAddPost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenAddPost) as ImageButton
+        var capturePost=bottomSheetDialog2.findViewById<View>(R.id.btnBottomSheetAddNewPostOpenCapturePost) as ImageButton
 
         openAddPost.setOnClickListener{
             Toast.makeText(
@@ -73,7 +75,38 @@ class NavigationActivity : AppCompatActivity() {
             val intent = Intent (this, ActivityCapturePost::class.java)
             startActivity(intent)
         }
+        close.setOnClickListener {
+            bottomSheetDialog2.dismiss()
+        }
+
+    }
+    private fun showBottomSheetAddNew(){
+        Toast.makeText(
+            applicationContext, "Open add new ", Toast.LENGTH_LONG
+        ).show();
+        var bottomSheetDialog:BottomSheetDialog
+        bottomSheetDialog=BottomSheetDialog(this)
+        bottomSheetDialog.setContentView(R.layout.bottom_sheet_add_new)
+        bottomSheetDialog.show()
+        var close=bottomSheetDialog.findViewById<View>(R.id.btnBottomSheetAddNewClose) as ImageButton
+        var newPost=bottomSheetDialog.findViewById<View>(R.id.btnBottomSheetAddNewPost) as ImageButton
+        var newLocation=bottomSheetDialog.findViewById<View>(R.id.btnBottomSheetAddNewLocation) as ImageButton
+
+        newPost.setOnClickListener{
+            showBottomSheetAddPost()
+        }
+
+        newLocation.setOnClickListener{
+            Toast.makeText(
+                applicationContext, "Open capture ", Toast.LENGTH_LONG
+            ).show();
+            val intent = Intent (this, MapsActivity::class.java)
+            startActivity(intent)
+        }
 
+        close.setOnClickListener {
+            bottomSheetDialog.dismiss()
+        }
     }
 
 
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 afe93c9..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://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/button_add_location.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_add_location.xml
new file mode 100644
index 0000000..b9ea3eb
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_add_location.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="95dp"
+    android:height="38dp"
+    android:viewportWidth="95"
+    android:viewportHeight="38">
+    <path
+        android:strokeColor="#FF3E4645"
+        android:strokeWidth="1"
+        android:pathData="M15 0.5h65C88 0.5 94.5 7 94.5 15v8c0 8-6.5 14.5-14.5 14.5H15C7 37.5 0.5 31 0.5 23v-8C0.5 7 7 0.5 15 0.5Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M21.23 23v8h-0.47l-5.1-7.11H15.6V31h-0.5v-8h0.49l5.1 7.12h0.05V23h0.48Zm4.37 8.13c-0.5 0-0.93-0.14-1.32-0.4-0.38-0.27-0.69-0.64-0.9-1.1-0.23-0.48-0.34-1.01-0.34-1.61 0-0.6 0.11-1.14 0.33-1.6 0.22-0.47 0.53-0.84 0.91-1.1 0.39-0.28 0.83-0.41 1.32-0.41 0.5 0 0.94 0.13 1.32 0.4 0.39 0.27 0.7 0.64 0.91 1.1 0.23 0.48 0.34 1.01 0.34 1.61 0 0.6-0.11 1.13-0.34 1.6-0.22 0.47-0.52 0.84-0.9 1.1-0.4 0.27-0.83 0.4-1.33 0.4Zm0-0.45c0.42 0 0.79-0.11 1.1-0.35 0.32-0.24 0.56-0.56 0.73-0.96 0.18-0.4 0.26-0.86 0.26-1.35 0-0.5-0.08-0.94-0.26-1.34-0.17-0.4-0.42-0.73-0.73-0.97-0.31-0.23-0.68-0.35-1.1-0.35-0.42 0-0.78 0.12-1.1 0.35-0.3 0.24-0.55 0.56-0.72 0.97-0.18 0.4-0.27 0.84-0.27 1.34 0 0.5 0.09 0.94 0.26 1.35 0.18 0.4 0.42 0.72 0.73 0.96 0.32 0.24 0.68 0.35 1.1 0.35ZM33.98 25l-2.17 6h-0.54l-2.17-6h0.52l1.9 5.39h0.04l1.9-5.39h0.52Zm2.9 6.13c-0.35 0-0.67-0.07-0.96-0.2-0.28-0.15-0.51-0.35-0.69-0.61-0.17-0.27-0.26-0.6-0.26-0.97 0-0.25 0.05-0.47 0.14-0.66 0.09-0.2 0.22-0.36 0.4-0.5 0.2-0.13 0.43-0.25 0.72-0.33 0.29-0.1 0.63-0.17 1.03-0.22l0.82-0.1c0.24-0.04 0.43-0.1 0.56-0.17 0.14-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.13-0.79-0.4-1.05-0.28-0.25-0.66-0.38-1.15-0.38-0.43 0-0.79 0.1-1.08 0.28-0.3 0.19-0.5 0.43-0.62 0.73l-0.44-0.17c0.11-0.29 0.28-0.52 0.5-0.71 0.21-0.2 0.46-0.34 0.74-0.43 0.29-0.1 0.58-0.14 0.9-0.14 0.26 0 0.52 0.04 0.76 0.11 0.24 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.35 0.35 0.46 0.59 0.1 0.23 0.17 0.52 0.17 0.85V31h-0.48v-1.08H38.8c-0.1 0.22-0.24 0.43-0.43 0.61-0.18 0.18-0.4 0.33-0.65 0.44-0.25 0.1-0.54 0.16-0.85 0.16Zm0.04-0.44c0.38 0 0.71-0.1 1-0.28 0.3-0.18 0.52-0.43 0.68-0.75 0.17-0.32 0.25-0.69 0.25-1.1v-0.88c-0.06 0.06-0.15 0.1-0.26 0.14-0.12 0.04-0.24 0.08-0.39 0.11l-0.44 0.08-0.45 0.06c-0.44 0.05-0.8 0.13-1.07 0.24-0.27 0.1-0.47 0.25-0.6 0.42-0.13 0.17-0.19 0.39-0.19 0.63 0 0.41 0.14 0.74 0.42 0.97 0.28 0.24 0.63 0.36 1.05 0.36ZM44.9 23v8h-0.47v-8h0.47Zm4.2 8.13c-0.49 0-0.93-0.14-1.31-0.4-0.39-0.27-0.7-0.64-0.91-1.1-0.23-0.48-0.34-1.01-0.34-1.61 0-0.6 0.11-1.14 0.34-1.6 0.22-0.47 0.52-0.84 0.9-1.1 0.4-0.28 0.83-0.41 1.33-0.41 0.5 0 0.93 0.13 1.32 0.4 0.38 0.27 0.69 0.64 0.9 1.1 0.23 0.48 0.34 1.01 0.34 1.61 0 0.6-0.11 1.13-0.33 1.6-0.22 0.47-0.53 0.84-0.91 1.1-0.39 0.27-0.83 0.4-1.32 0.4Zm0-0.45c0.43 0 0.8-0.11 1.1-0.35 0.32-0.24 0.56-0.56 0.73-0.96 0.18-0.4 0.27-0.86 0.27-1.35 0-0.5-0.1-0.94-0.27-1.34-0.17-0.4-0.41-0.73-0.73-0.97-0.3-0.23-0.67-0.35-1.1-0.35-0.41 0-0.78 0.12-1.1 0.35-0.3 0.24-0.55 0.56-0.72 0.97-0.18 0.4-0.26 0.84-0.26 1.34 0 0.5 0.08 0.94 0.25 1.35 0.18 0.4 0.42 0.72 0.74 0.96 0.31 0.24 0.68 0.35 1.1 0.35Zm4.62-2.02v-0.69h0.12l3-2.97h0.62l-2.75 2.73-0.05 0.02-0.94 0.9ZM53.31 31v-8h0.47v8H53.3Zm3.66 0l-2.53-3.2 0.34-0.32 2.8 3.52h-0.61Zm3.49 0.13c-0.35 0-0.67-0.07-0.96-0.2-0.28-0.15-0.52-0.35-0.69-0.61-0.17-0.27-0.26-0.6-0.26-0.97 0-0.25 0.05-0.47 0.14-0.66 0.08-0.2 0.22-0.36 0.4-0.5 0.2-0.13 0.43-0.25 0.72-0.33 0.29-0.1 0.63-0.17 1.03-0.22l0.82-0.1c0.24-0.04 0.43-0.1 0.56-0.17 0.14-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.13-0.79-0.4-1.05-0.28-0.25-0.66-0.38-1.15-0.38-0.43 0-0.79 0.1-1.08 0.28-0.3 0.19-0.5 0.43-0.62 0.73l-0.45-0.17c0.12-0.29 0.28-0.52 0.5-0.71 0.22-0.2 0.47-0.34 0.75-0.43 0.28-0.1 0.58-0.14 0.9-0.14 0.26 0 0.51 0.04 0.76 0.11 0.24 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.34 0.35 0.46 0.59 0.1 0.23 0.16 0.52 0.16 0.85V31h-0.47v-1.08h-0.04c-0.1 0.22-0.24 0.43-0.43 0.61-0.18 0.18-0.4 0.33-0.65 0.44-0.25 0.1-0.54 0.16-0.85 0.16Zm0.04-0.44c0.38 0 0.7-0.1 1-0.28 0.29-0.18 0.52-0.43 0.68-0.75 0.17-0.32 0.25-0.69 0.25-1.1v-0.88c-0.06 0.06-0.15 0.1-0.26 0.14-0.12 0.04-0.24 0.08-0.39 0.11l-0.44 0.08-0.45 0.06c-0.44 0.05-0.8 0.13-1.07 0.24-0.28 0.1-0.48 0.25-0.6 0.42-0.13 0.17-0.2 0.39-0.2 0.63 0 0.41 0.15 0.74 0.43 0.97 0.28 0.24 0.63 0.36 1.05 0.36Zm6.65 0.43c-0.5 0-0.96-0.13-1.35-0.4-0.38-0.27-0.69-0.64-0.9-1.1-0.22-0.48-0.33-1-0.33-1.6 0-0.6 0.11-1.13 0.33-1.6 0.22-0.46 0.52-0.83 0.9-1.1 0.4-0.27 0.84-0.41 1.35-0.41 0.38 0 0.72 0.08 1.04 0.23 0.31 0.16 0.57 0.38 0.78 0.66 0.2 0.28 0.34 0.6 0.4 0.97h-0.49c-0.08-0.41-0.27-0.75-0.58-1.01-0.31-0.27-0.7-0.4-1.15-0.4-0.4 0-0.77 0.11-1.08 0.34-0.32 0.23-0.57 0.54-0.75 0.94-0.19 0.4-0.28 0.86-0.28 1.37 0 0.5 0.1 0.97 0.27 1.37 0.18 0.4 0.42 0.72 0.74 0.95 0.32 0.24 0.69 0.35 1.1 0.35 0.3 0 0.56-0.05 0.8-0.17 0.25-0.12 0.46-0.29 0.62-0.5 0.16-0.22 0.27-0.47 0.32-0.76h0.49c-0.06 0.37-0.19 0.7-0.4 0.98-0.2 0.28-0.45 0.5-0.77 0.66-0.31 0.16-0.67 0.23-1.06 0.23ZM71.03 31v-6h0.47v6h-0.47Zm0.24-7.06c-0.1 0-0.2-0.04-0.28-0.11-0.07-0.07-0.11-0.16-0.11-0.27 0-0.1 0.04-0.19 0.11-0.26 0.08-0.08 0.17-0.11 0.28-0.11 0.1 0 0.19 0.03 0.27 0.1 0.07 0.08 0.11 0.17 0.11 0.27s-0.04 0.2-0.11 0.27c-0.08 0.07-0.17 0.1-0.27 0.1ZM73.52 25h0.47v6.73c0 0.31-0.06 0.58-0.19 0.8-0.13 0.23-0.3 0.41-0.53 0.53-0.22 0.13-0.47 0.19-0.77 0.19h-0.06l-0.08-0.01 0.02-0.44h0.06 0.06c0.29 0 0.53-0.1 0.73-0.29 0.2-0.19 0.29-0.45 0.29-0.78V25Zm0.23-1.06c-0.1 0-0.2-0.04-0.27-0.11-0.08-0.07-0.11-0.16-0.11-0.27 0-0.1 0.03-0.19 0.11-0.26 0.08-0.08 0.17-0.11 0.27-0.11s0.2 0.03 0.27 0.1c0.08 0.08 0.12 0.17 0.12 0.27s-0.04 0.2-0.12 0.27c-0.07 0.07-0.16 0.1-0.27 0.1Zm3.83 7.19c-0.35 0-0.67-0.07-0.95-0.2-0.3-0.15-0.52-0.35-0.7-0.61-0.17-0.27-0.25-0.6-0.25-0.97 0-0.25 0.04-0.47 0.13-0.66 0.09-0.2 0.22-0.36 0.4-0.5 0.2-0.13 0.43-0.25 0.72-0.33 0.29-0.1 0.63-0.17 1.03-0.22l0.82-0.1c0.24-0.04 0.43-0.1 0.56-0.17 0.14-0.07 0.21-0.19 0.21-0.34v-0.25c0-0.44-0.14-0.79-0.41-1.05-0.28-0.25-0.66-0.38-1.14-0.38-0.43 0-0.8 0.1-1.09 0.28-0.3 0.19-0.5 0.43-0.61 0.73l-0.45-0.17c0.11-0.29 0.28-0.52 0.5-0.71 0.21-0.2 0.46-0.34 0.74-0.43 0.29-0.1 0.58-0.14 0.9-0.14 0.26 0 0.52 0.04 0.76 0.11 0.24 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.35 0.35 0.46 0.59 0.11 0.23 0.17 0.52 0.17 0.85V31h-0.48v-1.08h-0.03c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.66 0.44c-0.25 0.1-0.53 0.16-0.85 0.16Zm0.05-0.44c0.37 0 0.7-0.1 1-0.28 0.28-0.18 0.51-0.43 0.67-0.75 0.17-0.32 0.25-0.69 0.25-1.1v-0.88c-0.06 0.06-0.15 0.1-0.26 0.14-0.11 0.04-0.24 0.08-0.38 0.11l-0.45 0.08-0.45 0.06c-0.44 0.05-0.8 0.13-1.07 0.24-0.27 0.1-0.47 0.25-0.6 0.42-0.13 0.17-0.19 0.39-0.19 0.63 0 0.41 0.14 0.74 0.42 0.97 0.29 0.24 0.64 0.36 1.06 0.36Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M53.63 8.67c0.24 0 0.45-0.08 0.62-0.24 0.17-0.16 0.25-0.36 0.25-0.6V6.17h1.75c0.25 0 0.46-0.08 0.62-0.24 0.17-0.16 0.26-0.36 0.26-0.6 0-0.23-0.09-0.43-0.26-0.6-0.16-0.15-0.37-0.23-0.62-0.23H54.5V2.83c0-0.23-0.08-0.43-0.25-0.6C54.08 2.09 53.87 2 53.62 2 53.38 2 53.17 2.08 53 2.24c-0.17 0.16-0.25 0.36-0.25 0.6V4.5H51c-0.25 0-0.46 0.08-0.62 0.24-0.17 0.16-0.26 0.36-0.26 0.6 0 0.23 0.09 0.43 0.26 0.59 0.16 0.16 0.37 0.24 0.62 0.24h1.75v1.66c0 0.24 0.08 0.44 0.25 0.6 0.17 0.16 0.38 0.24 0.63 0.24ZM47.5 12c0.48 0 0.9-0.16 1.24-0.49 0.34-0.33 0.51-0.72 0.51-1.18 0-0.46-0.17-0.85-0.51-1.17-0.35-0.33-0.76-0.5-1.24-0.5s-0.9 0.17-1.24 0.5c-0.34 0.32-0.51 0.71-0.51 1.17 0 0.46 0.17 0.85 0.51 1.18 0.35 0.33 0.76 0.49 1.24 0.49Zm0 8.02c-0.12 0-0.23-0.02-0.35-0.06-0.12-0.04-0.22-0.1-0.3-0.17-2.14-1.79-3.73-3.45-4.77-4.99-1.05-1.53-1.58-2.97-1.58-4.3 0-2.08 0.7-3.74 2.11-4.98 1.4-1.24 3.04-1.85 4.89-1.85h0.44l0.44 0.04V5.4l-0.43-0.06H47.5c-1.47 0-2.72 0.48-3.73 1.44-1.01 0.97-1.52 2.2-1.52 3.72 0 0.99 0.43 2.11 1.3 3.38 0.85 1.28 2.17 2.69 3.95 4.24 1.78-1.55 3.1-2.96 3.96-4.24 0.86-1.27 1.29-2.4 1.29-3.38v-0.17h1.75v0.17c0 1.33-0.52 2.77-1.58 4.3-1.05 1.54-2.63 3.2-4.76 5-0.1 0.06-0.2 0.12-0.31 0.16-0.12 0.04-0.23 0.06-0.35 0.06Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_add_post.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_add_post.xml
new file mode 100644
index 0000000..eaf5adb
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_add_post.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="95dp"
+    android:height="38dp"
+    android:viewportWidth="95"
+    android:viewportHeight="38">
+    <path
+        android:strokeColor="#FF3E4645"
+        android:strokeWidth="1"
+        android:pathData="M15 0.5h65C88 0.5 94.5 7 94.5 15v8c0 8-6.5 14.5-14.5 14.5H15C7 37.5 0.5 31 0.5 23v-8C0.5 7 7 0.5 15 0.5Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M23.47 23.8v8h-0.48l-5.1-7.1h-0.05v7.11h-0.49v-8h0.48l5.1 7.12h0.05v-7.12h0.49Zm4.37 8.13c-0.5 0-0.94-0.13-1.32-0.4-0.39-0.26-0.7-0.63-0.91-1.1-0.22-0.47-0.33-1-0.33-1.6 0-0.6 0.1-1.14 0.33-1.6 0.22-0.47 0.52-0.84 0.9-1.1 0.4-0.28 0.83-0.41 1.33-0.41 0.5 0 0.93 0.13 1.32 0.4 0.38 0.27 0.69 0.64 0.9 1.1 0.23 0.48 0.34 1.01 0.34 1.6 0 0.6-0.11 1.14-0.33 1.61-0.22 0.47-0.53 0.84-0.91 1.1-0.39 0.27-0.83 0.4-1.32 0.4Zm0-0.44c0.42 0 0.78-0.12 1.1-0.35 0.31-0.24 0.55-0.56 0.73-0.96 0.17-0.4 0.26-0.86 0.26-1.35 0-0.5-0.09-0.94-0.26-1.34-0.18-0.4-0.42-0.73-0.73-0.97-0.32-0.24-0.68-0.36-1.1-0.36-0.42 0-0.79 0.12-1.1 0.36-0.31 0.24-0.56 0.56-0.73 0.97-0.17 0.4-0.26 0.84-0.26 1.34 0 0.5 0.08 0.94 0.26 1.35 0.17 0.4 0.41 0.72 0.73 0.96 0.31 0.23 0.68 0.35 1.1 0.35Zm8.37-5.68l-2.16 6H33.5l-2.17-6h0.51l1.9 5.39h0.05l1.9-5.39h0.51Zm2.9 6.13c-0.35 0-0.66-0.07-0.95-0.2-0.29-0.15-0.52-0.35-0.7-0.61-0.17-0.27-0.25-0.6-0.25-0.97 0-0.25 0.04-0.47 0.13-0.66 0.09-0.2 0.23-0.36 0.41-0.5 0.19-0.13 0.42-0.25 0.71-0.34 0.3-0.09 0.64-0.16 1.04-0.2l0.81-0.11c0.24-0.04 0.43-0.1 0.57-0.17 0.13-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.13-0.79-0.41-1.05-0.28-0.25-0.66-0.38-1.14-0.38-0.43 0-0.8 0.1-1.09 0.28-0.29 0.19-0.5 0.43-0.61 0.73L37.38 27c0.11-0.29 0.28-0.52 0.5-0.71 0.21-0.2 0.46-0.34 0.75-0.43 0.28-0.1 0.58-0.14 0.89-0.14 0.26 0 0.52 0.04 0.76 0.11 0.25 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.35 0.35 0.46 0.59 0.11 0.23 0.17 0.52 0.17 0.85v4.19h-0.48v-1.08h-0.03c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.65 0.44c-0.26 0.1-0.54 0.16-0.86 0.16Zm0.05-0.44c0.37 0 0.7-0.1 1-0.28 0.29-0.18 0.51-0.43 0.68-0.75 0.16-0.32 0.24-0.69 0.24-1.1V28.5c-0.06 0.06-0.14 0.1-0.26 0.14-0.11 0.04-0.24 0.08-0.38 0.1-0.14 0.04-0.3 0.06-0.45 0.09l-0.45 0.06c-0.43 0.05-0.79 0.13-1.07 0.24-0.27 0.1-0.47 0.25-0.6 0.42-0.12 0.17-0.19 0.39-0.19 0.63 0 0.41 0.15 0.73 0.43 0.97s0.63 0.36 1.05 0.36Zm9.72 0.43c-0.5 0-0.93-0.13-1.32-0.4-0.38-0.26-0.69-0.63-0.9-1.1-0.23-0.47-0.34-1-0.34-1.6 0-0.6 0.11-1.14 0.33-1.6 0.22-0.47 0.53-0.84 0.91-1.1 0.39-0.28 0.83-0.41 1.32-0.41 0.5 0 0.94 0.13 1.32 0.4 0.39 0.27 0.7 0.64 0.91 1.1 0.22 0.48 0.33 1.01 0.33 1.6 0 0.6-0.1 1.14-0.33 1.61-0.22 0.47-0.52 0.84-0.9 1.1-0.4 0.27-0.83 0.4-1.33 0.4Zm0-0.44c0.42 0 0.79-0.12 1.1-0.35 0.31-0.24 0.56-0.56 0.73-0.96 0.17-0.4 0.26-0.86 0.26-1.35 0-0.5-0.09-0.94-0.26-1.34-0.17-0.4-0.42-0.73-0.73-0.97s-0.68-0.36-1.1-0.36c-0.42 0-0.78 0.12-1.1 0.36-0.3 0.24-0.55 0.56-0.73 0.97-0.17 0.4-0.26 0.84-0.26 1.34 0 0.5 0.09 0.94 0.26 1.35 0.17 0.4 0.42 0.72 0.73 0.96 0.32 0.23 0.68 0.35 1.1 0.35Zm4.37 0.32v-8h0.48v3.34h0.04c0.1-0.26 0.23-0.5 0.4-0.71 0.17-0.22 0.39-0.4 0.64-0.52 0.26-0.13 0.56-0.2 0.9-0.2 0.48 0 0.9 0.13 1.26 0.4s0.64 0.63 0.83 1.1c0.2 0.47 0.3 1 0.3 1.6 0 0.61-0.1 1.15-0.3 1.62-0.2 0.46-0.47 0.83-0.83 1.1-0.35 0.26-0.77 0.4-1.26 0.4-0.34 0-0.64-0.07-0.9-0.2-0.25-0.13-0.46-0.3-0.63-0.52-0.18-0.22-0.31-0.46-0.4-0.72h-0.06v1.3h-0.47Zm0.47-2.99c0 0.51 0.08 0.97 0.23 1.37 0.16 0.4 0.38 0.72 0.67 0.96 0.3 0.23 0.65 0.34 1.05 0.34 0.41 0 0.76-0.11 1.06-0.35 0.29-0.24 0.51-0.56 0.66-0.96 0.16-0.4 0.24-0.86 0.24-1.36 0-0.5-0.08-0.95-0.24-1.35-0.15-0.4-0.37-0.72-0.66-0.95-0.3-0.24-0.65-0.36-1.06-0.36-0.4 0-0.75 0.12-1.05 0.35-0.29 0.23-0.51 0.55-0.67 0.95-0.15 0.4-0.23 0.85-0.23 1.36Zm6.05-3.01h0.47v6.73c0 0.31-0.06 0.58-0.19 0.8-0.13 0.23-0.3 0.41-0.53 0.53-0.22 0.13-0.47 0.19-0.77 0.19H58.7l-0.08-0.01 0.02-0.44h0.06 0.06c0.29 0 0.53-0.1 0.73-0.29 0.2-0.19 0.29-0.45 0.29-0.78v-6.73ZM60 24.75c-0.1 0-0.2-0.04-0.27-0.11-0.08-0.08-0.11-0.16-0.11-0.27 0-0.1 0.03-0.2 0.11-0.26C59.81 24.03 59.9 24 60 24s0.2 0.03 0.27 0.1c0.08 0.08 0.12 0.17 0.12 0.27s-0.04 0.2-0.12 0.27c-0.07 0.07-0.16 0.1-0.27 0.1Zm3.83 7.19c-0.35 0-0.67-0.07-0.95-0.2-0.3-0.15-0.52-0.35-0.7-0.61-0.17-0.27-0.25-0.6-0.25-0.97 0-0.25 0.04-0.47 0.13-0.66 0.09-0.2 0.22-0.36 0.4-0.5 0.2-0.13 0.43-0.25 0.72-0.34 0.29-0.09 0.63-0.16 1.03-0.2l0.82-0.11c0.24-0.04 0.43-0.1 0.56-0.17 0.14-0.07 0.21-0.19 0.21-0.34v-0.25c0-0.44-0.14-0.79-0.41-1.05-0.28-0.25-0.66-0.38-1.14-0.38-0.43 0-0.8 0.1-1.09 0.28-0.3 0.19-0.5 0.43-0.61 0.73L62.1 27c0.11-0.29 0.28-0.52 0.5-0.71 0.21-0.2 0.46-0.34 0.74-0.43 0.29-0.1 0.58-0.14 0.9-0.14 0.26 0 0.52 0.04 0.76 0.11 0.24 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.35 0.35 0.46 0.59 0.11 0.23 0.17 0.52 0.17 0.85v4.19H65.8v-1.08h-0.03c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.66 0.44c-0.25 0.1-0.53 0.16-0.85 0.16Zm0.05-0.44c0.37 0 0.7-0.1 1-0.28 0.28-0.18 0.51-0.43 0.67-0.75 0.17-0.32 0.25-0.69 0.25-1.1V28.5c-0.06 0.06-0.15 0.1-0.26 0.14-0.11 0.04-0.24 0.08-0.38 0.1-0.14 0.04-0.3 0.06-0.45 0.09l-0.45 0.06c-0.44 0.05-0.8 0.13-1.07 0.24-0.27 0.1-0.47 0.25-0.6 0.42-0.13 0.17-0.19 0.39-0.19 0.63 0 0.41 0.14 0.73 0.42 0.97 0.29 0.24 0.64 0.36 1.05 0.36Zm8.57-5.69l-2.17 6h-0.54l-2.17-6h0.51L70 31.2h0.04l1.9-5.39h0.52Zm2.9 6.13c-0.35 0-0.67-0.07-0.96-0.2-0.29-0.15-0.52-0.35-0.7-0.61-0.16-0.27-0.25-0.6-0.25-0.97 0-0.25 0.05-0.47 0.13-0.66 0.1-0.2 0.23-0.36 0.41-0.5 0.19-0.13 0.43-0.25 0.72-0.34 0.28-0.09 0.63-0.16 1.03-0.2l0.82-0.11c0.24-0.04 0.42-0.1 0.56-0.17 0.14-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.13-0.79-0.4-1.05-0.28-0.25-0.66-0.38-1.15-0.38-0.43 0-0.79 0.1-1.08 0.28-0.3 0.19-0.5 0.43-0.62 0.73L73.61 27c0.12-0.29 0.28-0.52 0.5-0.71 0.22-0.2 0.47-0.34 0.75-0.43 0.28-0.1 0.58-0.14 0.89-0.14 0.27 0 0.52 0.04 0.77 0.11 0.24 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.34 0.35 0.45 0.59 0.12 0.23 0.17 0.52 0.17 0.85v4.19h-0.47v-1.08h-0.04c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.65 0.44c-0.25 0.1-0.54 0.16-0.86 0.16Zm0.04-0.44c0.38 0 0.7-0.1 1-0.28 0.29-0.18 0.52-0.43 0.68-0.75 0.16-0.32 0.25-0.69 0.25-1.1V28.5c-0.06 0.06-0.15 0.1-0.27 0.14-0.1 0.04-0.23 0.08-0.38 0.1-0.14 0.04-0.29 0.06-0.44 0.09l-0.45 0.06c-0.44 0.05-0.8 0.13-1.07 0.24-0.28 0.1-0.48 0.25-0.6 0.42-0.13 0.17-0.2 0.39-0.2 0.63 0 0.41 0.15 0.73 0.43 0.97s0.63 0.36 1.05 0.36Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M53 12c-0.55 0-1 0.45-1 1v5.22c0 0.55-0.45 1-1 1H41c-0.55 0-1-0.45-1-1V8c0-0.55 0.45-1 1-1h5c0.55 0 1-0.45 1-1s-0.45-1-1-1h-6c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2v-6c0-0.55-0.45-1-1-1Zm3.02-7H54V2.98C54 2.44 53.56 2 53.02 2h-0.03C52.44 2 52 2.44 52 2.98V5h-2.01C49.45 5 49.01 5.44 49 5.98v0.03C49 6.56 49.44 7 49.99 7H52v2.01c0 0.54 0.44 0.99 0.99 0.98h0.03c0.54 0 0.98-0.44 0.98-0.98V7h2.02C56.56 7 57 6.56 57 6.02V5.98C57 5.44 56.56 5 56.02 5Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M49 9h-6c-0.55 0-1 0.45-1 1s0.45 1 1 1h6c0.55 0 1-0.45 1-1s-0.45-1-1-1Zm0 3h-6c-0.55 0-1 0.45-1 1s0.45 1 1 1h6c0.55 0 1-0.45 1-1s-0.45-1-1-1Zm0 3h-6c-0.55 0-1 0.45-1 1s0.45 1 1 1h6c0.55 0 1-0.45 1-1s-0.45-1-1-1Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_capture.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_capture.xml
new file mode 100644
index 0000000..f8e2272
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_capture.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="95dp"
+    android:height="38dp"
+    android:viewportWidth="95"
+    android:viewportHeight="38">
+    <path
+        android:strokeColor="#FF3E4645"
+        android:strokeWidth="1"
+        android:pathData="M15 0.5h65C88 0.5 94.5 7 94.5 15v8c0 8-6.5 14.5-14.5 14.5H15C7 37.5 0.5 31 0.5 23v-8C0.5 7 7 0.5 15 0.5Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M14.4 23v8h-0.48l-5.1-7.11H8.78V31h-0.5v-8h0.49l5.1 7.12h0.05V23h0.48Zm4.37 8.13c-0.5 0-0.93-0.14-1.32-0.4-0.38-0.27-0.69-0.64-0.9-1.1-0.23-0.48-0.34-1.01-0.34-1.61 0-0.6 0.11-1.14 0.33-1.6 0.22-0.47 0.53-0.84 0.91-1.1 0.39-0.28 0.83-0.41 1.32-0.41 0.5 0 0.94 0.13 1.32 0.4 0.39 0.27 0.7 0.64 0.91 1.1 0.22 0.48 0.33 1.01 0.33 1.61 0 0.6-0.1 1.13-0.33 1.6-0.22 0.47-0.52 0.84-0.9 1.1-0.4 0.27-0.83 0.4-1.33 0.4Zm0-0.45c0.42 0 0.79-0.11 1.1-0.35 0.31-0.24 0.56-0.56 0.73-0.96 0.17-0.4 0.26-0.86 0.26-1.35 0-0.5-0.09-0.94-0.26-1.34-0.17-0.4-0.42-0.73-0.73-0.97-0.31-0.23-0.68-0.35-1.1-0.35-0.42 0-0.78 0.12-1.1 0.35-0.3 0.24-0.55 0.56-0.73 0.97-0.17 0.4-0.26 0.84-0.26 1.34 0 0.5 0.09 0.94 0.26 1.35 0.17 0.4 0.42 0.72 0.73 0.96s0.68 0.35 1.1 0.35ZM27.15 25l-2.17 6h-0.54l-2.17-6h0.51l1.91 5.39h0.04l1.9-5.39h0.52Zm2.9 6.13c-0.35 0-0.67-0.07-0.96-0.2-0.29-0.15-0.52-0.35-0.7-0.61-0.16-0.27-0.25-0.6-0.25-0.97 0-0.25 0.05-0.47 0.13-0.66 0.1-0.2 0.23-0.36 0.41-0.5 0.19-0.13 0.43-0.25 0.72-0.33 0.28-0.1 0.63-0.17 1.03-0.22l0.82-0.1c0.24-0.04 0.42-0.1 0.56-0.17 0.14-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.13-0.79-0.4-1.05-0.28-0.25-0.66-0.38-1.15-0.38-0.43 0-0.79 0.1-1.08 0.28-0.3 0.19-0.5 0.43-0.62 0.73l-0.45-0.17c0.12-0.29 0.28-0.52 0.5-0.71 0.22-0.2 0.47-0.34 0.75-0.43 0.28-0.1 0.58-0.14 0.89-0.14 0.27 0 0.52 0.04 0.77 0.11 0.24 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.34 0.35 0.46 0.59 0.1 0.23 0.16 0.52 0.16 0.85V31h-0.47v-1.08h-0.04c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.65 0.44c-0.25 0.1-0.54 0.16-0.86 0.16Zm0.04-0.44c0.38 0 0.7-0.1 1-0.28 0.29-0.18 0.52-0.43 0.68-0.75 0.16-0.32 0.25-0.69 0.25-1.1v-0.88c-0.06 0.06-0.15 0.1-0.27 0.14-0.1 0.04-0.23 0.08-0.38 0.11l-0.44 0.08-0.45 0.06c-0.44 0.05-0.8 0.13-1.07 0.24-0.28 0.1-0.48 0.25-0.6 0.42-0.13 0.17-0.2 0.39-0.2 0.63 0 0.41 0.15 0.74 0.43 0.97 0.28 0.24 0.63 0.36 1.05 0.36ZM39.85 25v0.43H37.2V25h2.66Zm-1.78 6v-6.93c0-0.3 0.06-0.56 0.2-0.78 0.14-0.21 0.32-0.37 0.55-0.49 0.22-0.1 0.47-0.16 0.73-0.16 0.13 0 0.25 0 0.35 0.03 0.1 0.02 0.18 0.05 0.26 0.08L40 23.17l-0.2-0.06-0.23-0.02c-0.3 0-0.55 0.1-0.75 0.28-0.2 0.18-0.3 0.44-0.3 0.77V31h-0.46Zm5.25 0.13c-0.5 0-0.94-0.14-1.32-0.4-0.39-0.27-0.7-0.64-0.91-1.1-0.22-0.48-0.34-1.01-0.34-1.61 0-0.6 0.12-1.14 0.34-1.6 0.22-0.47 0.52-0.84 0.9-1.1 0.4-0.28 0.83-0.41 1.33-0.41 0.5 0 0.93 0.13 1.32 0.4 0.38 0.27 0.69 0.64 0.9 1.1 0.23 0.48 0.34 1.01 0.34 1.61 0 0.6-0.11 1.13-0.33 1.6-0.22 0.47-0.53 0.84-0.91 1.1-0.39 0.27-0.83 0.4-1.32 0.4Zm0-0.45c0.42 0 0.78-0.11 1.1-0.35 0.31-0.24 0.55-0.56 0.73-0.96 0.17-0.4 0.26-0.86 0.26-1.35 0-0.5-0.09-0.94-0.26-1.34-0.18-0.4-0.42-0.73-0.73-0.97-0.32-0.23-0.68-0.35-1.1-0.35-0.42 0-0.79 0.12-1.1 0.35-0.31 0.24-0.56 0.56-0.73 0.97-0.18 0.4-0.26 0.84-0.26 1.34 0 0.5 0.08 0.94 0.26 1.35 0.17 0.4 0.41 0.72 0.73 0.96 0.31 0.24 0.68 0.35 1.1 0.35ZM49.64 25v0.43h-2.62V25h2.62Zm-1.73-1.44h0.47v6.02c0 0.25 0.05 0.45 0.14 0.6 0.1 0.16 0.22 0.27 0.38 0.35 0.15 0.07 0.32 0.1 0.5 0.1l0.22-0.01 0.18-0.05 0.12 0.43-0.24 0.07c-0.1 0.02-0.2 0.03-0.31 0.03-0.25 0-0.5-0.06-0.72-0.17-0.22-0.11-0.4-0.28-0.53-0.49-0.14-0.21-0.21-0.47-0.21-0.77v-6.1Zm5.67 7.57c-0.5 0-0.94-0.14-1.32-0.4-0.39-0.27-0.7-0.64-0.91-1.1-0.23-0.48-0.34-1.01-0.34-1.61 0-0.6 0.11-1.14 0.34-1.6 0.22-0.47 0.52-0.84 0.9-1.1 0.4-0.28 0.83-0.41 1.33-0.41 0.5 0 0.93 0.13 1.32 0.4 0.38 0.27 0.69 0.64 0.9 1.1 0.23 0.48 0.34 1.01 0.34 1.61 0 0.6-0.11 1.13-0.33 1.6-0.22 0.47-0.53 0.84-0.91 1.1-0.39 0.27-0.83 0.4-1.32 0.4Zm0-0.45c0.42 0 0.78-0.11 1.1-0.35 0.3-0.24 0.55-0.56 0.72-0.96 0.18-0.4 0.27-0.86 0.27-1.35 0-0.5-0.1-0.94-0.27-1.34-0.17-0.4-0.41-0.73-0.73-0.97-0.3-0.23-0.67-0.35-1.1-0.35-0.41 0-0.78 0.12-1.1 0.35-0.3 0.24-0.55 0.56-0.72 0.97-0.18 0.4-0.26 0.84-0.26 1.34 0 0.5 0.08 0.94 0.25 1.35 0.18 0.4 0.42 0.72 0.73 0.96 0.32 0.24 0.69 0.35 1.1 0.35Zm6.36 2.7c-0.37 0-0.7-0.05-1-0.15-0.3-0.1-0.55-0.24-0.76-0.42-0.2-0.18-0.36-0.4-0.47-0.64l0.4-0.23c0.09 0.19 0.21 0.36 0.38 0.51 0.16 0.15 0.36 0.27 0.6 0.36 0.25 0.08 0.53 0.13 0.85 0.13 0.58 0 1.04-0.15 1.38-0.45 0.33-0.3 0.5-0.75 0.5-1.37v-1.5h-0.04c-0.1 0.27-0.23 0.5-0.41 0.7-0.18 0.2-0.4 0.36-0.65 0.48-0.26 0.11-0.55 0.17-0.88 0.17-0.48 0-0.9-0.12-1.25-0.37-0.36-0.24-0.64-0.59-0.84-1.03-0.2-0.45-0.3-0.97-0.3-1.57 0-0.6 0.1-1.13 0.3-1.6 0.19-0.46 0.47-0.83 0.83-1.1 0.36-0.26 0.78-0.39 1.26-0.39 0.35 0 0.65 0.07 0.9 0.2 0.26 0.13 0.47 0.3 0.64 0.52 0.17 0.22 0.3 0.45 0.4 0.71h0.05V25h0.47v6.14c0 0.5-0.1 0.92-0.3 1.25-0.2 0.33-0.47 0.57-0.83 0.74-0.35 0.16-0.76 0.24-1.23 0.24Zm-0.06-2.85c0.4 0 0.75-0.1 1.04-0.3 0.29-0.21 0.51-0.5 0.67-0.88 0.16-0.38 0.24-0.83 0.24-1.35 0-0.5-0.08-0.96-0.23-1.36-0.16-0.4-0.38-0.71-0.67-0.94-0.3-0.23-0.64-0.34-1.05-0.34-0.41 0-0.77 0.11-1.06 0.35-0.29 0.23-0.51 0.54-0.67 0.94-0.15 0.4-0.23 0.85-0.23 1.35 0 0.5 0.08 0.94 0.24 1.32 0.15 0.37 0.38 0.67 0.67 0.89 0.29 0.21 0.64 0.32 1.05 0.32ZM64.3 31v-6h0.47v0.94h0.04c0.13-0.31 0.35-0.56 0.66-0.74 0.3-0.19 0.66-0.28 1.06-0.28h0.12 0.12v0.48h-0.11c-0.05-0.02-0.1-0.02-0.16-0.02-0.33 0-0.63 0.07-0.9 0.21-0.25 0.15-0.45 0.34-0.6 0.6-0.15 0.25-0.22 0.53-0.22 0.86V31H64.3Zm5.34 0.13c-0.35 0-0.66-0.07-0.95-0.2-0.29-0.15-0.52-0.35-0.7-0.61-0.17-0.27-0.25-0.6-0.25-0.97 0-0.25 0.04-0.47 0.13-0.66 0.09-0.2 0.23-0.36 0.41-0.5 0.19-0.13 0.42-0.25 0.71-0.33 0.29-0.1 0.64-0.17 1.04-0.22l0.81-0.1c0.24-0.04 0.43-0.1 0.57-0.17 0.13-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.14-0.79-0.41-1.05-0.28-0.25-0.66-0.38-1.14-0.38-0.43 0-0.8 0.1-1.09 0.28-0.29 0.19-0.5 0.43-0.61 0.73l-0.45-0.17c0.11-0.29 0.28-0.52 0.5-0.71 0.21-0.2 0.46-0.34 0.75-0.43 0.28-0.1 0.58-0.14 0.89-0.14 0.26 0 0.52 0.04 0.76 0.11 0.25 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.35 0.35 0.46 0.59 0.11 0.23 0.17 0.52 0.17 0.85V31H71.6v-1.08h-0.03c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.65 0.44c-0.26 0.1-0.54 0.16-0.86 0.16Zm0.05-0.44c0.37 0 0.7-0.1 1-0.28 0.28-0.18 0.51-0.43 0.68-0.75 0.16-0.32 0.24-0.69 0.24-1.1v-0.88c-0.06 0.06-0.14 0.1-0.26 0.14-0.11 0.04-0.24 0.08-0.38 0.11l-0.45 0.08-0.45 0.06c-0.43 0.05-0.8 0.13-1.07 0.24-0.27 0.1-0.47 0.25-0.6 0.42-0.12 0.17-0.19 0.39-0.19 0.63 0 0.41 0.14 0.74 0.43 0.97 0.28 0.24 0.63 0.36 1.05 0.36ZM76.35 25v0.43H73.7V25h2.66Zm-1.78 6v-6.93c0-0.3 0.07-0.56 0.2-0.78 0.14-0.21 0.32-0.37 0.55-0.49 0.22-0.1 0.47-0.16 0.73-0.16 0.14 0 0.25 0 0.35 0.03 0.1 0.02 0.18 0.05 0.26 0.08l-0.14 0.42-0.2-0.06-0.24-0.02c-0.3 0-0.55 0.1-0.75 0.28-0.2 0.18-0.29 0.44-0.29 0.77V31h-0.47Zm3.29 0v-6h0.47v6h-0.47Zm0.24-7.06c-0.1 0-0.2-0.04-0.28-0.11-0.07-0.07-0.1-0.16-0.1-0.27 0-0.1 0.03-0.19 0.1-0.26 0.08-0.08 0.17-0.11 0.28-0.11 0.1 0 0.2 0.03 0.27 0.1 0.08 0.08 0.11 0.17 0.11 0.27s-0.03 0.2-0.1 0.27c-0.08 0.07-0.18 0.1-0.28 0.1ZM80.35 25h0.47v6.73c0 0.31-0.06 0.58-0.19 0.8-0.12 0.23-0.3 0.41-0.52 0.53-0.23 0.13-0.48 0.19-0.77 0.19h-0.07l-0.08-0.01 0.02-0.44h0.06 0.06c0.29 0 0.53-0.1 0.73-0.29 0.2-0.19 0.3-0.45 0.3-0.78V25Zm0.24-1.06c-0.11 0-0.2-0.04-0.28-0.11-0.07-0.07-0.11-0.16-0.11-0.27 0-0.1 0.04-0.19 0.11-0.26 0.08-0.08 0.17-0.11 0.28-0.11 0.1 0 0.19 0.03 0.27 0.1 0.07 0.08 0.1 0.17 0.1 0.27s-0.03 0.2-0.1 0.27c-0.08 0.07-0.17 0.1-0.27 0.1Zm3.82 7.19c-0.35 0-0.66-0.07-0.95-0.2-0.29-0.15-0.52-0.35-0.7-0.61-0.17-0.27-0.25-0.6-0.25-0.97 0-0.25 0.04-0.47 0.13-0.66 0.09-0.2 0.23-0.36 0.41-0.5 0.19-0.13 0.42-0.25 0.71-0.33 0.3-0.1 0.64-0.17 1.04-0.22l0.81-0.1c0.24-0.04 0.43-0.1 0.57-0.17 0.13-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.14-0.79-0.41-1.05-0.28-0.25-0.66-0.38-1.14-0.38-0.43 0-0.8 0.1-1.09 0.28-0.29 0.19-0.5 0.43-0.61 0.73l-0.45-0.17c0.11-0.29 0.28-0.52 0.5-0.71 0.21-0.2 0.46-0.34 0.75-0.43 0.28-0.1 0.58-0.14 0.89-0.14 0.26 0 0.52 0.04 0.76 0.11 0.25 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.35 0.35 0.46 0.59 0.11 0.23 0.17 0.52 0.17 0.85V31h-0.48v-1.08h-0.03c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.65 0.44c-0.26 0.1-0.54 0.16-0.86 0.16Zm0.05-0.44c0.37 0 0.7-0.1 1-0.28 0.28-0.18 0.51-0.43 0.68-0.75 0.16-0.32 0.24-0.69 0.24-1.1v-0.88c-0.06 0.06-0.14 0.1-0.26 0.14-0.11 0.04-0.24 0.08-0.38 0.11l-0.45 0.08-0.45 0.06c-0.43 0.05-0.8 0.13-1.07 0.24-0.27 0.1-0.47 0.25-0.6 0.42-0.12 0.17-0.19 0.39-0.19 0.63 0 0.41 0.14 0.74 0.43 0.97 0.28 0.24 0.63 0.36 1.05 0.36Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M53.88 5.98H51.4l-1.22-1.83c-0.05-0.07-0.11-0.13-0.19-0.17-0.07-0.04-0.15-0.06-0.24-0.06h-5.5c-0.09 0-0.17 0.02-0.24 0.06-0.08 0.04-0.14 0.1-0.19 0.17L42.6 5.98h-2.48c-0.5 0-0.98 0.2-1.33 0.56-0.35 0.35-0.55 0.83-0.56 1.33v9.63c0 0.5 0.2 0.98 0.56 1.33 0.35 0.36 0.83 0.56 1.34 0.56h13.74c0.5 0 0.99-0.2 1.34-0.56 0.35-0.35 0.55-0.83 0.56-1.33V7.87c0-0.5-0.2-0.98-0.56-1.33C54.86 6.2 54.38 6 53.87 5.98Zm0.85 11.52c0 0.23-0.09 0.45-0.25 0.6-0.16 0.17-0.38 0.26-0.6 0.26H40.12c-0.22 0-0.44-0.1-0.6-0.25-0.16-0.16-0.25-0.38-0.25-0.61V7.87c0-0.22 0.09-0.44 0.25-0.6 0.16-0.16 0.38-0.25 0.6-0.25h2.76c0.08 0 0.16-0.03 0.24-0.07 0.07-0.04 0.14-0.1 0.18-0.17l1.23-1.83h4.95l1.22 1.83c0.04 0.07 0.1 0.13 0.18 0.17 0.08 0.04 0.16 0.07 0.24 0.07h2.76c0.22 0 0.44 0.09 0.6 0.25 0.16 0.16 0.25 0.38 0.25 0.6v9.63ZM47 8.73c-0.71 0-1.41 0.22-2 0.61-0.6 0.4-1.06 0.96-1.33 1.62-0.28 0.66-0.35 1.39-0.21 2.09 0.14 0.7 0.48 1.34 0.99 1.85 0.5 0.5 1.15 0.84 1.85 0.98 0.7 0.14 1.42 0.07 2.08-0.2 0.66-0.27 1.22-0.74 1.62-1.33 0.4-0.6 0.6-1.3 0.6-2 0-0.96-0.37-1.88-1.05-2.56-0.67-0.68-1.6-1.06-2.55-1.06Zm0 6.2c-0.51 0-1-0.16-1.43-0.44-0.43-0.29-0.76-0.69-0.95-1.16-0.2-0.47-0.25-0.99-0.15-1.49s0.35-0.96 0.7-1.32c0.37-0.36 0.83-0.6 1.33-0.7 0.5-0.1 1.02-0.05 1.49 0.14 0.47 0.2 0.87 0.53 1.15 0.95 0.29 0.43 0.44 0.92 0.44 1.43 0 0.69-0.28 1.34-0.76 1.82-0.48 0.49-1.14 0.76-1.82 0.76Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/button_choose_from_gallery.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_choose_from_gallery.xml
new file mode 100644
index 0000000..47c4d95
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/button_choose_from_gallery.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="95dp"
+    android:height="38dp"
+    android:viewportWidth="95"
+    android:viewportHeight="38">
+    <path
+        android:strokeColor="#FF3E4645"
+        android:strokeWidth="1"
+        android:pathData="M15 0.5h65C88 0.5 94.5 7 94.5 15v8c0 8-6.5 14.5-14.5 14.5H15C7 37.5 0.5 31 0.5 23v-8C0.5 7 7 0.5 15 0.5Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M56.27 8.4H38.73c-0.3 0-0.6 0.09-0.82 0.26-0.22 0.17-0.34 0.4-0.34 0.63V18c0 0.24 0.12 0.47 0.34 0.64 0.22 0.16 0.51 0.26 0.82 0.26h17.54c0.3 0 0.6-0.1 0.82-0.26 0.22-0.17 0.34-0.4 0.34-0.64V9.3c0-0.25-0.12-0.47-0.34-0.64-0.22-0.17-0.51-0.27-0.82-0.27Zm-0.08 9.54H38.81v-8.6h17.38v8.6Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M41.64 12.9c0.37 0 0.73-0.08 1.03-0.23 0.31-0.16 0.55-0.39 0.69-0.65 0.14-0.26 0.18-0.55 0.1-0.83-0.07-0.27-0.24-0.53-0.5-0.73-0.26-0.2-0.6-0.34-0.96-0.4-0.36-0.05-0.73-0.02-1.07 0.1-0.34 0.1-0.64 0.28-0.84 0.52-0.2 0.23-0.31 0.51-0.31 0.8 0 0.37 0.2 0.74 0.54 1 0.35 0.28 0.82 0.43 1.32 0.43Zm0-2.19c0.2 0 0.4 0.04 0.56 0.12 0.16 0.08 0.3 0.2 0.37 0.34 0.08 0.14 0.1 0.3 0.07 0.44-0.03 0.15-0.13 0.29-0.27 0.4-0.13 0.1-0.31 0.18-0.5 0.21-0.2 0.03-0.4 0.02-0.58-0.04-0.18-0.06-0.34-0.15-0.45-0.28-0.11-0.13-0.17-0.27-0.17-0.43 0-0.2 0.1-0.39 0.28-0.53 0.18-0.14 0.43-0.22 0.69-0.23Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M41.23 16.99l3.72-2.87 1.98 1.52L45.18 17h1.24l4.63-3.56 3.9 2.97v-0.95l-3.6-2.76c-0.08-0.06-0.2-0.1-0.31-0.1-0.12 0-0.23 0.04-0.31 0.1l-3.2 2.47-2.28-1.75c-0.09-0.06-0.2-0.1-0.31-0.1-0.12 0-0.23 0.04-0.31 0.1L40 16.99h1.23Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M55.04 5.05c0-0.13-0.07-0.25-0.18-0.34-0.12-0.09-0.28-0.14-0.44-0.14H40.76c-0.17 0-0.33 0.05-0.44 0.14-0.12 0.1-0.18 0.21-0.18 0.34v0.48h14.9V5.05Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M56.27 6.96c0-0.13-0.07-0.25-0.18-0.34-0.12-0.09-0.28-0.14-0.44-0.14H39.5c-0.16 0-0.32 0.05-0.44 0.14-0.11 0.1-0.18 0.21-0.18 0.34v0.48h17.39V6.96Z"/>
+    <path
+        android:fillColor="#FF3E4645"
+        android:pathData="M6.81 23.8v8H6.32v-8h0.49Zm1.94 8v-0.4l3.54-5.1v-0.04H8.95v-0.45h3.94v0.41l-3.5 5.1v0.04h3.64v0.45H8.75Zm7.51 0.14c-0.34 0-0.66-0.07-0.95-0.2-0.29-0.15-0.52-0.35-0.7-0.61-0.16-0.27-0.25-0.6-0.25-0.97 0-0.25 0.04-0.47 0.13-0.66 0.1-0.2 0.23-0.36 0.41-0.5 0.19-0.13 0.42-0.25 0.71-0.34 0.3-0.09 0.64-0.16 1.04-0.2l0.81-0.11c0.24-0.04 0.43-0.1 0.57-0.17 0.14-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.13-0.79-0.41-1.05-0.28-0.25-0.66-0.38-1.14-0.38-0.43 0-0.8 0.1-1.09 0.28-0.29 0.19-0.5 0.43-0.61 0.73L14.53 27c0.12-0.29 0.28-0.52 0.5-0.71 0.22-0.2 0.47-0.34 0.75-0.43 0.28-0.1 0.58-0.14 0.89-0.14 0.27 0 0.52 0.04 0.76 0.11 0.25 0.08 0.47 0.2 0.66 0.35 0.19 0.15 0.34 0.35 0.45 0.59 0.11 0.23 0.17 0.52 0.17 0.85v4.19h-0.48v-1.08H18.2c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.65 0.44c-0.26 0.1-0.54 0.16-0.86 0.16Zm0.05-0.44c0.37 0 0.7-0.1 1-0.28 0.29-0.18 0.51-0.43 0.68-0.75 0.16-0.32 0.24-0.69 0.24-1.1V28.5c-0.06 0.06-0.14 0.1-0.26 0.14-0.1 0.04-0.24 0.08-0.38 0.1-0.14 0.04-0.29 0.06-0.45 0.09l-0.44 0.06c-0.44 0.05-0.8 0.13-1.07 0.24-0.28 0.1-0.48 0.25-0.6 0.42-0.13 0.17-0.2 0.39-0.2 0.63 0 0.41 0.15 0.73 0.43 0.97s0.63 0.36 1.05 0.36Zm4.57 0.3v-8h0.47v3.35h0.05c0.09-0.26 0.22-0.5 0.4-0.71 0.17-0.22 0.38-0.4 0.64-0.52 0.25-0.13 0.55-0.2 0.89-0.2 0.48 0 0.9 0.13 1.26 0.4s0.64 0.63 0.84 1.1c0.2 0.47 0.3 1 0.3 1.6 0 0.61-0.1 1.15-0.3 1.62-0.2 0.46-0.48 0.83-0.83 1.1-0.36 0.26-0.78 0.4-1.27 0.4-0.34 0-0.64-0.07-0.89-0.2-0.26-0.13-0.47-0.3-0.64-0.52-0.17-0.22-0.3-0.46-0.4-0.72h-0.06v1.3h-0.46Zm0.47-2.98c0 0.51 0.07 0.97 0.23 1.37 0.15 0.4 0.38 0.72 0.67 0.96 0.29 0.23 0.64 0.34 1.04 0.34 0.42 0 0.77-0.11 1.06-0.35 0.3-0.24 0.51-0.56 0.67-0.96 0.15-0.4 0.23-0.86 0.23-1.36 0-0.5-0.08-0.95-0.23-1.35-0.16-0.4-0.38-0.72-0.67-0.95-0.3-0.24-0.64-0.36-1.06-0.36-0.4 0-0.75 0.12-1.04 0.35-0.3 0.23-0.52 0.55-0.67 0.95-0.16 0.4-0.23 0.85-0.23 1.36Zm8.36 3.11c-0.54 0-1.01-0.13-1.42-0.4-0.4-0.27-0.7-0.63-0.92-1.1-0.22-0.47-0.33-1-0.33-1.6 0-0.6 0.1-1.13 0.33-1.6 0.22-0.46 0.52-0.83 0.9-1.1 0.4-0.27 0.83-0.41 1.33-0.41 0.33 0 0.65 0.07 0.95 0.2 0.3 0.14 0.57 0.33 0.8 0.58 0.23 0.25 0.4 0.56 0.54 0.91 0.13 0.36 0.2 0.76 0.2 1.2v0.3h-4.75v-0.43h4.27c0-0.43-0.09-0.83-0.26-1.17-0.18-0.35-0.42-0.63-0.73-0.84-0.3-0.2-0.64-0.3-1.02-0.3-0.4 0-0.76 0.1-1.07 0.33-0.31 0.22-0.56 0.52-0.74 0.9-0.18 0.38-0.27 0.8-0.28 1.27v0.19c0 0.5 0.09 0.95 0.26 1.35 0.18 0.4 0.43 0.7 0.76 0.94 0.33 0.23 0.72 0.34 1.18 0.34 0.33 0 0.6-0.05 0.84-0.16 0.23-0.11 0.42-0.25 0.57-0.4 0.15-0.17 0.26-0.32 0.34-0.47l0.43 0.18c-0.09 0.2-0.23 0.4-0.42 0.6-0.2 0.2-0.44 0.36-0.73 0.5-0.3 0.13-0.64 0.2-1.03 0.2Zm4.02-0.12v-6h0.46v0.94h0.05c0.13-0.31 0.35-0.56 0.66-0.74 0.3-0.19 0.66-0.28 1.06-0.28h0.12 0.12v0.48l-0.12-0.01-0.15-0.01c-0.34 0-0.63 0.07-0.9 0.21-0.25 0.15-0.45 0.34-0.6 0.6-0.15 0.25-0.22 0.53-0.22 0.86v3.95h-0.48Zm3.77 0v-6h0.47v6H37.5Zm0.24-7.06c-0.1 0-0.2-0.04-0.27-0.11-0.08-0.08-0.12-0.16-0.12-0.27 0-0.1 0.04-0.2 0.12-0.26 0.07-0.08 0.16-0.11 0.27-0.11 0.1 0 0.2 0.03 0.27 0.1 0.08 0.08 0.12 0.17 0.12 0.27s-0.04 0.2-0.12 0.27c-0.07 0.07-0.16 0.1-0.27 0.1Zm5.35 7.06v-6h0.47v6h-0.47Zm0.24-7.06c-0.1 0-0.2-0.04-0.28-0.11-0.07-0.08-0.11-0.16-0.11-0.27 0-0.1 0.04-0.2 0.11-0.26 0.08-0.08 0.17-0.11 0.28-0.11 0.1 0 0.19 0.03 0.26 0.1 0.08 0.08 0.12 0.17 0.12 0.27s-0.04 0.2-0.11 0.27c-0.08 0.07-0.17 0.1-0.27 0.1Zm2.02 7.06v-0.4l3.53-5.1v-0.05h-3.33v-0.45h3.94v0.41l-3.5 5.1v0.04h3.64v0.45h-4.28Zm11.18 2.37c-0.37 0-0.7-0.05-1-0.14-0.3-0.1-0.56-0.24-0.76-0.42-0.2-0.18-0.37-0.4-0.48-0.64l0.4-0.23c0.1 0.19 0.22 0.36 0.38 0.51 0.17 0.15 0.37 0.27 0.61 0.36 0.25 0.08 0.53 0.13 0.85 0.13 0.58 0 1.03-0.15 1.37-0.45 0.34-0.3 0.5-0.75 0.5-1.37v-1.5h-0.04c-0.1 0.27-0.23 0.5-0.4 0.7-0.18 0.2-0.4 0.36-0.66 0.48-0.26 0.11-0.55 0.17-0.88 0.17-0.47 0-0.89-0.12-1.25-0.37-0.36-0.24-0.64-0.59-0.84-1.03-0.2-0.45-0.3-0.97-0.3-1.57 0-0.6 0.1-1.13 0.3-1.6 0.2-0.46 0.47-0.83 0.83-1.1 0.36-0.26 0.78-0.39 1.27-0.39 0.34 0 0.64 0.07 0.9 0.2 0.25 0.13 0.46 0.3 0.64 0.52 0.17 0.21 0.3 0.45 0.4 0.7h0.05v-1.33h0.46v6.14c0 0.5-0.1 0.92-0.3 1.25-0.2 0.33-0.47 0.57-0.82 0.74-0.35 0.16-0.76 0.24-1.23 0.24Zm-0.06-2.84c0.4 0 0.74-0.1 1.03-0.3 0.3-0.21 0.52-0.5 0.67-0.88 0.16-0.38 0.24-0.83 0.24-1.35 0-0.51-0.08-0.96-0.23-1.36-0.15-0.4-0.38-0.71-0.67-0.94-0.29-0.23-0.64-0.35-1.04-0.35-0.42 0-0.77 0.12-1.06 0.36-0.3 0.23-0.52 0.54-0.67 0.94-0.16 0.4-0.24 0.85-0.24 1.35 0 0.5 0.08 0.94 0.24 1.32 0.16 0.37 0.38 0.67 0.67 0.89 0.3 0.21 0.64 0.32 1.06 0.32Zm6 0.6c-0.34 0-0.66-0.07-0.95-0.2-0.29-0.15-0.52-0.35-0.69-0.61-0.17-0.27-0.26-0.6-0.26-0.97 0-0.25 0.05-0.47 0.14-0.66 0.08-0.2 0.22-0.36 0.4-0.5 0.19-0.13 0.43-0.25 0.72-0.34 0.29-0.09 0.63-0.16 1.03-0.2l0.82-0.11c0.24-0.04 0.42-0.1 0.56-0.17 0.14-0.07 0.2-0.19 0.2-0.34v-0.25c0-0.44-0.13-0.79-0.4-1.05-0.28-0.25-0.66-0.38-1.15-0.38-0.43 0-0.79 0.1-1.08 0.28-0.3 0.19-0.5 0.43-0.62 0.73L60.74 27c0.12-0.29 0.28-0.52 0.5-0.71 0.22-0.2 0.47-0.34 0.75-0.43 0.28-0.1 0.58-0.14 0.9-0.14 0.26 0 0.51 0.04 0.76 0.11 0.24 0.08 0.46 0.2 0.65 0.35 0.2 0.15 0.34 0.35 0.46 0.59 0.1 0.23 0.16 0.52 0.16 0.85v4.19h-0.47v-1.08H64.4c-0.1 0.22-0.25 0.43-0.43 0.61s-0.4 0.33-0.65 0.44c-0.25 0.1-0.54 0.16-0.86 0.16Zm0.05-0.44c0.38 0 0.7-0.1 1-0.28 0.29-0.18 0.52-0.43 0.68-0.75 0.17-0.32 0.25-0.69 0.25-1.1V28.5c-0.06 0.06-0.15 0.1-0.26 0.14-0.12 0.04-0.24 0.08-0.39 0.1-0.14 0.04-0.29 0.06-0.44 0.09l-0.45 0.06c-0.44 0.05-0.8 0.13-1.07 0.24-0.28 0.1-0.48 0.25-0.6 0.42-0.13 0.17-0.2 0.39-0.2 0.63 0 0.41 0.15 0.73 0.43 0.97s0.63 0.36 1.05 0.36Zm4.88-7.69v8h-0.48v-8h0.48Zm4.31 8.12c-0.54 0-1.01-0.13-1.41-0.4-0.4-0.27-0.71-0.63-0.93-1.1-0.22-0.47-0.33-1-0.33-1.6 0-0.6 0.1-1.13 0.33-1.6 0.22-0.46 0.52-0.83 0.9-1.1 0.4-0.27 0.83-0.41 1.33-0.41 0.33 0 0.65 0.07 0.95 0.2 0.3 0.14 0.57 0.33 0.8 0.58 0.23 0.25 0.41 0.56 0.54 0.91 0.13 0.36 0.2 0.76 0.2 1.2v0.3h-4.75v-0.43h4.27c0-0.43-0.09-0.83-0.26-1.17-0.18-0.35-0.42-0.63-0.72-0.84-0.31-0.2-0.65-0.3-1.03-0.3-0.4 0-0.76 0.1-1.07 0.33-0.3 0.22-0.55 0.52-0.74 0.9-0.18 0.38-0.27 0.8-0.28 1.27v0.19c0 0.5 0.09 0.95 0.26 1.35 0.18 0.4 0.43 0.7 0.76 0.94 0.33 0.23 0.72 0.34 1.18 0.34 0.33 0 0.6-0.05 0.84-0.16s0.43-0.25 0.58-0.4c0.14-0.17 0.26-0.32 0.33-0.47l0.43 0.18c-0.09 0.2-0.23 0.4-0.42 0.6-0.2 0.2-0.43 0.36-0.73 0.5-0.29 0.13-0.63 0.2-1.03 0.2Zm4.02-0.12v-6h0.47v0.94h0.04c0.13-0.31 0.35-0.56 0.66-0.74 0.3-0.19 0.66-0.28 1.06-0.28h0.12 0.12v0.48l-0.11-0.01-0.16-0.01c-0.33 0-0.63 0.07-0.9 0.21-0.25 0.15-0.45 0.34-0.6 0.6-0.15 0.25-0.22 0.53-0.22 0.86v3.95h-0.48Zm3.77 0v-6h0.48v6H79.5Zm0.24-7.06c-0.1 0-0.2-0.04-0.27-0.11-0.08-0.08-0.12-0.16-0.12-0.27 0-0.1 0.04-0.2 0.12-0.26 0.07-0.08 0.16-0.11 0.27-0.11 0.1 0 0.2 0.03 0.27 0.1 0.08 0.08 0.12 0.17 0.12 0.27s-0.04 0.2-0.12 0.27c-0.07 0.07-0.16 0.1-0.27 0.1ZM82 25.8h0.47v6.73c0 0.31-0.07 0.58-0.2 0.8-0.12 0.23-0.3 0.41-0.52 0.53-0.22 0.13-0.48 0.19-0.77 0.19h-0.07l-0.08-0.01 0.02-0.44h0.06 0.06c0.3 0 0.54-0.1 0.73-0.29 0.2-0.19 0.3-0.45 0.3-0.78v-6.73Zm0.23-1.06c-0.1 0-0.2-0.04-0.27-0.11-0.08-0.08-0.12-0.16-0.12-0.27 0-0.1 0.04-0.2 0.12-0.26 0.07-0.08 0.16-0.11 0.27-0.11 0.1 0 0.2 0.03 0.27 0.1 0.07 0.08 0.11 0.17 0.11 0.27s-0.04 0.2-0.11 0.27c-0.08 0.07-0.17 0.1-0.27 0.1Zm4.57 7.18c-0.54 0-1-0.13-1.41-0.4-0.4-0.27-0.71-0.63-0.93-1.1-0.22-0.47-0.33-1-0.33-1.6 0-0.6 0.11-1.13 0.33-1.6 0.22-0.46 0.52-0.83 0.91-1.1 0.39-0.27 0.83-0.41 1.32-0.41 0.34 0 0.65 0.07 0.95 0.2 0.3 0.14 0.57 0.33 0.8 0.58 0.23 0.25 0.41 0.56 0.54 0.91 0.14 0.36 0.2 0.76 0.2 1.2v0.3h-4.75v-0.43h4.28c0-0.43-0.1-0.83-0.27-1.17-0.18-0.35-0.42-0.63-0.72-0.84-0.3-0.2-0.65-0.3-1.03-0.3-0.4 0-0.75 0.1-1.07 0.33-0.3 0.22-0.55 0.52-0.73 0.9-0.18 0.38-0.28 0.8-0.29 1.27v0.19c0 0.5 0.1 0.95 0.27 1.35 0.17 0.4 0.43 0.7 0.75 0.94 0.33 0.23 0.73 0.34 1.18 0.34 0.33 0 0.61-0.05 0.84-0.16 0.24-0.11 0.43-0.25 0.58-0.4 0.15-0.17 0.26-0.32 0.33-0.47L89 30.64c-0.1 0.2-0.24 0.4-0.43 0.6-0.19 0.2-0.43 0.36-0.73 0.5-0.29 0.13-0.63 0.2-1.03 0.2Z"/>
+</vector>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
new file mode 100644
index 0000000..01c8abd
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/activity_maps.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<fragment xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:map="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/map"
+    android:name="com.google.android.gms.maps.SupportMapFragment"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".Activities.MapsActivity" />
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml
index 8f9700e..8e93eb5 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new.xml
@@ -2,7 +2,7 @@
 <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:id="@+id/bottomSheetAddNewForNav"
+    android:id="@+id/bottomSheetAddNew"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
@@ -10,36 +10,53 @@
         android:id="@+id/textView6"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Dodaj novu objavu"
+        android:layout_marginTop="16dp"
+        android:fontFamily="sans-serif-black"
+        android:text=" "
+        android:textSize="20sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <Button
-        android:id="@+id/btnBottomSheetAddNewOpenAddPost"
-        android:layout_width="165dp"
-        android:layout_height="88dp"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:text="Izaberi fotografije iz galerije"
+    <ImageButton
+        android:id="@+id/btnBottomSheetAddNewPost"
+        android:layout_width="0dp"
+        android:layout_height="60dp"
+        android:layout_marginStart="30dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="40dp"
+
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/button_add_post"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btnBottomSheetAddNewLocation"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/textView6"
-        app:layout_constraintVertical_bias="1.0" />
-
-    <Button
-        android:id="@+id/btnBottomSheetAddNewOpenCapturePost"
+        app:layout_constraintVertical_bias="0.0" />
 
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:text="Nova fotografija"
+    <ImageButton
+        android:id="@+id/btnBottomSheetAddNewLocation"
+        android:layout_width="0dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/button_add_location"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.862"
-        app:layout_constraintStart_toEndOf="@+id/btnBottomSheetAddNewOpenAddPost"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toEndOf="@+id/btnBottomSheetAddNewPost"
         app:layout_constraintTop_toBottomOf="@+id/textView6"
-        app:layout_constraintVertical_bias="0.666" />
+        app:layout_constraintVertical_bias="1.0" />
+
+    <ImageButton
+        android:id="@+id/btnBottomSheetAddNewClose"
+        android:layout_width="65dp"
+        android:layout_height="17dp"
+        app:cornerRadius="50dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml
new file mode 100644
index 0000000..10aa669
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/bottom_sheet_add_new_post.xml
@@ -0,0 +1,63 @@
+<?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:id="@+id/bottomSheetAddNewForNav"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+>
+    <TextView
+        android:id="@+id/textView6"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:fontFamily="sans-serif-black"
+        android:text="Dodaj novu objavu"
+        android:textSize="20sp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ImageButton
+        android:id="@+id/btnBottomSheetAddNewPostOpenAddPost"
+        android:layout_width="0dp"
+        android:layout_height="60dp"
+        android:layout_marginStart="30dp"
+
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="40dp"
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/button_choose_from_gallery"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/btnBottomSheetAddNewPostOpenCapturePost"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/textView6"
+        app:layout_constraintVertical_bias="0.0" />
+
+    <ImageButton
+        android:id="@+id/btnBottomSheetAddNewPostOpenCapturePost"
+
+        android:layout_width="0dp"
+        android:layout_height="60dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="30dp"
+        android:layout_marginBottom="24dp"
+        android:background="@drawable/button_capture"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toEndOf="@+id/btnBottomSheetAddNewPostOpenAddPost"
+        app:layout_constraintTop_toBottomOf="@+id/textView6"
+        app:layout_constraintVertical_bias="1.0" />
+
+    <ImageButton
+        android:id="@+id/btnBottomSheetAddNewPostClose"
+        android:layout_width="65dp"
+        android:layout_height="17dp"
+        app:cornerRadius="50dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
index d7b376c..6770d14 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/values/strings.xml
@@ -3,4 +3,5 @@
     <!-- TODO: Remove or change this placeholder text -->
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="dim">16dp</string>
+    <string name="title_activity_maps">MapsActivity</string>
 </resources>
\ No newline at end of file
diff --git a/Client/BrzoDoLokacije/build.gradle b/Client/BrzoDoLokacije/build.gradle
index c518bc1..f8ba472 100644
--- a/Client/BrzoDoLokacije/build.gradle
+++ b/Client/BrzoDoLokacije/build.gradle
@@ -3,4 +3,5 @@ plugins {
     id 'com.android.application' version '7.3.0' apply false
     id 'com.android.library' version '7.3.0' apply false
     id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
+    id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false
 }
\ No newline at end of file