TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-09 07:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add camera preview to message composition

Browse Source
This commit is contained in:
Calvin Hu
2015-04-16 01:38:33 -04:00
committed by Moxie Marlinspike
parent 13eed3baa7
commit c4a37e38ab
55 changed files with 1698 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
res/values/attrs.xml
View File

@@ -52,6 +52,7 @@
<attr name="emoji_category_places" format="reference"/>
<attr name="emoji_category_symbol" format="reference"/>
<attr name="emoji_category_emoticons" format="reference"/>
<attr name="quick_camera_icon" format="reference"/>
<attr name="conversation_item_background" format="reference"/>
<attr name="conversation_item_bubble_background" format="reference|color"/>

1
res/values/dimens.xml
View File

@@ -28,4 +28,5 @@
<dimen name="color_grid_extra_padding">32dp</dimen>
<dimen name="color_grid_item_size">48dp</dimen>
<dimen name="quick_media_drawer_default_height">250dp</dimen>
</resources>

4
res/values/strings.xml
View File

@@ -521,6 +521,7 @@
<string name="conversation_activity__compose_description">Message composition</string>
<string name="conversation_activity__emoji_toggle_description">Toggle emoji keyboard</string>
<string name="conversation_activity__attachment_thumbnail">Attachment Thumbnail</string>
<string name="conversation_activity__quick_attachment_drawer_toggle_description">Toggle attachment drawer</string>
<!-- conversation_item -->
<string name="conversation_item__mms_downloading_description">Media message downloading</string>
@@ -981,6 +982,9 @@
<!-- transport_selection_list_item -->
<string name="transport_selection_list_item__transport_icon">Transport icon</string>
<!-- quick_attachment_drawer -->
<string name="quick_camera_unavailable">Camera unavailable</string>
<!-- EOF -->
</resources>

6
res/values/themes.xml
View File

@@ -40,6 +40,7 @@
<item name="ic_arrow_forward">@drawable/ic_arrow_forward_dark</item>
<item name="lockscreen_watermark">@drawable/lockscreen_watermark_dark</item>
<item name="android:windowBackground">@color/black</item>
<item name="conversation_background">@color/black</item>
</style>
<style name="PopupAnimation" parent="@android:style/Animation">
@@ -124,6 +125,9 @@
<item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
<item name="conversation_item_received_text_primary_color">@color/white</item>
<item name="conversation_item_received_text_secondary_color">#BFffffff</item>
<item name="quick_camera_icon">@drawable/quick_camera_light</item>
<item name="conversation_item_background">@drawable/conversation_item_background</item>
<item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
@@ -250,6 +254,8 @@
<item name="emoji_category_symbol">@drawable/emoji_category_symbol_dark</item>
<item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_dark</item>
<item name="quick_camera_icon">@drawable/quick_camera_dark</item>
<item name="menu_new_conversation_icon">@drawable/ic_add_white_24dp</item>
<item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
<item name="menu_search_icon">@drawable/ic_search_white_24dp</item>