mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-26 19:36:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

Code review fixes.

Browse source
This commit is contained in:
Onuray Sahin 2022-07-19 14:58:00 +03:00
parent 619da0e84d
commit c408f824d3
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapMarkerOptionsDialog.kt
View file

@ -17,17 +17,14 @@
package im.vector.app.features.location.live.map package im.vector.app.features.location.live.map
import android.content.Context import android.content.Context
import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.PopupWindow import android.widget.PopupWindow
import androidx.core.content.ContextCompat
import im.vector.app.R import im.vector.app.R
import im.vector.app.databinding.ViewLiveLocationMarkerPopupBinding import im.vector.app.databinding.ViewLiveLocationMarkerPopupBinding
class LocationLiveMapMarkerOptionsDialog( class LocationLiveMapMarkerOptionsDialog(
context: Context, context: Context,
inflater: LayoutInflater,
) : PopupWindow() { ) : PopupWindow() {
interface Callback { interface Callback {
@ -39,7 +36,7 @@ class LocationLiveMapMarkerOptionsDialog(
var callback: Callback? = null var callback: Callback? = null
init { init {
contentView = inflater.inflate(R.layout.view_live_location_marker_popup, null, false) contentView = View.inflate(context, R.layout.view_live_location_marker_popup, null)
views = ViewLiveLocationMarkerPopupBinding.bind(contentView) views = ViewLiveLocationMarkerPopupBinding.bind(contentView)
@ -48,8 +45,6 @@ class LocationLiveMapMarkerOptionsDialog(
inputMethodMode = INPUT_METHOD_NOT_NEEDED inputMethodMode = INPUT_METHOD_NOT_NEEDED
isFocusable = true isFocusable = true
isTouchable = true isTouchable = true
elevation = 8f
setBackgroundDrawable(ContextCompat.getDrawable(context, R.drawable.bg_live_location_marker_popup))
contentView.setOnClickListener { contentView.setOnClickListener {
callback?.onShareLocationClicked() callback?.onShareLocationClicked()
@ -58,6 +53,7 @@ class LocationLiveMapMarkerOptionsDialog(
fun show(anchorView: View) { fun show(anchorView: View) {
contentView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED) contentView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED)
// By default the left side of the dialog is aligned with the pin. We need shift it to the left to make it's center aligned with the pin.
showAsDropDown(anchorView, -contentView.measuredWidth / 2, 0) showAsDropDown(anchorView, -contentView.measuredWidth / 2, 0)
} }
} }

2
vector/src/main/java/im/vector/app/features/location/live/map/LocationLiveMapViewFragment.kt
View file

@ -143,7 +143,7 @@ class LocationLiveMapViewFragment @Inject constructor() : VectorBaseFragment<Fra
y = (screenLocation?.y ?: 0f) - views.liveLocationPopupAnchor.height y = (screenLocation?.y ?: 0f) - views.liveLocationPopupAnchor.height
} }
LocationLiveMapMarkerOptionsDialog(requireContext(), layoutInflater) LocationLiveMapMarkerOptionsDialog(requireContext())
.apply { .apply {
callback = object : LocationLiveMapMarkerOptionsDialog.Callback { callback = object : LocationLiveMapMarkerOptionsDialog.Callback {
override fun onShareLocationClicked() { override fun onShareLocationClicked() {

2
vector/src/main/res/layout/view_live_location_marker_popup.xml
View file

@ -3,6 +3,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@drawable/bg_live_location_marker_popup"
android:elevation="8dp"
android:padding="8dp"> android:padding="8dp">
<ImageView <ImageView