Omoguceno pozivanje mape korisnika za prikaz na profilu korisnika.

4 files changed, 25 insertions, 23 deletions

diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
index d69a40c..d6971c4 100644
--- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
+++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Fragments/FragmentUserPosts.kt
@@ -31,10 +31,13 @@ import retrofit2.converter.gson.GsonConverterFactory
 import android.widget.Button
 import android.widget.ImageButton
 import android.widget.TextView
+import com.auth0.android.jwt.JWT
 import com.example.brzodolokacije.Activities.ActivityAddPost
 import com.example.brzodolokacije.Activities.ActivityCapturePost
 import com.example.brzodolokacije.Activities.ActivityForgottenPassword
+import com.example.brzodolokacije.Activities.NavigationActivity
 import com.example.brzodolokacije.Adapters.MyPostsAdapter
+import com.example.brzodolokacije.UserPostsMapFragment
 
 import com.google.android.material.bottomsheet.BottomSheetDialog
 
@@ -56,27 +59,21 @@ class FragmentUserPosts : Fragment() {
 
         addNewPost=view.findViewById<View>(R.id.tvFragmentUserPostsAddPost) as TextView
         addNewPost.setOnClickListener {
-            var bottomSheetDialog2: BottomSheetDialog
-            bottomSheetDialog2= BottomSheetDialog(requireContext())
-            bottomSheetDialog2.setContentView(R.layout.bottom_sheet_add_new_post)
-            bottomSheetDialog2.show()
-
-            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{
-                val intent = Intent (getActivity(), ActivityAddPost::class.java)
-                getActivity()?.startActivity(intent)
+            val bundle = Bundle()
+            var jwtString=SharedPreferencesHelper.getValue("jwt",requireActivity())
+            if(jwtString!=null) {
+                var jwt: JWT = JWT(jwtString!!)
+                var userId=jwt.getClaim("id").asString()
+                bundle.putString("id", userId)
+                val userMapFragment = UserPostsMapFragment()
+                userMapFragment.setArguments(bundle)
+                var act=requireActivity()as NavigationActivity
+                act.supportFragmentManager.beginTransaction().replace(
+                    R.id.flNavigationFragment,userMapFragment
+                )
+                    .commit()
             }
 
-            capturePost.setOnClickListener{
-                val intent = Intent (getActivity(), ActivityCapturePost::class.java)
-                getActivity()?.startActivity(intent)
-            }
-            close.setOnClickListener {
-                bottomSheetDialog2.dismiss()
-            }
         }
 
         rvPosts=view.findViewById(R.id.rvFragmentUserPostsPosts) as RecyclerView
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 88685e4..43c2109 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_map_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_map_24.xml
new file mode 100644
index 0000000..a89ac5c
--- /dev/null
+++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_map_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#274352"
+    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.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48V20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48V3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM15,19l-6,-2.11V5l6,2.11V19z"/>
+</vector>
diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
index a396416..aa8bf99 100644
--- a/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
+++ b/Client/BrzoDoLokacije/app/src/main/res/layout/fragment_user_posts.xml
@@ -18,7 +18,7 @@ android:orientation="vertical"
             android:layout_height="wrap_content"
             android:layout_gravity="end"
             android:layout_marginEnd="110dp"
-            android:src="@drawable/ic_baseline_post_add_24"
+            android:src="@drawable/ic_baseline_map_24"
            />
 
         <TextView
@@ -28,7 +28,7 @@ android:orientation="vertical"
             android:layout_gravity="end"
             android:layout_marginEnd="20dp"
             android:clickable="true"
-            android:text="@string/dodaj_objavu"
+            android:text="Mapa objava"
             android:textSize="15sp"
             android:focusable="true" />
     </androidx.cardview.widget.CardView>