TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 17:57:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Show videos in media overview

Browse Source 
Fixes #5941
Closes #6152
// FREEBIE
This commit is contained in:
haffenloher
2017-02-01 03:49:19 +01:00
committed by Moxie Marlinspike
parent 98d223f094
commit 83e31cac07
9 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/media_overview_activity.xml
View File

@@ -21,6 +21,6 @@
android:gravity="center_horizontal"
android:paddingTop="30dp"
android:visibility="gone"
android:text="@string/media_overview_activity__no_images" />
android:text="@string/media_overview_activity__no_media" />
</RelativeLayout>

2
res/layout/media_overview_item.xml
View File

@@ -8,6 +8,6 @@
android:id="@+id/image"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:contentDescription="@string/media_preview_activity__image_content_description" />
android:contentDescription="@string/media_preview_activity__media_content_description" />
</org.thoughtcrime.securesms.components.SquareFrameLayout>

2
res/menu/conversation.xml
View File

@@ -4,7 +4,7 @@
<item android:title="@string/conversation__menu_add_attachment"
android:id="@+id/menu_add_attachment" />
<item android:title="@string/conversation__menu_view_media"
<item android:title="@string/conversation__menu_view_all_media"
android:id="@+id/menu_view_media" />
<item android:title="@string/conversation__menu_conversation_settings"

2
res/menu/media_preview.xml
View File

@@ -10,7 +10,7 @@
android:icon="@drawable/ic_save_white_24dp"
app:showAsAction="always"/>
<item android:id="@+id/media_preview__overview"
android:title="@string/media_preview__overview_title"
android:title="@string/media_preview__all_media_title"
android:icon="@drawable/ic_photo_library_white_24dp"
app:showAsAction="ifRoom"/>
</menu>

12
res/values/strings.xml
View File

@@ -858,7 +858,7 @@
<string name="load_more_header__see_full_conversation">See full conversation</string>
<!-- media_overview_activity -->
<string name="media_overview_activity__no_images">No images</string>
<string name="media_overview_activity__no_media">No media</string>
<!-- message_recipients_list_item -->
<string name="message_recipients_list_item__verify">VERIFY</string>
@@ -1012,8 +1012,8 @@
<string name="AndroidManifest__verify_safety_number">Verify safety number</string>
<string name="AndroidManifest__log_submit">Submit debug log</string>
<string name="AndroidManifest__media_preview">Media preview</string>
<string name="AndroidManifest__media_overview">All images</string>
<string name="AndroidManifest__media_overview_named">All images with %1$s</string>
<string name="AndroidManifest__all_media">All media</string>
<string name="AndroidManifest__all_media_named">All media with %1$s</string>
<string name="AndroidManifest__message_details">Message details</string>
<string name="AndroidManifest__linked_devices">Linked devices</string>
<string name="AndroidManifest__invite_friends">Invite friends</string>
@@ -1233,7 +1233,7 @@
<string name="conversation__menu_edit_group">Edit group</string>
<string name="conversation__menu_leave_group">Leave group</string>
<string name="conversation__menu_delete_thread">Delete conversation</string>
<string name="conversation__menu_view_media">All images</string>
<string name="conversation__menu_view_all_media">All media</string>
<string name="conversation__menu_conversation_settings">Conversation settings</string>
<!-- conversation_popup -->
@@ -1296,13 +1296,13 @@
<!-- media_preview -->
<string name="media_preview__save_title">Save</string>
<string name="media_preview__forward_title">Forward</string>
<string name="media_preview__overview_title">All images</string>
<string name="media_preview__all_media_title">All media</string>
<!-- media_overview -->
<string name="media_overview__save_all">Save all</string>
<!-- media_preview_activity -->
<string name="media_preview_activity__image_content_description">Image preview</string>
<string name="media_preview_activity__media_content_description">Media preview</string>
<!-- new_conversation_activity -->
<string name="new_conversation_activity__refresh">Refresh</string>