TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-17 11:48:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix icon for "Take Photo" in the attachment dialog and

Browse Source 
also change "Take Photo" to "Camera"

fixes #3819
closes #3820

// FREEBIE
This commit is contained in:
agrajaghh 2015-07-27 23:30:41 +02:00 committed by Moxie Marlinspike
parent e88a7c3fd7
commit e2e5aa32a8
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/attrs.xml
View File

@ -31,11 +31,11 @@
<attr name="conversation_transport_popup_background" format="reference"/>
<attr name="conversation_emoji_toggle" format="reference"/>
<attr name="conversation_keyboard_toggle" format="reference"/>
<attr name="conversation_attach_camera" format="reference"/>
<attr name="conversation_attach_image" format="reference"/>
<attr name="conversation_attach_video" format="reference"/>
<attr name="conversation_attach_sound" format="reference"/>
<attr name="conversation_attach_contact_info" format="reference"/>
<attr name="conversation_attach_photo" format="reference"/>
<attr name="conversation_attach" format="reference"/>
<attr name="emoji_tab_strip_background" format="color" />

2
res/values/strings.xml
View File

@ -48,7 +48,7 @@
<string name="AttachmentManager_cant_open_media_selection">Can\'t find an app to select media.</string>
<!-- AttachmentTypeSelectorAdapter -->
<string name="AttachmentTypeSelectorAdapter_take_photo">Take Photo</string>
<string name="AttachmentTypeSelectorAdapter_camera">Camera</string>
<string name="AttachmentTypeSelectorAdapter_picture">Picture</string>
<string name="AttachmentTypeSelectorAdapter_video">Video</string>
<string name="AttachmentTypeSelectorAdapter_audio">Audio</string>

4
res/values/themes.xml
View File

@ -100,11 +100,11 @@
<item name="conversation_transport_popup_background">@color/white</item>
<item name="conversation_emoji_toggle">@drawable/ic_mood_grey600_24dp</item>
<item name="conversation_keyboard_toggle">@drawable/ic_keyboard_grey600_24dp</item>
<item name="conversation_attach_camera">@drawable/ic_photo_camera_light</item>
<item name="conversation_attach_image">@drawable/ic_image_light</item>
<item name="conversation_attach_video">@drawable/ic_movie_creation_light</item>
<item name="conversation_attach_sound">@drawable/ic_volume_up_light</item>
<item name="conversation_attach_contact_info">@drawable/ic_account_box_light</item>
<item name="conversation_attach_photo">@drawable/ic_photo_camera_light</item>
<item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
<item name="emoji_tab_strip_background">@color/gray12</item>
@ -231,11 +231,11 @@
<item name="conversation_transport_popup_background">@color/black</item>
<item name="conversation_emoji_toggle">@drawable/ic_mood_white_24dp</item>
<item name="conversation_keyboard_toggle">@drawable/ic_keyboard_white_24dp</item>
<item name="conversation_attach_camera">@drawable/ic_photo_camera_dark</item>
<item name="conversation_attach_image">@drawable/ic_image_dark</item>
<item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
<item name="conversation_attach_sound">@drawable/ic_volume_up_dark</item>
<item name="conversation_attach_contact_info">@drawable/ic_account_box_dark</item>
<item name="conversation_attach_photo">@drawable/ic_photo_camera_dark</item>
<item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
<item name="emoji_tab_strip_background">@color/gray95</item>

2
src/org/thoughtcrime/securesms/mms/AttachmentTypeSelectorAdapter.java
View File

@ -72,7 +72,7 @@ public class AttachmentTypeSelectorAdapter extends ArrayAdapter<AttachmentTypeSe
private static List<IconListItem> getItemList(Context context) {
List<IconListItem> data = new ArrayList<>(4);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_take_photo), ResUtil.getDrawableRes(context, R.attr.conversation_attach_contact_info), TAKE_PHOTO);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_camera), ResUtil.getDrawableRes(context, R.attr.conversation_attach_camera), TAKE_PHOTO);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_picture), ResUtil.getDrawableRes(context, R.attr.conversation_attach_image), ADD_IMAGE);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_video), ResUtil.getDrawableRes(context, R.attr.conversation_attach_video), ADD_VIDEO);
addItem(data, context.getString(R.string.AttachmentTypeSelectorAdapter_audio), ResUtil.getDrawableRes(context, R.attr.conversation_attach_sound), ADD_SOUND);