diff options
3 files changed, 58 insertions, 2 deletions
diff --git a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt index f969669..0e9c9da 100644 --- a/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt +++ b/Client/BrzoDoLokacije/app/src/main/java/com/example/brzodolokacije/Activities/ActivitySinglePost.kt @@ -1,11 +1,18 @@ package com.example.brzodolokacije.Activities +import android.app.Dialog +import android.content.Context import android.content.Intent +import android.graphics.Color +import android.graphics.drawable.ColorDrawable import android.os.Bundle +import android.preference.PreferenceManager import android.util.Log +import android.view.Gravity import android.widget.TextView import android.widget.Toast import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.ContextCompat import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.example.brzodolokacije.Adapters.CommentsAdapter @@ -15,9 +22,15 @@ import com.example.brzodolokacije.R import com.example.brzodolokacije.Services.RetrofitHelper import com.example.brzodolokacije.Services.SharedPreferencesHelper import com.example.brzodolokacije.databinding.ActivitySinglePostBinding +import com.google.android.material.bottomsheet.BottomSheetDialog import com.google.gson.Gson import kotlinx.android.synthetic.main.activity_single_post.* import okhttp3.ResponseBody +import org.osmdroid.config.Configuration +import org.osmdroid.tileprovider.tilesource.TileSourceFactory +import org.osmdroid.util.GeoPoint +import org.osmdroid.views.MapView +import org.osmdroid.views.overlay.Marker import retrofit2.Call import retrofit2.Response @@ -63,7 +76,39 @@ class ActivitySinglePost : AppCompatActivity() { intent.putExtra("user", Gson().toJson(userData)) this.startActivity(intent) } + binding.tvLocationType.setOnClickListener{ + getMap() + + } } + fun getMap(){ + val mapDialogue = BottomSheetDialog(this@ActivitySinglePost, android.R.style.Theme_Black_NoTitleBar) + mapDialogue.getWindow()?.setBackgroundDrawable(ColorDrawable(Color.argb(100, 0, 0, 0))) + mapDialogue.setContentView(R.layout.map_dialogue) + mapDialogue.setCancelable(true) + mapDialogue.setCanceledOnTouchOutside(true) + var map: MapView? = null + Configuration.getInstance().load(this, PreferenceManager.getDefaultSharedPreferences(this)); + map=mapDialogue.findViewById(R.id.MapDialogueMapView) + //findViewById(R.id.MapDialogueMapView) as MapView + map!!.setTileSource(TileSourceFactory.MAPNIK); + map!!.setBuiltInZoomControls(true); + map!!.setMultiTouchControls(true); + val mapController = map!!.controller + mapController.setZoom(15) + + val LocMarker = GeoPoint(post.location.latitude,post.location.longitude) + val startMarker = Marker(map) + val marker = ContextCompat.getDrawable(this@ActivitySinglePost, R.drawable.ic_baseline_location_on_24); + startMarker.icon=marker + startMarker.setPosition(LocMarker) + startMarker.setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER) + map!!.getOverlays().add(startMarker) + map!!.controller.setCenter(LocMarker) + mapDialogue.show() + + } + fun buildRecyclerViewComments(){ recyclerViewComments=binding.rvComments @@ -228,7 +273,7 @@ class ActivitySinglePost : AppCompatActivity() { binding.apply { tvTitle.text= post.location.name tvTitle.invalidate() - tvLocationType.text="TODO" + tvLocationType.text="TODO Click to open map" tvLocationType.invalidate() tvLocationParent.text="TODO" tvLocationParent.invalidate() diff --git a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_location_on_24.xml b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_location_on_24.xml index c0bbc95..5a1bcff 100644 --- a/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_location_on_24.xml +++ b/Client/BrzoDoLokacije/app/src/main/res/drawable/ic_baseline_location_on_24.xml @@ -1,4 +1,4 @@ -<vector android:height="24dp" android:tint="#F1DB24" +<vector android:height="24dp" android:tint="#FD3636" 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="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13c0,-3.87 -3.13,-7 -7,-7zM12,11.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5 2.5,1.12 2.5,2.5 -1.12,2.5 -2.5,2.5z"/> diff --git a/Client/BrzoDoLokacije/app/src/main/res/layout/map_dialogue.xml b/Client/BrzoDoLokacije/app/src/main/res/layout/map_dialogue.xml new file mode 100644 index 0000000..8b48d9d --- /dev/null +++ b/Client/BrzoDoLokacije/app/src/main/res/layout/map_dialogue.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="300dp" + android:id="@+id/map_dialogue"> + + <org.osmdroid.views.MapView + android:id="@+id/MapDialogueMapView" + android:layout_width="match_parent" + android:layout_height="match_parent" /> +</RelativeLayout>
\ No newline at end of file |