Refactored location sharing timeline items to use the mapserver configured by the wellknown file #7852
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| Refactored location sharing timeline items to use the mapserver configured by the wellknown file |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| /* | ||
| * Copyright (c) 2021 New Vector Ltd | ||
| * Copyright (c) 2022 BWI GmbH | ||
|
There was a problem hiding this comment. Why are there these changes of copyrights? I am not entirely sure is is allowed to be changed to something else than There was a problem hiding this comment. It looks like @artkoenig has added here the copyright notice to show that copyright goes to BWI GmbH. There was a problem hiding this comment. I'm not an expert in this area but I know there has been irritation about this topic recently. So just to double check that we're doing the correct thing here: Has this particular question been confirmed with legal? |
||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
|
|
@@ -16,35 +17,34 @@ | |
|
|
||
| package im.vector.app.features.home.room.detail.timeline.item | ||
|
|
||
| import android.widget.ImageView | ||
| import androidx.annotation.IdRes | ||
| import androidx.annotation.LayoutRes | ||
| import androidx.core.view.isVisible | ||
| import androidx.core.view.updateLayoutParams | ||
| import com.airbnb.epoxy.EpoxyAttribute | ||
| import com.bumptech.glide.load.resource.bitmap.RoundedCorners | ||
| import com.mapbox.mapboxsdk.maps.MapView | ||
| import im.vector.app.R | ||
| import im.vector.app.core.utils.DimensionConverter | ||
| import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider | ||
| import im.vector.app.features.home.room.detail.timeline.style.TimelineMessageLayout | ||
| import im.vector.app.features.home.room.detail.timeline.style.granularRoundedCorners | ||
| import im.vector.app.features.location.INITIAL_MAP_ZOOM_IN_TIMELINE | ||
| import im.vector.app.features.location.LocationData | ||
| import im.vector.app.features.location.MapLoadingErrorView | ||
| import im.vector.app.features.location.MapLoadingErrorViewState | ||
| import im.vector.app.features.location.zoomToLocation | ||
|
|
||
| abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder>( | ||
| @LayoutRes layoutId: Int = R.layout.item_timeline_event_base | ||
| ) : AbsMessageItem<H>(layoutId) { | ||
|
|
||
| @EpoxyAttribute | ||
| var locationData: LocationData? = null | ||
|
|
||
| @EpoxyAttribute | ||
| var mapStyleUrl: String? = null | ||
|
|
||
| @EpoxyAttribute | ||
| var locationUserId: String? = null | ||
|
|
@@ -64,62 +64,65 @@ abstract class AbsMessageLocationItem<H : AbsMessageLocationItem.Holder>( | |
| bindMap(holder) | ||
| } | ||
|
|
||
| override fun onViewAttachedToWindow(holder: H) { | ||
| super.onViewAttachedToWindow(holder) | ||
| holder.staticMapView.onStart() | ||
| } | ||
|
|
||
| override fun onViewDetachedFromWindow(holder: H) { | ||
| super.onViewDetachedFromWindow(holder) | ||
| holder.staticMapView.onStop() | ||
| } | ||
|
|
||
| private fun bindMap(holder: Holder) { | ||
| val messageLayout = attributes.informationData.messageLayout | ||
| val imageCornerTransformation = if (messageLayout is TimelineMessageLayout.Bubble) { | ||
| messageLayout.cornersRadius.granularRoundedCorners() | ||
| } else { | ||
| val dimensionConverter = DimensionConverter(holder.view.resources) | ||
| RoundedCorners(dimensionConverter.dpToPx(8)) | ||
| } | ||
|
|
||
| holder.staticMapView.apply { | ||
|
There was a problem hiding this comment. As a general practice in the project, we try to avoid using apply as much as possible as it leads sometimes to strange bugs since the scope of |
||
| updateLayoutParams { | ||
| width = mapWidth | ||
| height = mapHeight | ||
| } | ||
| addOnDidFailLoadingMapListener { | ||
| holder.staticMapLoadingErrorView.isVisible = true | ||
| val mapErrorViewState = MapLoadingErrorViewState(imageCornerTransformation) | ||
| holder.staticMapLoadingErrorView.render(mapErrorViewState) | ||
| } | ||
|
|
||
| addOnDidFinishLoadingMapListener { | ||
| locationPinProvider?.create(locationUserId) { pinDrawable -> | ||
| holder.staticMapPinImageView.setImageDrawable(pinDrawable) | ||
| } | ||
| holder.staticMapLoadingErrorView.isVisible = false | ||
| } | ||
|
|
||
| clipToOutline = true | ||
| getMapAsync { mapbox -> | ||
| mapbox.setStyle(mapStyleUrl) | ||
| locationData?.let { | ||
| mapbox.zoomToLocation(it, false, INITIAL_MAP_ZOOM_IN_TIMELINE) | ||
| } | ||
| mapbox.uiSettings.setAllGesturesEnabled(false) | ||
| mapbox.addOnMapClickListener { | ||
| attributes.itemClickListener?.invoke(holder.staticMapView) | ||
| true | ||
| } | ||
| mapbox.addOnMapLongClickListener { | ||
| attributes.itemLongClickListener?.onLongClick(holder.staticMapView) | ||
| true | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| abstract class Holder(@IdRes stubId: Int) : AbsMessageItem.Holder(stubId) { | ||
| val staticMapView by bind<MapView>(R.id.staticMapView) | ||
| val staticMapPinImageView by bind<ImageView>(R.id.staticMapPinImageView) | ||
| val staticMapLoadingErrorView by bind<MapLoadingErrorView>(R.id.staticMapLoadingError) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This import should be removed.