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

Support for sending arbitrary file types

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike
2017-04-18 16:33:03 -07:00
parent c3164a8e84
commit 2b79e131a7
12 changed files with 48 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_insert_drive_file_white_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 193 B

BIN
res/drawable-mdpi/ic_insert_drive_file_white_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 153 B

BIN
res/drawable-xhdpi/ic_insert_drive_file_white_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 283 B

BIN
res/drawable-xxhdpi/ic_insert_drive_file_white_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 376 B

BIN
res/drawable-xxxhdpi/ic_insert_drive_file_white_36dp.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 553 B

12
res/layout/attachment_type_selector.xml
View File

@@ -34,14 +34,14 @@
android:src="@drawable/ic_image_white_36dp"
android:scaleType="center"
android:elevation="4dp"
android:contentDescription="@string/attachment_type_selector__image_description"
android:contentDescription="@string/attachment_type_selector__gallery_description"
app:circleColor="@color/purple_400"/>
<TextView android:layout_marginTop="10dp"
style="@style/AttachmentTypeLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/attachment_type_selector__image"/>
android:text="@string/attachment_type_selector__gallery"/>
</LinearLayout>
@@ -76,20 +76,20 @@
android:orientation="vertical">
<org.thoughtcrime.securesms.components.CircleColorImageView
android:id="@+id/video_button"
android:id="@+id/document_button"
android:layout_width="60dp"
android:layout_height="60dp"
android:src="@drawable/ic_local_movies_white_36dp"
android:src="@drawable/ic_insert_drive_file_white_36dp"
android:scaleType="center"
android:elevation="4dp"
android:contentDescription="@string/attachment_type_selector__video_description"
android:contentDescription="@string/attachment_type_selector__document_description"
app:circleColor="@color/red_400"/>
<TextView android:layout_marginTop="10dp"
style="@style/AttachmentTypeLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/attachment_type_selector__video"/>
android:text="@string/attachment_type_selector__document"/>
</LinearLayout>

9
res/values/strings.xml
View File

@@ -702,12 +702,8 @@
<!-- attachment_type_selector -->
<string name="attachment_type_selector__image">Image</string>
<string name="attachment_type_selector__image_description">Image</string>
<string name="attachment_type_selector__audio">Audio</string>
<string name="attachment_type_selector__audio_description">Audio</string>
<string name="attachment_type_selector__video">Video</string>
<string name="attachment_type_selector__video_description">Video</string>
<string name="attachment_type_selector__contact">Contact</string>
<string name="attachment_type_selector__contact_description">Contact</string>
<string name="attachment_type_selector__camera">Camera</string>
@@ -716,6 +712,11 @@
<string name="attachment_type_selector__location_description">Location</string>
<string name="attachment_type_selector__gif">GIF</string>
<string name="attachment_type_selector__gif_description">Gif</string>
<string name="attachment_type_selector__gallery_description">Image or video</string>
<string name="attachment_type_selector__document_description">Document</string>
<string name="attachment_type_selector__gallery">Gallery</string>
<string name="attachment_type_selector__document">Document</string>
<string name="attachment_type_selector__drawer_description">Toggle attachment drawer</string>
<!-- change_passphrase_activity -->