Create base UI components of location sharing screen.

vector/src/main/AndroidManifest.xml

@@ -336,6 +336,7 @@
         <activity android:name=".features.spaces.people.SpacePeopleActivity" />
         <activity android:name=".features.spaces.leave.SpaceLeaveAdvancedActivity" />
         <activity android:name=".features.poll.create.CreatePollActivity" />
+        <activity android:name=".features.location.LocationSharingActivity" />
 
         <!-- Services -->
 

vector/src/main/java/im/vector/app/core/di/MavericksViewModelModule.kt

@@ -53,6 +53,7 @@ import im.vector.app.features.home.room.detail.upgrade.MigrateRoomViewModel
 import im.vector.app.features.home.room.list.RoomListViewModel
 import im.vector.app.features.homeserver.HomeServerCapabilitiesViewModel
 import im.vector.app.features.invite.InviteUsersToRoomViewModel
+import im.vector.app.features.location.LocationSharingViewModel
 import im.vector.app.features.login.LoginViewModel
 import im.vector.app.features.login2.LoginViewModel2
 import im.vector.app.features.login2.created.AccountCreatedViewModel
@@ -576,4 +577,9 @@ interface MavericksViewModelModule {
     @IntoMap
     @MavericksViewModelKey(CreatePollViewModel::class)
     fun createPollViewModelFactory(factory: CreatePollViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
+
+    @Binds
+    @IntoMap
+    @MavericksViewModelKey(LocationSharingViewModel::class)
+    fun createLocationSharingViewModelFactory(factory: LocationSharingViewModel.Factory): MavericksAssistedViewModelFactory<*, *>
 }

vector/src/main/java/im/vector/app/features/home/room/detail/RoomDetailFragment.kt

@@ -165,6 +165,7 @@ import im.vector.app.features.html.EventHtmlRenderer
 import im.vector.app.features.html.PillImageSpan
 import im.vector.app.features.html.PillsPostProcessor
 import im.vector.app.features.invite.VectorInviteView
+import im.vector.app.features.location.LocationSharingMode
 import im.vector.app.features.media.ImageContentRenderer
 import im.vector.app.features.media.VideoContentRenderer
 import im.vector.app.features.notifications.NotificationDrawerManager
@@ -2219,7 +2220,9 @@ class RoomDetailFragment @Inject constructor(
             AttachmentTypeSelectorView.Type.CONTACT  -> attachmentsHelper.selectContact(attachmentContactActivityResultLauncher)
             AttachmentTypeSelectorView.Type.STICKER  -> roomDetailViewModel.handle(RoomDetailAction.SelectStickerAttachment)
             AttachmentTypeSelectorView.Type.POLL     -> navigator.openCreatePoll(requireContext(), roomDetailArgs.roomId)
-            AttachmentTypeSelectorView.Type.LOCATION -> Timber.d("On location attachment clicked")
+            AttachmentTypeSelectorView.Type.LOCATION -> {
+                navigator.openLocationSharing(requireContext(), roomDetailArgs.roomId, LocationSharingMode.STATIC_SHARING)
+            }
         }.exhaustive
     }
 

vector/src/main/java/im/vector/app/features/location/LocationSharingAction.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 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
+
+import im.vector.app.core.platform.VectorViewModelAction
+
+sealed class LocationSharingAction : VectorViewModelAction {
+    data class OnShareLocation(val latitude: Double, val longitude: Double) : LocationSharingAction()
+}

vector/src/main/java/im/vector/app/features/location/LocationSharingActivity.kt

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2021 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
+
+import android.content.Context
+import android.content.Intent
+import android.os.Parcelable
+import com.google.android.material.appbar.MaterialToolbar
+import dagger.hilt.android.AndroidEntryPoint
+import im.vector.app.core.extensions.addFragment
+import im.vector.app.core.platform.ToolbarConfigurable
+import im.vector.app.core.platform.VectorBaseActivity
+import im.vector.app.databinding.ActivityLocationSharingBinding
+import kotlinx.parcelize.Parcelize
+
+@Parcelize
+data class LocationSharingArgs(
+        val roomId: String,
+        val mode: LocationSharingMode
+) : Parcelable
+
+@AndroidEntryPoint
+class LocationSharingActivity : VectorBaseActivity<ActivityLocationSharingBinding>(),
+        ToolbarConfigurable {
+
+    override fun getBinding() = ActivityLocationSharingBinding.inflate(layoutInflater)
+
+    override fun configure(toolbar: MaterialToolbar) {
+        configureToolbar(toolbar)
+    }
+
+    override fun initUiAndData() {
+        val locationSharingArgs: LocationSharingArgs? = intent?.extras?.getParcelable(EXTRA_LOCATION_SHARING_ARGS)
+        if (locationSharingArgs == null) {
+            finish()
+            return
+        }
+        configure(views.toolbar)
+        supportActionBar?.title = getString(locationSharingArgs.mode.titleRes)
+
+        if (isFirstCreation()) {
+            when (locationSharingArgs.mode) {
+                LocationSharingMode.STATIC_SHARING -> {
+                    addFragment(
+                            views.fragmentContainer,
+                            LocationSharingFragment::class.java,
+                            locationSharingArgs
+                    )
+                }
+                LocationSharingMode.PREVIEW        -> {
+                }
+            }
+        }
+    }
+
+    companion object {
+
+        private const val EXTRA_LOCATION_SHARING_ARGS = "EXTRA_LOCATION_SHARING_ARGS"
+
+        fun getIntent(context: Context, locationSharingArgs: LocationSharingArgs): Intent {
+            return Intent(context, LocationSharingActivity::class.java).apply {
+                putExtra(EXTRA_LOCATION_SHARING_ARGS, locationSharingArgs)
+            }
+        }
+    }
+}

vector/src/main/java/im/vector/app/features/location/LocationSharingFragment.kt

@@ -0,0 +1,40 @@
+/*
+ * Copyright (c) 2021 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
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import com.airbnb.mvrx.activityViewModel
+import im.vector.app.core.platform.VectorBaseFragment
+import im.vector.app.databinding.FragmentLocationSharingBinding
+import javax.inject.Inject
+
+class LocationSharingFragment @Inject constructor() :
+        VectorBaseFragment<FragmentLocationSharingBinding>() {
+
+    private val viewModel: LocationSharingViewModel by activityViewModel()
+
+    override fun getBinding(inflater: LayoutInflater, container: ViewGroup?): FragmentLocationSharingBinding {
+        return FragmentLocationSharingBinding.inflate(inflater, container, false)
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+    }
+}

vector/src/main/java/im/vector/app/features/location/LocationSharingViewEvents.kt

@@ -0,0 +1,23 @@
+/*
+ * Copyright (c) 2021 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
+
+import im.vector.app.core.platform.VectorViewEvents
+
+sealed class LocationSharingViewEvents : VectorViewEvents {
+    object Close : LocationSharingViewEvents()
+}

vector/src/main/java/im/vector/app/features/location/LocationSharingViewModel.kt

@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2021 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
+
+import com.airbnb.mvrx.MavericksViewModelFactory
+import dagger.assisted.Assisted
+import dagger.assisted.AssistedFactory
+import dagger.assisted.AssistedInject
+import im.vector.app.core.di.MavericksAssistedViewModelFactory
+import im.vector.app.core.di.hiltMavericksViewModelFactory
+import im.vector.app.core.platform.VectorViewModel
+
+class LocationSharingViewModel @AssistedInject constructor(
+        @Assisted private val initialState: LocationSharingViewState
+) : VectorViewModel<LocationSharingViewState, LocationSharingAction, LocationSharingViewEvents>(initialState) {
+
+    @AssistedFactory
+    interface Factory : MavericksAssistedViewModelFactory<LocationSharingViewModel, LocationSharingViewState> {
+        override fun create(initialState: LocationSharingViewState): LocationSharingViewModel
+    }
+
+    companion object : MavericksViewModelFactory<LocationSharingViewModel, LocationSharingViewState> by hiltMavericksViewModelFactory() {
+    }
+
+    override fun handle(action: LocationSharingAction) {
+    }
+}

vector/src/main/java/im/vector/app/features/location/LocationSharingViewState.kt

@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2021 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
+
+import androidx.annotation.StringRes
+import com.airbnb.mvrx.MavericksState
+import im.vector.app.R
+
+enum class LocationSharingMode(@StringRes val titleRes: Int) {
+    STATIC_SHARING(R.string.location_activity_title_static_sharing),
+    PREVIEW(R.string.location_activity_title_preview)
+}
+
+data class LocationSharingViewState(
+        val roomId: String,
+        val mode: LocationSharingMode
+) : MavericksState {
+
+    constructor(locationSharingArgs: LocationSharingArgs) : this(
+            roomId = locationSharingArgs.roomId,
+            mode = locationSharingArgs.mode
+    )
+}

vector/src/main/java/im/vector/app/features/navigation/DefaultNavigator.kt

@@ -57,6 +57,9 @@ import im.vector.app.features.home.room.detail.search.SearchActivity
 import im.vector.app.features.home.room.detail.search.SearchArgs
 import im.vector.app.features.home.room.filtered.FilteredRoomsActivity
 import im.vector.app.features.invite.InviteUsersToRoomActivity
+import im.vector.app.features.location.LocationSharingActivity
+import im.vector.app.features.location.LocationSharingArgs
+import im.vector.app.features.location.LocationSharingMode
 import im.vector.app.features.login.LoginActivity
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.login2.LoginActivity2
@@ -533,6 +536,14 @@ class DefaultNavigator @Inject constructor(
         context.startActivity(intent)
     }
 
+    override fun openLocationSharing(context: Context, roomId: String, mode: LocationSharingMode) {
+        val intent = LocationSharingActivity.getIntent(
+                context,
+                LocationSharingArgs(roomId = roomId, mode = mode)
+        )
+        context.startActivity(intent)
+    }
+
     private fun startActivity(context: Context, intent: Intent, buildTask: Boolean) {
         if (buildTask) {
             val stackBuilder = TaskStackBuilder.create(context)

vector/src/main/java/im/vector/app/features/navigation/Navigator.kt

@@ -25,6 +25,7 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.core.util.Pair
 import im.vector.app.features.crypto.recover.SetupMode
 import im.vector.app.features.displayname.getBestName
+import im.vector.app.features.location.LocationSharingMode
 import im.vector.app.features.login.LoginConfig
 import im.vector.app.features.media.AttachmentData
 import im.vector.app.features.pin.PinMode
@@ -149,4 +150,6 @@ interface Navigator {
     fun openCallTransfer(context: Context, callId: String)
 
     fun openCreatePoll(context: Context, roomId: String)
+
+    fun openLocationSharing(context: Context, roomId: String, mode: LocationSharingMode)
 }

vector/src/main/res/layout/activity_location_sharing.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <com.google.android.material.appbar.AppBarLayout
+        android:id="@+id/appBarLayout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+
+    </com.google.android.material.appbar.AppBarLayout>
+
+    <FrameLayout
+        android:id="@+id/fragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+</LinearLayout>

vector/src/main/res/layout/fragment_location_sharing.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+</androidx.constraintlayout.widget.ConstraintLayout>

vector/src/main/res/values/strings.xml

@@ -3702,4 +3702,8 @@
     <string name="poll_end_room_list_preview">Poll ended</string>
     <string name="delete_poll_dialog_title">Remove poll</string>
     <string name="delete_poll_dialog_content">Are you sure you want to remove this poll? You won\'t be able to recover it once removed.</string>
+
+    <!-- Location -->
+    <string name="location_activity_title_static_sharing">Share location</string>
+    <string name="location_activity_title_preview">Location</string>
 </resources>