diff --git a/changelog.d/5571.feature b/changelog.d/5571.feature new file mode 100644 index 0000000000..04b62b8940 --- /dev/null +++ b/changelog.d/5571.feature @@ -0,0 +1 @@ +Live location sharing: Adding indicator view when enabled diff --git a/library/ui-styles/src/main/res/values/styles_location.xml b/library/ui-styles/src/main/res/values/styles_location.xml new file mode 100644 index 0000000000..5563d28342 --- /dev/null +++ b/library/ui-styles/src/main/res/values/styles_location.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt new file mode 100644 index 0000000000..a4c58c9e5b --- /dev/null +++ b/vector/src/main/java/im/vector/app/features/location/live/LocationLiveStatusView.kt @@ -0,0 +1,39 @@ +/* + * 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 + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.widget.Button +import androidx.constraintlayout.widget.ConstraintLayout +import im.vector.app.databinding.ViewLocationLiveStatusBinding + +class LocationLiveStatusView @JvmOverloads constructor( + context: Context, + attrs: AttributeSet? = null, + defStyleAttr: Int = 0 +) : ConstraintLayout(context, attrs, defStyleAttr) { + + private val binding = ViewLocationLiveStatusBinding.inflate( + LayoutInflater.from(context), + this + ) + + val stopButton: Button + get() = binding.locationLiveStatusStop +} diff --git a/vector/src/main/res/layout/fragment_timeline.xml b/vector/src/main/res/layout/fragment_timeline.xml index 6ba326bcc4..14eac04db2 100644 --- a/vector/src/main/res/layout/fragment_timeline.xml +++ b/vector/src/main/res/layout/fragment_timeline.xml @@ -17,7 +17,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="48dp" - android:visibility="gone"/> + android:visibility="gone" /> + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/locationLiveStatusIndicator" /> + app:layout_constraintTop_toBottomOf="@id/removeJitsiWidgetView" /> + app:layout_constraintBottom_toTopOf="@id/composerLayout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/timelineRecyclerView" + tools:visibility="visible" /> + tools:visibility="visible" /> + app:layout_constraintStart_toStartOf="parent" /> + + + + + + + + +