TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 05:02:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add sticker support.

Browse Source 
No sticker packs are available for use yet, but we now have the
latent ability to send and receive.
This commit is contained in:
Greyson Parrelli
2019-04-17 10:21:30 -04:00
parent d5fffb0132
commit 2a644437fb
447 changed files with 8782 additions and 1132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
res/values/attrs.xml
View File

@@ -38,6 +38,7 @@
<attr name="conversation_transport_push_indicator" format="reference"/>
<attr name="conversation_transport_popup_background" format="reference"/>
<attr name="conversation_emoji_toggle" format="reference"/>
<attr name="conversation_sticker_toggle" format="reference"/>
<attr name="conversation_keyboard_toggle" format="reference"/>
<attr name="conversation_attach_camera" format="reference"/>
<attr name="conversation_attach_image" format="reference"/>
@@ -47,12 +48,15 @@
<attr name="conversation_attach" format="reference"/>
<attr name="conversation_number_picker_text_color_normal" format="reference|color"/>
<attr name="conversation_number_picker_text_color_selected" format="reference|color"/>
<attr name="conversation_sticker_footer_text_color" format="reference|color"/>
<attr name="conversation_sticker_footer_icon_color" format="reference|color"/>
<attr name="conversation_sticker_author_color" format="reference|color"/>
<attr name="emoji_tab_strip_background" format="color" />
<attr name="emoji_tab_indicator" format="color" />
<attr name="emoji_tab_underline" format="color" />
<attr name="emoji_tab_seperator" format="color" />
<attr name="emoji_background" format="color" />
<attr name="emoji_drawer_background" format="color" />
<attr name="emoji_text_color" format="color" />
<attr name="emoji_category_recent" format="reference"/>
@@ -66,9 +70,12 @@
<attr name="emoji_category_flags" format="reference"/>
<attr name="emoji_category_emoticons" format="reference"/>
<attr name="emoji_variation_selector_background" format="reference|color" />
<attr name="quick_camera_icon" format="reference"/>
<attr name="quick_mic_icon" format="reference"/>
<attr name="compose_icon_tint" />
<attr name="conversation_item_background" format="reference"/>
<attr name="conversation_item_bubble_background" format="reference|color"/>
<attr name="conversation_item_sent_text_primary_color" format="reference|color"/>
@@ -117,6 +124,8 @@
<attr name="reminder_header_background" format="color"/>
<attr name="media_keyboard_button_color" format="color" />
<attr name="menu_new_conversation_icon" format="reference" />
<attr name="menu_search_icon" format="reference" />
<attr name="menu_call_icon" format="reference" />
@@ -166,6 +175,17 @@
<attr name="search_toolbar_background" format="color"/>
<attr name="search_background" format="color"/>
<attr name="sticker_management_icon" format="reference" />
<attr name="sticker_management_divider_color" format="color" />
<attr name="sticker_management_empty_background_color" format="color" />
<attr name="sticker_management_action_button_color" format="color" />
<attr name="sticker_popup_background" format="color" />
<attr name="sticker_preview_toolbar_background" format="color" />
<attr name="sticker_preview_status_bar_color" format="color" />
<attr name="sticker_view_missing_background" format="reference|color" />
<attr name="tooltip_default_color" format="reference|color" />
<attr name="contact_list_divider" format="reference"/>
<attr name="login_top_background" format="color"/>

3
res/values/colors.xml
View File

@@ -57,6 +57,9 @@
<color name="import_export_touch_highlight_light">#400099cc</color>
<color name="import_export_touch_highlight_dark">#40ffffff</color>
<color name="StickerPreviewActivity_remove_button_color">@color/conversation_crimson</color>
<color name="StickerPreviewActivity_install_button_color">@color/core_blue</color>
<color name="sticker_selected_color">#99ffffff</color>
<color name="transparent">#00FFFFFF</color>
<color name="transparent_black">#00000000</color>

13
res/values/dimens.xml
View File

@@ -46,10 +46,14 @@
<dimen name="media_bubble_max_width">240dp</dimen>
<dimen name="media_bubble_min_height">100dp</dimen>
<dimen name="media_bubble_max_height">320dp</dimen>
<dimen name="media_bubble_sticker_dimens">128dp</dimen>
<dimen name="media_picker_folder_width">175dp</dimen>
<dimen name="media_picker_item_width">85dp</dimen>
<dimen name="media_keyboard_provider_icon_padding">5dp</dimen>
<dimen name="media_keyboard_provider_icon_margin">4dp</dimen>
<dimen name="mediasend_progress_dialog_size">120dp</dimen>
<dimen name="thumbnail_default_radius">4dp</dimen>
@@ -72,6 +76,15 @@
<dimen name="quick_camera_shutter_ring_size">52dp</dimen>
<dimen name="sticker_page_item_padding">8dp</dimen>
<dimen name="sticker_page_item_divisor">88dp</dimen>
<dimen name="sticker_page_item_multiplier">8dp</dimen>
<dimen name="sticker_preview_sticker_size">96dp</dimen>
<dimen name="sticker_management_horizontal_margin">16dp</dimen>
<dimen name="tooltip_popup_margin">8dp</dimen>
<dimen name="transfer_controls_expanded_width">150dp</dimen>
<dimen name="transfer_controls_contracted_width">70dp</dimen>
<dimen name="conversation_list_fragment_archive_padding">16dp</dimen>

26
res/values/strings.xml
View File

@@ -189,6 +189,9 @@
<string name="ConversationActivity_search_position">%1$d of %2$d</string>
<string name="ConversationActivity_no_results">No results</string>
<string name="ConversationActivity_sticker_pack_installed">Sticker pack installed</string>
<string name="ConversationActivity_new_say_it_with_stickers">New! Say it with stickers</string>
<!-- ConversationAdapter -->
<plurals name="ConversationAdapter_n_unread_messages">
<item quantity="one">%d unread message</item>
@@ -645,6 +648,7 @@
<!-- Slide -->
<string name="Slide_image">Image</string>
<string name="Slide_sticker">Sticker</string>
<string name="Slide_audio">Audio</string>
<string name="Slide_video">Video</string>
@@ -660,6 +664,26 @@
<string name="SmsMessageRecord_secure_session_reset_s">%s reset the secure session.</string>
<string name="SmsMessageRecord_duplicate_message">Duplicate message.</string>
<!-- StickerManagementActivity -->
<string name="StickerManagementActivity_stickers">Stickers</string>
<!-- StickerManagementAdapter -->
<string name="StickerManagementAdapter_installed_stickers">Installed Stickers</string>
<string name="StickerManagementAdapter_stickers_you_received">Stickers You Received</string>
<string name="StickerManagementAdapter_signal_artist_series">Signal Artist Series</string>
<string name="StickerManagementAdapter_no_stickers_installed">No stickers installed</string>
<string name="StickerManagementAdapter_stickers_from_incoming_messages_will_appear_here">Stickers from incoming messages will appear here</string>
<string name="StickerManagementAdapter_untitled">Untitled</string>
<string name="StickerManagementAdapter_unknown">Unknown</string>
<!-- StickerPackPreviewActivity -->
<string name="StickerPackPreviewActivity_untitled">Untitled</string>
<string name="StickerPackPreviewActivity_unknown">Unknown</string>
<string name="StickerPackPreviewActivity_install">Install</string>
<string name="StickerPackPreviewActivity_remove">Remove</string>
<string name="StickerPackPreviewActivity_stickers">Stickers</string>
<string name="StickerPackPreviewActivity_failed_to_load_sticker_pack">Failed to load sticker pack</string>
<!-- ThreadRecord -->
<string name="ThreadRecord_group_updated">Group updated</string>
<string name="ThreadRecord_left_the_group">Left the group</string>
@@ -754,6 +778,7 @@
<string name="MessageNotifier_mark_all_as_read">Mark all as read</string>
<string name="MessageNotifier_mark_read">Mark read</string>
<string name="MessageNotifier_media_message">Media message</string>
<string name="MessageNotifier_sticker">Sticker</string>
<string name="MessageNotifier_reply">Reply</string>
<string name="MessageNotifier_signal_message">Signal Message</string>
<string name="MessageNotifier_unsecured_sms">Unsecured SMS</string>
@@ -904,6 +929,7 @@
<string name="QuoteView_audio">Audio</string>
<string name="QuoteView_video">Video</string>
<string name="QuoteView_photo">Photo</string>
<string name="QuoteView_sticker">Sticker</string>
<string name="QuoteView_document">Document</string>
<string name="QuoteView_you">You</string>
<string name="QuoteView_original_missing">Original message not found</string>

94
res/values/themes.xml
View File

@@ -99,6 +99,11 @@
<item name="android:windowExitAnimation">@anim/slide_to_top</item>
</style>
<style name="StickerPopupAnimation" parent="@android:style/Animation">
<item name="android:windowEnterAnimation">@anim/fade_in</item>
<item name="android:windowExitAnimation">@anim/fade_out</item>
</style>
<style name="TextSecure.LightTheme.Popup" parent="TextSecure.LightTheme">
<item name="android:windowIsFloating">false</item>
<item name="android:windowSoftInputMode">stateUnchanged</item>
@@ -131,6 +136,8 @@
<item name="attachment_document_icon_small">@drawable/ic_document_small_light</item>
<item name="attachment_document_icon_large">@drawable/ic_document_large_light</item>
<item name="compose_icon_tint">@color/core_grey_60</item>
<item name="conversation_list_item_background">@drawable/conversation_list_item_background</item>
<item name="conversation_list_item_contact_color">@color/core_grey_90</item>
<item name="conversation_list_item_subject_color">@color/core_grey_60</item>
@@ -155,7 +162,8 @@
<item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure</item>
<item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
<item name="conversation_transport_popup_background">@color/white</item>
<item name="conversation_emoji_toggle">@drawable/ic_mood_grey600_24dp</item>
<item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_light</item>
<item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_light</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>
@@ -165,27 +173,31 @@
<item name="conversation_attach">@drawable/ic_attach_grey600_24dp</item>
<item name="conversation_number_picker_text_color_normal">@color/gray65</item>
<item name="conversation_number_picker_text_color_selected">@color/black</item>
<item name="conversation_sticker_footer_text_color">@color/core_grey_60</item>
<item name="conversation_sticker_footer_icon_color">@color/core_grey_60</item>
<item name="conversation_sticker_author_color">@color/core_grey_95</item>
<item name="contact_list_divider">@drawable/contact_list_divider_light</item>
<item name="verification_background">@color/core_grey_05</item>
<item name="emoji_tab_strip_background">@color/gray12</item>
<item name="emoji_tab_strip_background">@color/core_grey_05</item>
<item name="emoji_tab_indicator">#66555555</item>
<item name="emoji_tab_underline">#44555555</item>
<item name="emoji_tab_seperator">@color/gray20</item>
<item name="emoji_drawer_background">@color/core_grey_02</item>
<item name="emoji_text_color">@color/black</item>
<item name="emoji_category_recent">@drawable/emoji_category_recent_light</item>
<item name="emoji_category_people">@drawable/emoji_category_people_light</item>
<item name="emoji_category_nature">@drawable/emoji_category_nature_light</item>
<item name="emoji_category_foods">@drawable/emoji_category_foods_light</item>
<item name="emoji_category_activity">@drawable/emoji_category_activity_light</item>
<item name="emoji_category_places">@drawable/emoji_category_places_light</item>
<item name="emoji_category_objects">@drawable/emoji_category_objects_light</item>
<item name="emoji_category_symbol">@drawable/emoji_category_symbol_light</item>
<item name="emoji_category_flags">@drawable/emoji_category_flags_light</item>
<item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_light</item>
<item name="emoji_category_recent">@drawable/ic_recent_light_20</item>
<item name="emoji_category_people">@drawable/ic_emoji_people_light_20</item>
<item name="emoji_category_nature">@drawable/ic_emoji_animal_light_20</item>
<item name="emoji_category_foods">@drawable/ic_emoji_food_light_20</item>
<item name="emoji_category_activity">@drawable/ic_emoji_activity_light_20</item>
<item name="emoji_category_places">@drawable/ic_emoji_travel_light_20</item>
<item name="emoji_category_objects">@drawable/ic_emoji_object_light_20</item>
<item name="emoji_category_symbol">@drawable/ic_emoji_symbol_light_20</item>
<item name="emoji_category_flags">@drawable/ic_emoji_flag_light_20</item>
<item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_light_20</item>
<item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_light</item>
<item name="conversation_item_bubble_background">@color/core_grey_05</item>
@@ -227,6 +239,8 @@
<item name="linkpreview_secondary_text_color">@color/core_grey_60</item>
<item name="linkpreview_divider_color">@color/core_grey_25</item>
<item name="media_keyboard_button_color">@color/core_grey_60</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>
@@ -251,6 +265,17 @@
<item name="reminder_header_background">#ff1d85d7</item>
<item name="sticker_management_icon">@drawable/sticker_button_light</item>
<item name="sticker_management_divider_color">@color/core_grey_15</item>
<item name="sticker_management_empty_background_color">@color/core_grey_05</item>
<item name="sticker_management_action_button_color">@color/core_grey_90</item>
<item name="sticker_popup_background">@color/transparent_white_aa</item>
<item name="sticker_preview_toolbar_background">@color/core_white</item>
<item name="sticker_preview_status_bar_color">@color/core_grey_05</item>
<item name="sticker_view_missing_background">@drawable/sticker_missing_background_light</item>
<item name="tooltip_default_color">@color/core_white</item>
<item name="pref_icon_tint">@color/textsecure_primary_dark</item>
<item name="pref_divider">@drawable/preference_divider_light</item>
@@ -289,6 +314,8 @@
<item name="attachment_document_icon_small">@drawable/ic_document_small_dark</item>
<item name="attachment_document_icon_large">@drawable/ic_document_large_dark</item>
<item name="compose_icon_tint">@color/core_grey_25</item>
<item name="conversation_list_item_background">@drawable/conversation_list_item_background_dark</item>
<item name="conversation_list_item_contact_color">#ffdddddd</item>
<item name="conversation_list_item_subject_color">#ffdddddd</item>
@@ -347,7 +374,8 @@
<item name="conversation_transport_sms_indicator">@drawable/ic_send_sms_insecure_dark</item>
<item name="conversation_transport_push_indicator">@drawable/ic_send_push</item>
<item name="conversation_transport_popup_background">@color/black</item>
<item name="conversation_emoji_toggle">@drawable/ic_mood_white_24dp</item>
<item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_dark</item>
<item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_dark</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>
@@ -357,24 +385,27 @@
<item name="conversation_attach">@drawable/ic_attach_white_24dp</item>
<item name="conversation_number_picker_text_color_normal">@color/gray13</item>
<item name="conversation_number_picker_text_color_selected">@color/white</item>
<item name="conversation_sticker_footer_text_color">@color/core_grey_25</item>
<item name="conversation_sticker_footer_icon_color">@color/core_grey_25</item>
<item name="conversation_sticker_author_color">@color/core_grey_05</item>
<item name="emoji_tab_strip_background">@color/gray95</item>
<item name="emoji_tab_strip_background">@color/core_grey_85</item>
<item name="emoji_tab_indicator">@color/gray65</item>
<item name="emoji_tab_underline">@color/gray78</item>
<item name="emoji_tab_seperator">@color/gray70</item>
<item name="emoji_background">@color/black</item>
<item name="emoji_drawer_background">@color/core_grey_95</item>
<item name="emoji_text_color">@color/white</item>
<item name="emoji_category_recent">@drawable/emoji_category_recent_dark</item>
<item name="emoji_category_people">@drawable/emoji_category_people_dark</item>
<item name="emoji_category_nature">@drawable/emoji_category_nature_dark</item>
<item name="emoji_category_foods">@drawable/emoji_category_foods_dark</item>
<item name="emoji_category_activity">@drawable/emoji_category_activity_dark</item>
<item name="emoji_category_places">@drawable/emoji_category_places_dark</item>
<item name="emoji_category_objects">@drawable/emoji_category_objects_dark</item>
<item name="emoji_category_symbol">@drawable/emoji_category_symbol_dark</item>
<item name="emoji_category_flags">@drawable/emoji_category_flags_dark</item>
<item name="emoji_category_emoticons">@drawable/emoji_category_emoticons_dark</item>
<item name="emoji_category_recent">@drawable/ic_recent_dark_20</item>
<item name="emoji_category_people">@drawable/ic_emoji_people_dark_20</item>
<item name="emoji_category_nature">@drawable/ic_emoji_animal_dark_20</item>
<item name="emoji_category_foods">@drawable/ic_emoji_food_dark_20</item>
<item name="emoji_category_activity">@drawable/ic_emoji_activity_dark_20</item>
<item name="emoji_category_places">@drawable/ic_emoji_travel_dark_20</item>
<item name="emoji_category_objects">@drawable/ic_emoji_object_dark_20</item>
<item name="emoji_category_symbol">@drawable/ic_emoji_symbol_dark_20</item>
<item name="emoji_category_flags">@drawable/ic_emoji_flag_dark_20</item>
<item name="emoji_category_emoticons">@drawable/ic_emoji_emoticon_dark_20</item>
<item name="emoji_variation_selector_background">@drawable/emoji_variation_selector_background_dark</item>
<item name="linkpreview_background_color">@color/core_grey_95</item>
@@ -385,6 +416,8 @@
<item name="quick_camera_icon">@drawable/quick_camera_dark</item>
<item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
<item name="media_keyboard_button_color">@color/core_grey_25</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>
@@ -409,6 +442,17 @@
<item name="reminder_header_background">@color/textsecure_primary_dark</item>
<item name="sticker_management_icon">@drawable/sticker_button_dark</item>
<item name="sticker_management_divider_color">@color/core_grey_75</item>
<item name="sticker_management_empty_background_color">@color/core_grey_85</item>
<item name="sticker_management_action_button_color">@color/core_grey_25</item>
<item name="sticker_popup_background">@color/transparent_black_90</item>
<item name="sticker_preview_toolbar_background">@color/core_grey_95</item>
<item name="sticker_preview_status_bar_color">@color/core_grey_85</item>
<item name="sticker_view_missing_background">@drawable/sticker_missing_background_dark</item>
<item name="tooltip_default_color">@color/core_grey_75</item>
<item name="pref_icon_tint">#FFFFFF</item>
<item name="pref_divider">@drawable/preference_divider_dark</item>