mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-03-18 20:29:10 +03:00
Code Issues Projects Releases Packages Wiki Activity

Format

Browse source
This commit is contained in:
Benoit Marty 2020-07-10 12:37:59 +02:00
parent eff08955f1
commit e979bee920
3 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
vector/src/main/java/im/vector/riotx/features/navigation/DefaultNavigator.kt
View file

@ -289,7 +289,8 @@ class DefaultNavigator @Inject constructor(
}
override fun openVideoViewer(activity: Activity,
roomId: String, mediaData: VideoContentRenderer.Data,
roomId: String,
mediaData: AttachmentData,
view: View,
inMemory: List<AttachmentData>?,
options: ((MutableList<Pair<View, String>>) -> Unit)?) {

3
vector/src/main/java/im/vector/riotx/features/navigation/Navigator.kt
View file

@ -99,7 +99,8 @@ interface Navigator {
options: ((MutableList<Pair<View, String>>) -> Unit)?)
fun openVideoViewer(activity: Activity,
roomId: String, mediaData: VideoContentRenderer.Data,
roomId: String,
mediaData: VideoContentRenderer.Data,
view: View,
inMemory: List<AttachmentData>? = null,
options: ((MutableList<Pair<View, String>>) -> Unit)?)

12
vector/src/main/res/layout/merge_image_attachment_overlay.xml
View file

@ -74,8 +74,8 @@
android:layout_marginEnd="16dp"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="true"
android:contentDescription="@string/share"
android:focusable="true"
android:padding="6dp"
android:tint="@color/white"
app:layout_constraintBottom_toBottomOf="@id/overlayTopBackground"
@ -85,12 +85,12 @@
<androidx.constraintlayout.widget.Group
android:id="@+id/overlayVideoControlsGroup"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/overlayVideoControlsGroup"
android:visibility="gone"
tools:visibility="visible"
app:constraint_referenced_ids="overlayBottomBackground,overlayBackButton,overlayPlayPauseButton,overlaySeekBar" />
app:constraint_referenced_ids="overlayBottomBackground,overlayBackButton,overlayPlayPauseButton,overlaySeekBar"
tools:visibility="visible" />
<View
android:id="@+id/overlayBottomBackground"
@ -121,11 +121,11 @@
android:id="@+id/overlaySeekBar"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:backgroundTint="@color/white"
android:progressBackgroundTint="@color/white"
android:thumbTint="@color/white"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
app:layout_constraintBottom_toBottomOf="@id/overlayBottomBackground"
app:layout_constraintEnd_toEndOf="@id/overlayBottomBackground"
app:layout_constraintStart_toEndOf="@id/overlayPlayPauseButton"