mirror of
https://github.com/SchildiChat/SchildiChat-android.git
synced 2024-11-26 19:36:08 +03:00
Creation of map view screen and basic navigation
This commit is contained in:
parent
b2765e4b63
commit
52c0fa41c6
7 changed files with 198 additions and 0 deletions
|
@ -343,6 +343,7 @@
|
||||||
<activity android:name=".features.spaces.leave.SpaceLeaveAdvancedActivity" />
|
<activity android:name=".features.spaces.leave.SpaceLeaveAdvancedActivity" />
|
||||||
<activity android:name=".features.poll.create.CreatePollActivity" />
|
<activity android:name=".features.poll.create.CreatePollActivity" />
|
||||||
<activity android:name=".features.location.LocationSharingActivity" />
|
<activity android:name=".features.location.LocationSharingActivity" />
|
||||||
|
<activity android:name=".features.location.live.map.LocationLiveMapViewActivity" />
|
||||||
|
|
||||||
<!-- Services -->
|
<!-- Services -->
|
||||||
|
|
||||||
|
|
|
@ -64,6 +64,7 @@ import im.vector.app.features.home.room.list.RoomListFragment
|
||||||
import im.vector.app.features.home.room.threads.list.views.ThreadListFragment
|
import im.vector.app.features.home.room.threads.list.views.ThreadListFragment
|
||||||
import im.vector.app.features.location.LocationPreviewFragment
|
import im.vector.app.features.location.LocationPreviewFragment
|
||||||
import im.vector.app.features.location.LocationSharingFragment
|
import im.vector.app.features.location.LocationSharingFragment
|
||||||
|
import im.vector.app.features.location.live.map.LocationLiveMapViewFragment
|
||||||
import im.vector.app.features.login.LoginCaptchaFragment
|
import im.vector.app.features.login.LoginCaptchaFragment
|
||||||
import im.vector.app.features.login.LoginFragment
|
import im.vector.app.features.login.LoginFragment
|
||||||
import im.vector.app.features.login.LoginGenericTextInputFormFragment
|
import im.vector.app.features.login.LoginGenericTextInputFormFragment
|
||||||
|
@ -993,4 +994,9 @@ interface FragmentModule {
|
||||||
@IntoMap
|
@IntoMap
|
||||||
@FragmentKey(LocationPreviewFragment::class)
|
@FragmentKey(LocationPreviewFragment::class)
|
||||||
fun bindLocationPreviewFragment(fragment: LocationPreviewFragment): Fragment
|
fun bindLocationPreviewFragment(fragment: LocationPreviewFragment): Fragment
|
||||||
|
|
||||||
|
@Binds
|
||||||
|
@IntoMap
|
||||||
|
@FragmentKey(LocationLiveMapViewFragment::class)
|
||||||
|
fun bindLocationLiveMapViewFragment(fragment: LocationLiveMapViewFragment): Fragment
|
||||||
}
|
}
|
||||||
|
|
|
@ -221,6 +221,7 @@ import org.matrix.android.sdk.api.session.events.model.toModel
|
||||||
import org.matrix.android.sdk.api.session.room.model.Membership
|
import org.matrix.android.sdk.api.session.room.model.Membership
|
||||||
import org.matrix.android.sdk.api.session.room.model.RoomSummary
|
import org.matrix.android.sdk.api.session.room.model.RoomSummary
|
||||||
import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
|
import org.matrix.android.sdk.api.session.room.model.message.MessageAudioContent
|
||||||
|
import org.matrix.android.sdk.api.session.room.model.message.MessageBeaconInfoContent
|
||||||
import org.matrix.android.sdk.api.session.room.model.message.MessageContent
|
import org.matrix.android.sdk.api.session.room.model.message.MessageContent
|
||||||
import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
|
import org.matrix.android.sdk.api.session.room.model.message.MessageFormat
|
||||||
import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
|
import org.matrix.android.sdk.api.session.room.model.message.MessageImageInfoContent
|
||||||
|
@ -647,6 +648,13 @@ class TimelineFragment @Inject constructor(
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun navigateToLocationLiveMap() {
|
||||||
|
navigator.openLocationLiveMap(
|
||||||
|
context = requireContext(),
|
||||||
|
roomId = timelineArgs.roomId
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
private fun handleChangeLocationIndicator(event: RoomDetailViewEvents.ChangeLocationIndicator) {
|
private fun handleChangeLocationIndicator(event: RoomDetailViewEvents.ChangeLocationIndicator) {
|
||||||
views.locationLiveStatusIndicator.isVisible = event.isVisible
|
views.locationLiveStatusIndicator.isVisible = event.isVisible
|
||||||
}
|
}
|
||||||
|
@ -2015,6 +2023,10 @@ class TimelineFragment @Inject constructor(
|
||||||
is MessageLocationContent -> {
|
is MessageLocationContent -> {
|
||||||
handleShowLocationPreview(messageContent, informationData.senderId)
|
handleShowLocationPreview(messageContent, informationData.senderId)
|
||||||
}
|
}
|
||||||
|
is MessageBeaconInfoContent -> {
|
||||||
|
// TODO navigate only from running live location message: possible after merge of associated PR
|
||||||
|
navigateToLocationLiveMap()
|
||||||
|
}
|
||||||
else -> {
|
else -> {
|
||||||
val handled = onThreadSummaryClicked(informationData.eventId, isRootThreadEvent)
|
val handled = onThreadSummaryClicked(informationData.eventId, isRootThreadEvent)
|
||||||
if (!handled) {
|
if (!handled) {
|
||||||
|
|
|
@ -0,0 +1,68 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2022 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package im.vector.app.features.location.live.map
|
||||||
|
|
||||||
|
import android.content.Context
|
||||||
|
import android.content.Intent
|
||||||
|
import android.os.Parcelable
|
||||||
|
import dagger.hilt.android.AndroidEntryPoint
|
||||||
|
import im.vector.app.core.extensions.addFragment
|
||||||
|
import im.vector.app.core.platform.VectorBaseActivity
|
||||||
|
import im.vector.app.databinding.ActivityLocationSharingBinding
|
||||||
|
import kotlinx.parcelize.Parcelize
|
||||||
|
|
||||||
|
@Parcelize
|
||||||
|
data class LocationLiveMapViewArgs(
|
||||||
|
val roomId: String
|
||||||
|
) : Parcelable
|
||||||
|
|
||||||
|
@AndroidEntryPoint
|
||||||
|
class LocationLiveMapViewActivity : VectorBaseActivity<ActivityLocationSharingBinding>() {
|
||||||
|
|
||||||
|
override fun getBinding() = ActivityLocationSharingBinding.inflate(layoutInflater)
|
||||||
|
|
||||||
|
override fun initUiAndData() {
|
||||||
|
val mapViewArgs: LocationLiveMapViewArgs? = intent?.extras?.getParcelable(EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS)
|
||||||
|
if (mapViewArgs == null) {
|
||||||
|
finish()
|
||||||
|
return
|
||||||
|
}
|
||||||
|
setupToolbar(views.toolbar)
|
||||||
|
// TODO check what should be the title and create String resource
|
||||||
|
.setTitle("Live")
|
||||||
|
.allowBack()
|
||||||
|
|
||||||
|
if (isFirstCreation()) {
|
||||||
|
addFragment(
|
||||||
|
views.fragmentContainer,
|
||||||
|
LocationLiveMapViewFragment::class.java,
|
||||||
|
mapViewArgs
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
|
||||||
|
private const val EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS = "EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS"
|
||||||
|
|
||||||
|
fun getIntent(context: Context, locationLiveMapViewArgs: LocationLiveMapViewArgs): Intent {
|
||||||
|
return Intent(context, LocationLiveMapViewActivity::class.java).apply {
|
||||||
|
putExtra(EXTRA_LOCATION_LIVE_MAP_VIEW_ARGS, locationLiveMapViewArgs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -0,0 +1,99 @@
|
||||||
|
/*
|
||||||
|
* Copyright (c) 2022 New Vector Ltd
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package im.vector.app.features.location.live.map
|
||||||
|
|
||||||
|
import android.os.Bundle
|
||||||
|
import android.view.LayoutInflater
|
||||||
|
import android.view.View
|
||||||
|
import android.view.ViewGroup
|
||||||
|
import androidx.lifecycle.lifecycleScope
|
||||||
|
import com.airbnb.mvrx.args
|
||||||
|
import com.mapbox.mapboxsdk.maps.MapView
|
||||||
|
import im.vector.app.core.platform.VectorBaseFragment
|
||||||
|
import im.vector.app.databinding.FragmentLocationPreviewBinding
|
||||||
|
import im.vector.app.features.home.room.detail.timeline.helper.LocationPinProvider
|
||||||
|
import im.vector.app.features.location.UrlMapProvider
|
||||||
|
import java.lang.ref.WeakReference
|
||||||
|
import javax.inject.Inject
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Screen showing a map with all the current users sharing their live location in room.
|
||||||
|
*/
|
||||||
|
class LocationLiveMapViewFragment @Inject constructor(
|
||||||
|
private val urlMapProvider: UrlMapProvider,
|
||||||
|
private val locationPinProvider: LocationPinProvider
|
||||||
|
) : VectorBaseFragment<FragmentLocationPreviewBinding>() {
|
||||||
|
|
||||||
|
// TODO use a SupportMapFragment with FragmentManager
|
||||||
|
// TODO align design with Figma
|
||||||
|
|
||||||
|
private val args: LocationLiveMapViewArgs by args()
|
||||||
|
|
||||||
|
// Keep a ref to handle properly the onDestroy callback
|
||||||
|
private var mapView: WeakReference<MapView>? = null
|
||||||
|
|
||||||
|
override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocationPreviewBinding {
|
||||||
|
return FragmentLocationPreviewBinding.inflate(layoutInflater, container, false)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
|
||||||
|
super.onViewCreated(view, savedInstanceState)
|
||||||
|
|
||||||
|
mapView = WeakReference(views.mapView)
|
||||||
|
views.mapView.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
lifecycleScope.launchWhenCreated {
|
||||||
|
views.mapView.initialize(urlMapProvider.getMapUrl())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onResume() {
|
||||||
|
super.onResume()
|
||||||
|
views.mapView.onResume()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onPause() {
|
||||||
|
views.mapView.onPause()
|
||||||
|
super.onPause()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onLowMemory() {
|
||||||
|
views.mapView.onLowMemory()
|
||||||
|
super.onLowMemory()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onStart() {
|
||||||
|
super.onStart()
|
||||||
|
views.mapView.onStart()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onStop() {
|
||||||
|
views.mapView.onStop()
|
||||||
|
super.onStop()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onSaveInstanceState(outState: Bundle) {
|
||||||
|
super.onSaveInstanceState(outState)
|
||||||
|
views.mapView.onSaveInstanceState(outState)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun onDestroy() {
|
||||||
|
mapView?.get()?.onDestroy()
|
||||||
|
mapView?.clear()
|
||||||
|
super.onDestroy()
|
||||||
|
}
|
||||||
|
}
|
|
@ -68,6 +68,8 @@ import im.vector.app.features.location.LocationData
|
||||||
import im.vector.app.features.location.LocationSharingActivity
|
import im.vector.app.features.location.LocationSharingActivity
|
||||||
import im.vector.app.features.location.LocationSharingArgs
|
import im.vector.app.features.location.LocationSharingArgs
|
||||||
import im.vector.app.features.location.LocationSharingMode
|
import im.vector.app.features.location.LocationSharingMode
|
||||||
|
import im.vector.app.features.location.live.map.LocationLiveMapViewActivity
|
||||||
|
import im.vector.app.features.location.live.map.LocationLiveMapViewArgs
|
||||||
import im.vector.app.features.login.LoginActivity
|
import im.vector.app.features.login.LoginActivity
|
||||||
import im.vector.app.features.login.LoginConfig
|
import im.vector.app.features.login.LoginConfig
|
||||||
import im.vector.app.features.matrixto.MatrixToBottomSheet
|
import im.vector.app.features.matrixto.MatrixToBottomSheet
|
||||||
|
@ -591,6 +593,14 @@ class DefaultNavigator @Inject constructor(
|
||||||
context.startActivity(intent)
|
context.startActivity(intent)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun openLocationLiveMap(context: Context, roomId: String) {
|
||||||
|
val intent = LocationLiveMapViewActivity.getIntent(
|
||||||
|
context = context,
|
||||||
|
locationLiveMapViewArgs = LocationLiveMapViewArgs(roomId = roomId)
|
||||||
|
)
|
||||||
|
context.startActivity(intent)
|
||||||
|
}
|
||||||
|
|
||||||
private fun startActivity(context: Context, intent: Intent, buildTask: Boolean) {
|
private fun startActivity(context: Context, intent: Intent, buildTask: Boolean) {
|
||||||
if (buildTask) {
|
if (buildTask) {
|
||||||
val stackBuilder = TaskStackBuilder.create(context)
|
val stackBuilder = TaskStackBuilder.create(context)
|
||||||
|
|
|
@ -172,6 +172,8 @@ interface Navigator {
|
||||||
initialLocationData: LocationData?,
|
initialLocationData: LocationData?,
|
||||||
locationOwnerId: String?)
|
locationOwnerId: String?)
|
||||||
|
|
||||||
|
fun openLocationLiveMap(context: Context, roomId: String)
|
||||||
|
|
||||||
fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String? = null)
|
fun openThread(context: Context, threadTimelineArgs: ThreadTimelineArgs, eventIdToNavigate: String? = null)
|
||||||
|
|
||||||
fun openThreadList(context: Context, threadTimelineArgs: ThreadTimelineArgs)
|
fun openThreadList(context: Context, threadTimelineArgs: ThreadTimelineArgs)
|
||||||
|
|
Loading…
Reference in a new issue