displaying geolocation in a message

redsolution · Jul 12, 2023 · 0b6c85a · 0b6c85a
1 parent d134eb6
commit 0b6c85a
Show file tree

Hide file tree

Showing 8 changed files with 488 additions and 312 deletions.
diff --git a/...in/java/com/xabber/presentation/application/fragments/chat/geo/PickGeolocationActivity.kt b/...in/java/com/xabber/presentation/application/fragments/chat/geo/PickGeolocationActivity.kt
@@ -192,7 +192,6 @@ class PickGeolocationActivity : AppCompatActivity() {
 
     @Deprecated("Deprecated in Java")
     override fun onBackPressed() {
-
         if (binding.bottomBubble.isVisible) {
             binding.tvLocationTitle.text = ""
             binding.tvLocationCoordinates.text = ""

diff --git a/...ain/java/com/xabber/presentation/application/fragments/chat/message/GeoLocationBuilder.kt b/...ain/java/com/xabber/presentation/application/fragments/chat/message/GeoLocationBuilder.kt
@@ -1,8 +1,15 @@
 package com.xabber.presentation.application.fragments.chat.message
 
+import android.annotation.SuppressLint
+import android.graphics.Bitmap
+import android.graphics.Canvas
 import android.graphics.drawable.ShapeDrawable
 import android.graphics.drawable.shapes.RoundRectShape
+import android.os.Handler
+import android.os.Looper
+import android.util.Log
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
@@ -14,6 +21,10 @@ import com.xabber.presentation.application.fragments.chat.ChatSettingsManager
 import com.xabber.utils.StringUtils
 import com.xabber.utils.custom.ShapeOfView
 import com.xabber.utils.dp
+import okhttp3.*
+import org.osmdroid.tileprovider.tilesource.TileSourceFactory
+import org.osmdroid.util.GeoPoint
+import org.osmdroid.views.MapView
 import java.util.*
 
 class GeoLocationBuilder {
@@ -23,10 +34,11 @@ class GeoLocationBuilder {
             .inflate(R.layout.geo_location_box, parent, false)
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     fun addGeoLocationBox(
         view: View, message: MessageDto,
         latitude: Double,
-        longitude: Double
+        longitude: Double, onViewClickListener: MessageAdapter.OnViewClickListener?
     ) {
         val mapImage = view.findViewById<ImageView>(R.id.map_image)
         val shape = view.findViewById<ShapeOfView>(R.id.geo_shape)
@@ -54,7 +66,21 @@ class GeoLocationBuilder {
         )
         val shapeDrawable = ShapeDrawable(RoundRectShape(cornerRadii, null, null))
         shape.setDrawable(shapeDrawable)
-        // получить картинку по координатам и загрузить в mapImage
+       val map = view.findViewById<MapView>(R.id.map)
+        map.apply {
+            val location = GeoPoint(latitude, longitude)
+            map.controller.setCenter(location)
+            map.setTileSource(TileSourceFactory.MAPNIK)
+            map.isTilesScaledToDpi = true
+            map.controller?.setZoom(15.5)
+        }
+        map?.zoomController?.onDetach()
+        map?.setOnTouchListener { _, motionEvent ->
+            when (motionEvent.action) {
+                MotionEvent.ACTION_UP -> onViewClickListener?.onLocationClick(latitude, longitude)
+            }; true
+
+        }
     }
 
 

diff --git a/...main/java/com/xabber/presentation/application/fragments/chat/message/MessageViewHolder.kt b/...main/java/com/xabber/presentation/application/fragments/chat/message/MessageViewHolder.kt
@@ -169,9 +169,8 @@ abstract class MessageViewHolder(
         val geoLocationBox = GeoLocationBuilder()
         val geoLocationView: View =
            geoLocationBox.inflateView(messageContainer!!)
-        geoLocationBox.addGeoLocationBox(geoLocationView, message, latitude, longitude)
+        geoLocationBox.addGeoLocationBox(geoLocationView, message, latitude, longitude, onViewClickListener)
         messageContainer?.addView(geoLocationView)
-        geoLocationView.setOnClickListener { onViewClickListener?.onLocationClick(latitude, longitude) }
     }
 
     private fun addVoiceMessageBox(path: String, message: MessageDto) {

diff --git a/...main/java/com/xabber/presentation/application/fragments/contacts/AttachmentBottomSheet.kt b/...main/java/com/xabber/presentation/application/fragments/contacts/AttachmentBottomSheet.kt
diff --git a/...rc/main/java/com/xabber/presentation/application/fragments/contacts/UniqueKeyGenerator.kt b/...rc/main/java/com/xabber/presentation/application/fragments/contacts/UniqueKeyGenerator.kt
@@ -0,0 +1,11 @@
+package com.xabber.presentation.application.fragments.contacts
+
+import java.util.*
+
+object UniqueKeyGenerator {
+    var a = 0
+    fun generatePrimaryKey(): String {        val uuid: UUID = UUID.randomUUID()
+        a+=1
+        return uuid.toString() + a.toString()
+
+    }}
diff --git a/app/src/main/res/drawable/ic_add_circle.xml b/app/src/main/res/drawable/ic_add_circle.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="oval">
+            <solid android:color="@color/blue_700" />
+        </shape>
+    </item>
+    <item
+        android:width="24dp"
+        android:height="24dp"
+        android:bottom="12dp"
+        android:drawable="@drawable/ic_plus_white"
+        android:left="12dp"
+        android:right="12dp"
+        android:top="12dp" />
+</layer-list>
diff --git a/app/src/main/res/layout/attachment_action_panel.xml b/app/src/main/res/layout/attachment_action_panel.xml
@@ -53,5 +53,13 @@
             android:layout_height="wrap_content"
             android:drawableTop="@drawable/music_circle"
             android:text="@string/music_label" />
+
+        <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/add_messages"
+            style="@style/AttachmentBottomSheetAction"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableTop="@drawable/ic_add_circle"
+            android:text="@string/music_label" />
     </LinearLayout>
 </HorizontalScrollView>
diff --git a/app/src/main/res/layout/geo_location_box.xml b/app/src/main/res/layout/geo_location_box.xml
@@ -5,6 +5,10 @@
     android:layout_height="174dp"
     android:paddingVertical="2dp"
     android:paddingHorizontal="4dp">
+    <org.osmdroid.views.MapView
+        android:id="@+id/map"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"/>
 
     <com.xabber.utils.custom.ShapeOfView
         android:id="@+id/geo_shape"
@@ -14,7 +18,7 @@
         <ImageView
             android:background="@color/green_500"
             android:outlineProvider="background"
-            android:src="@drawable/img_2"
+
             android:id="@+id/map_image"
             android:scaleType="centerCrop"
             android:layout_width="match_parent"