mirror of
https://github.com/oxen-io/session-android.git
synced 2025-10-17 12:11:51 +00:00
Styling improvements and code cleanup.
This commit is contained in:
@@ -1,10 +1,15 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
<attr name="theme_type" format="string"/>
|
||||
|
||||
<attr name="attachment_type_selector_background" format="color"/>
|
||||
<attr name="attachment_document_icon_small" format="reference" />
|
||||
<attr name="attachment_document_icon_large" format="reference" />
|
||||
|
||||
<attr name="conversation_list_item_background" format="reference"/>
|
||||
<attr name="conversation_list_item_contact_color" format="reference|color"/>
|
||||
<attr name="conversation_list_item_subject_color" format="reference|color"/>
|
||||
<attr name="conversation_list_item_delivery_icon_color" format="reference|color"/>
|
||||
<attr name="conversation_list_item_date_color" format="reference|color"/>
|
||||
<attr name="conversation_list_item_divider" format="reference"/>
|
||||
|
||||
@@ -23,6 +28,8 @@
|
||||
<attr name="conversation_background" format="reference|color"/>
|
||||
<attr name="conversation_editor_background" format="reference|color"/>
|
||||
<attr name="conversation_editor_text_color" format="reference|color"/>
|
||||
<attr name="conversation_input_background_color" format="color"/>
|
||||
<attr name="conversation_input_outline_color" format="color"/>
|
||||
<attr name="conversation_transport_sms_indicator" format="reference"/>
|
||||
<attr name="conversation_transport_push_indicator" format="reference"/>
|
||||
<attr name="conversation_transport_popup_background" format="reference"/>
|
||||
@@ -68,6 +75,11 @@
|
||||
<attr name="conversation_item_update_text_color" format="reference"/>
|
||||
<attr name="conversation_item_last_seen_text_color" format="reference"/>
|
||||
<attr name="conversation_item_last_seen_line_color" format="reference"/>
|
||||
<attr name="conversation_item_date_line_color" format="reference"/>
|
||||
<attr name="conversation_item_quote_text_color" format="reference"/>
|
||||
<attr name="conversation_item_sticky_date_background_color" format="color" />
|
||||
<attr name="conversation_item_sticky_date_text_color" format="color" />
|
||||
<attr name="conversation_item_delivery_icon_color" format="color" />
|
||||
|
||||
<attr name="dialog_info_icon" format="reference" />
|
||||
<attr name="dialog_alert_icon" format="reference" />
|
||||
@@ -158,6 +170,7 @@
|
||||
<attr name="maxWidth" format="dimension" />
|
||||
<attr name="minHeight" format="dimension" />
|
||||
<attr name="maxHeight" format="dimension" />
|
||||
<attr name="thumbnail_radius" format="dimension" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="DeliveryStatusView">
|
||||
@@ -271,4 +284,7 @@
|
||||
<attr name="conversationThumbnail_maxHeight" format="dimension" />
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="CornerMaskingView">
|
||||
<attr name="cmv_radius" format="dimension" />
|
||||
</declare-styleable>
|
||||
</resources>
|
||||
|
@@ -23,11 +23,9 @@
|
||||
<dimen name="message_bubble_shadow_distance">1.5dp</dimen>
|
||||
<dimen name="message_bubble_horizontal_padding">12dp</dimen>
|
||||
<dimen name="message_bubble_top_padding">6dp</dimen>
|
||||
<dimen name="message_bubble_quote_padding">6dp</dimen>
|
||||
<dimen name="message_bubble_collapsed_footer_padding">6dp</dimen>
|
||||
<dimen name="message_bubble_edge_margin">48dp</dimen>
|
||||
<dimen name="message_bubble_edge_margin">32dp</dimen>
|
||||
<dimen name="message_bubble_bottom_padding">8dp</dimen>
|
||||
<dimen name="message_bubble_footer_top_padding">4dp</dimen>
|
||||
<dimen name="media_bubble_remove_button_size">24dp</dimen>
|
||||
<dimen name="media_bubble_edit_button_size">24dp</dimen>
|
||||
<dimen name="media_bubble_default_dimens">210dp</dimen>
|
||||
|
@@ -126,10 +126,15 @@
|
||||
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
|
||||
<item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
|
||||
<!--<item name="android:windowContentOverlay">@drawable/compat_actionbar_shadow_background</item>-->
|
||||
|
||||
<item name="attachment_type_selector_background">@color/white</item>
|
||||
<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="conversation_list_item_background">@drawable/conversation_list_item_background</item>
|
||||
<item name="conversation_list_item_contact_color">@color/core_light_90</item>
|
||||
<item name="conversation_list_item_subject_color">@color/core_light_60</item>
|
||||
<item name="conversation_list_item_delivery_icon_color">@color/core_light_35</item>
|
||||
<item name="conversation_list_item_date_color">@color/core_light_60</item>
|
||||
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
|
||||
|
||||
@@ -141,6 +146,8 @@
|
||||
<item name="conversation_background">@color/core_white</item>
|
||||
<item name="conversation_editor_background">#22000000</item>
|
||||
<item name="conversation_editor_text_color">#ff111111</item>
|
||||
<item name="conversation_input_background_color">@color/core_light_02</item>
|
||||
<item name="conversation_input_outline_color">@color/core_light_10</item>
|
||||
<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>
|
||||
@@ -186,6 +193,11 @@
|
||||
<item name="conversation_item_update_text_color">@color/core_light_60</item>
|
||||
<item name="conversation_item_last_seen_text_color">@color/core_light_90</item>
|
||||
<item name="conversation_item_last_seen_line_color">@color/core_light_60</item>
|
||||
<item name="conversation_item_date_line_color">@color/core_light_45</item>
|
||||
<item name="conversation_item_quote_text_color">@color/core_light_90</item>
|
||||
<item name="conversation_item_sticky_date_background_color">@color/core_light_02</item>
|
||||
<item name="conversation_item_sticky_date_text_color">@color/core_light_60</item>
|
||||
<item name="conversation_item_delivery_icon_color">@color/core_light_45</item>
|
||||
|
||||
<item name="quick_camera_icon">@drawable/quick_camera_light</item>
|
||||
<item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
|
||||
@@ -244,7 +256,6 @@
|
||||
|
||||
<style name="TextSecure.DarkTheme" parent="@style/Theme.AppCompat">
|
||||
<item name="theme_type">dark</item>
|
||||
<item name="attachment_type_selector_background">@color/gray95</item>
|
||||
<item name="actionBarStyle">@style/TextSecure.DarkActionBar</item>
|
||||
<item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
@@ -258,9 +269,15 @@
|
||||
<item name="android:windowBackground">@color/black</item>
|
||||
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
|
||||
<item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
|
||||
|
||||
<item name="attachment_type_selector_background">@color/gray95</item>
|
||||
<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="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>
|
||||
<item name="conversation_list_item_delivery_icon_color">@color/core_dark_55</item>
|
||||
<item name="conversation_list_item_date_color">#ffdddddd</item>
|
||||
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape_dark</item>
|
||||
|
||||
@@ -274,8 +291,13 @@
|
||||
<item name="conversation_item_received_text_secondary_color">#b3efefef</item>
|
||||
<item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape_dark</item>
|
||||
<item name="conversation_item_update_text_color">@color/core_light_35</item>
|
||||
<item name="conversation_item_last_seen_text_color">@color/core_light_02</item>
|
||||
<item name="conversation_item_last_seen_line_color">@color/core_light_10</item>
|
||||
<item name="conversation_item_last_seen_text_color">@color/core_dark_30</item>
|
||||
<item name="conversation_item_last_seen_line_color">@color/core_dark_30</item>
|
||||
<item name="conversation_item_date_line_color">@color/core_dark_55</item>
|
||||
<item name="conversation_item_quote_text_color">@color/core_dark_05</item>
|
||||
<item name="conversation_item_sticky_date_background_color">@color/core_dark_85</item>
|
||||
<item name="conversation_item_sticky_date_text_color">@color/core_dark_30</item>
|
||||
<item name="conversation_item_delivery_icon_color">@color/core_dark_60</item>
|
||||
|
||||
<item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
|
||||
|
||||
@@ -297,6 +319,8 @@
|
||||
<item name="conversation_background">@color/black</item>
|
||||
<item name="conversation_editor_background">#22ffffff</item>
|
||||
<item name="conversation_editor_text_color">#ffeeeeee</item>
|
||||
<item name="conversation_input_background_color">@color/core_dark_85</item>
|
||||
<item name="conversation_input_outline_color">@color/core_dark_70</item>
|
||||
<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>
|
||||
|
Reference in New Issue
Block a user