mirror of
https://github.com/oxen-io/session-android.git
synced 2025-12-14 09:50:06 +00:00
Added support for view-once video.
This commit is contained in:
committed by
Greyson Parrelli
parent
50a81c0e60
commit
d698d3bd6f
@@ -1,9 +1,9 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<FrameLayout 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"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:background="@color/core_black">
|
||||
|
||||
<ImageView
|
||||
@@ -12,6 +12,12 @@
|
||||
android:layout_height="match_parent"
|
||||
android:scaleType="fitCenter"/>
|
||||
|
||||
<org.thoughtcrime.securesms.video.VideoPlayer
|
||||
android:id="@+id/view_once_video"
|
||||
android:visibility="gone"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/view_once_close_button"
|
||||
android:layout_width="wrap_content"
|
||||
@@ -21,4 +27,16 @@
|
||||
android:tint="@color/core_white"
|
||||
app:srcCompat="@drawable/ic_x"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/view_once_duration"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top|end"
|
||||
android:layout_marginTop="15dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:textAppearance="@style/ViewOnceVideo.Duration"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible"
|
||||
tools:text="00:23" />
|
||||
|
||||
</FrameLayout>
|
||||
@@ -671,9 +671,10 @@
|
||||
<string name="RegistrationActivity_call">Call</string>
|
||||
|
||||
<!-- RevealableMessageView -->
|
||||
<string name="RevealableMessageView_view_photo">View Photo</string>
|
||||
<string name="RevealableMessageView_viewed">Viewed</string>
|
||||
<string name="RevealableMessageView_photo">Photo</string>
|
||||
<string name="RevealableMessageView_video">Video</string>
|
||||
<string name="RevealableMessageView_viewed">Viewed</string>
|
||||
<string name="RevealableMessageView_outgoing_media">Media</string>
|
||||
|
||||
<!-- ScribbleActivity -->
|
||||
<string name="ScribbleActivity_save_failure">Failed to save image changes</string>
|
||||
@@ -746,6 +747,7 @@
|
||||
<string name="ThreadRecord_media_message">Media message</string>
|
||||
<string name="ThreadRecord_sticker">Sticker</string>
|
||||
<string name="ThreadRecord_disappearing_photo">Disappearing photo</string>
|
||||
<string name="ThreadRecord_disappearing_video">Disappearing video</string>
|
||||
<string name="ThreadRecord_s_is_on_signal">%s is on Signal!</string>
|
||||
<string name="ThreadRecord_disappearing_messages_disabled">Disappearing messages disabled</string>
|
||||
<string name="ThreadRecord_disappearing_message_time_updated_to_s">Disappearing message time set to %s</string>
|
||||
@@ -786,6 +788,9 @@
|
||||
<string name="VerifyIdentityActivity_signal_needs_the_camera_permission_in_order_to_scan_a_qr_code_but_it_has_been_permanently_denied">Signal needs the Camera permission in order to scan a QR code, but it has been permanently denied. Please continue to app settings, select \"Permissions\", and enable \"Camera\".</string>
|
||||
<string name="VerifyIdentityActivity_unable_to_scan_qr_code_without_camera_permission">Unable to scan QR code without Camera permission</string>
|
||||
|
||||
<!-- ViewOnceMessageActivity -->
|
||||
<string name="ViewOnceMessageActivity_video_duration" translatable="false">%1$02d:%2$02d</string>
|
||||
|
||||
<!-- MessageDisplayHelper -->
|
||||
<string name="MessageDisplayHelper_bad_encrypted_message">Bad encrypted message</string>
|
||||
<string name="MessageDisplayHelper_message_encrypted_for_non_existing_session">Message encrypted for non-existing session</string>
|
||||
@@ -834,6 +839,7 @@
|
||||
<string name="MessageNotifier_media_message">Media message</string>
|
||||
<string name="MessageNotifier_sticker">Sticker</string>
|
||||
<string name="MessageNotifier_disappearing_photo">Disappearing photo</string>
|
||||
<string name="MessageNotifier_disappearing_video">Disappearing video</string>
|
||||
<string name="MessageNotifier_reply">Reply</string>
|
||||
<string name="MessageNotifier_signal_message">Signal Message</string>
|
||||
<string name="MessageNotifier_unsecured_sms">Unsecured SMS</string>
|
||||
@@ -1000,6 +1006,7 @@
|
||||
<string name="QuoteView_audio">Audio</string>
|
||||
<string name="QuoteView_video">Video</string>
|
||||
<string name="QuoteView_photo">Photo</string>
|
||||
<string name="QuoteView_media">Media message</string>
|
||||
<string name="QuoteView_sticker">Sticker</string>
|
||||
<string name="QuoteView_document">Document</string>
|
||||
<string name="QuoteView_you">You</string>
|
||||
|
||||
@@ -142,6 +142,16 @@
|
||||
<item name="android:lineSpacingMultiplier">1.25</item>
|
||||
</style>
|
||||
|
||||
<style name="ViewOnceVideo.Duration" parent="@android:style/TextAppearance">
|
||||
<item name="android:textSize">16sp</item>
|
||||
<item name="android:textColor">@color/white</item>
|
||||
<!-- TODO: change to transparent_black_60 after color swap -->
|
||||
<item name="android:shadowColor">#99000000</item>
|
||||
<item name="android:shadowDx">0</item>
|
||||
<item name="android:shadowDy">0</item>
|
||||
<item name="android:shadowRadius">2</item>
|
||||
</style>
|
||||
|
||||
<!-- For Holo Light Dialog Activity Styling Emulation -->
|
||||
|
||||
<style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
|
||||
|
||||
Reference in New Issue
Block a user