mirror of
https://github.com/oxen-io/session-android.git
synced 2025-08-25 18:29:01 +00:00
Merge branch 'dev' of https://github.com/loki-project/session-android into attachment-in-conversation-preview
This commit is contained in:
Ryan ZHAO
@@ -3,8 +3,10 @@
|
||||
<attr name="theme_type" format="string"/>
|
||||
|
||||
<attr name="attachment_type_selector_background" format="color"/>
|
||||
<attr name="attachment_type_selector_hide_button_background" format="color"/>
|
||||
<attr name="attachment_document_icon_small" format="reference" />
|
||||
<attr name="attachment_document_icon_large" format="reference" />
|
||||
<attr name="attachment_document_extension_text_color" format="color" />
|
||||
|
||||
<attr name="conversation_list_item_background" format="reference"/>
|
||||
<attr name="conversation_list_item_contact_color" format="reference|color"/>
|
||||
@@ -144,6 +146,9 @@
|
||||
<attr name="menu_forward_icon" format="reference" />
|
||||
<attr name="menu_save_icon" format="reference" />
|
||||
<attr name="menu_reply_icon" format="reference" />
|
||||
<attr name="menu_block_icon" format="reference" />
|
||||
<attr name="menu_photo_library_icon" format="reference" />
|
||||
<attr name="menu_delete_icon" format="reference" />
|
||||
|
||||
<attr name="pref_icon_tint" format="color"/>
|
||||
|
||||
@@ -151,6 +156,12 @@
|
||||
|
||||
<attr name="quote_missing_icon_color" format="color" />
|
||||
|
||||
<attr name="home_gradient_start" format="color|reference" />
|
||||
<attr name="home_gradient_end" format="color|reference" />
|
||||
|
||||
<attr name="message_received_background_color" format="color|reference" />
|
||||
<attr name="message_sent_background_color" format="color|reference" />
|
||||
|
||||
<declare-styleable name="CustomDefaultPreference">
|
||||
<attr name="custom_pref_toggle" format="string"/>
|
||||
</declare-styleable>
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
|
||||
<!-- Session -->
|
||||
<color name="accent">#00F782</color>
|
||||
<color name="accent_alpha50">#8000F782</color>
|
||||
<color name="text">#FFFFFF</color>
|
||||
<color name="destructive">#FF453A</color>
|
||||
<color name="unimportant">#D8D8D8</color>
|
||||
@@ -15,15 +16,13 @@
|
||||
<color name="unimportant_button_background">#323232</color>
|
||||
<color name="dialog_background">#101011</color>
|
||||
<color name="dialog_border">#212121</color>
|
||||
<color name="unimportant_dialog_button_background">#1B1B1B</color>
|
||||
<color name="unimportant_dialog_button_background">@color/unimportant_button_background</color>
|
||||
<color name="fake_chat_bubble_background">#3F4146</color>
|
||||
<color name="fake_chat_bubble_text">#000000</color>
|
||||
<color name="app_icon_background">#333132</color>
|
||||
<color name="progress_bar_background">#0AFFFFFF</color>
|
||||
<color name="compose_view_background">#1B1B1B</color>
|
||||
<color name="compose_text_view_background">#141414</color>
|
||||
<color name="received_message_background">#222325</color>
|
||||
<color name="sent_message_background">#3F4146</color>
|
||||
<color name="quote_not_found_background">#99FFFFFF</color>
|
||||
<color name="new_conversation_button_collapsed_background">#1F1F1F</color>
|
||||
<color name="pn_option_background">#1B1B1B</color>
|
||||
@@ -39,12 +38,10 @@
|
||||
|
||||
<color name="signal_primary">@color/accent</color>
|
||||
<color name="signal_primary_dark">@color/accent</color>
|
||||
<color name="signal_primary_alpha33">#00F782</color>
|
||||
<color name="signal_primary_alpha_focus">#882090ea</color>
|
||||
|
||||
<color name="textsecure_primary">@color/signal_primary</color>
|
||||
<color name="textsecure_primary_dark">@color/signal_primary_dark</color>
|
||||
<color name="textsecure_primary_alpha33">@color/signal_primary_alpha33</color>
|
||||
|
||||
<color name="white">#ffffffff</color>
|
||||
<color name="black">#ff000000</color>
|
||||
@@ -82,7 +79,7 @@
|
||||
<color name="conversation_compose_divider">#32000000</color>
|
||||
|
||||
<color name="action_mode_status_bar">@color/gray65</color>
|
||||
<color name="touch_highlight">#400099cc</color>
|
||||
<color name="touch_highlight">#22000000</color>
|
||||
|
||||
<color name="device_link_item_background_light">#ffffffff</color>
|
||||
<color name="device_link_item_background_dark">#ff333333</color>
|
||||
@@ -107,4 +104,7 @@
|
||||
|
||||
<color name="avatar_background">@color/transparent_black_90</color>
|
||||
|
||||
<color name="default_background_start">#121212</color>
|
||||
<color name="default_background_end">#171717</color>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -14,6 +14,7 @@
|
||||
<!-- Element Sizes -->
|
||||
<dimen name="small_button_height">34dp</dimen>
|
||||
<dimen name="medium_button_height">38dp</dimen>
|
||||
<dimen name="medium_button_corner_radius">22dp</dimen>
|
||||
<dimen name="accent_line_thickness">4dp</dimen>
|
||||
<dimen name="very_small_profile_picture_size">26dp</dimen>
|
||||
<dimen name="small_profile_picture_size">36dp</dimen>
|
||||
@@ -30,7 +31,7 @@
|
||||
<dimen name="fake_chat_view_bubble_corner_radius">10dp</dimen>
|
||||
<dimen name="fake_chat_view_height">234dp</dimen>
|
||||
<dimen name="setting_button_height">56dp</dimen>
|
||||
<dimen name="dialog_corner_radius">8dp</dimen>
|
||||
<dimen name="dialog_corner_radius">12dp</dimen>
|
||||
<dimen name="dialog_button_corner_radius">4dp</dimen>
|
||||
<dimen name="pn_option_corner_radius">8dp</dimen>
|
||||
<dimen name="path_status_view_size">8dp</dimen>
|
||||
|
||||
@@ -1854,6 +1854,13 @@
|
||||
<string name="dialog_seed_disclaimer">*Please note that it is not possible to use the same Session ID on multiple devices simultaneously</string>
|
||||
|
||||
<string name="view_reset_secure_session_done_message">Secure session reset done</string>
|
||||
|
||||
<string name="dialog_ui_mode_title">Theme</string>
|
||||
<string name="dialog_ui_mode_option_day">Day</string>
|
||||
<string name="dialog_ui_mode_option_night">Night</string>
|
||||
<string name="dialog_ui_mode_option_system_default">System default</string>
|
||||
|
||||
<string name="activity_conversation_menu_copy_session_id">Copy Session ID</string>
|
||||
|
||||
<!-- Attachment message -->
|
||||
<string name="attachment">Attachment</string>
|
||||
|
||||
@@ -2,135 +2,138 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<!-- Session -->
|
||||
<style name="Session.DarkActionBar" parent="@style/Widget.AppCompat.ActionBar">
|
||||
<item name="background">@color/action_bar_background</item>
|
||||
<item name="android:background">@color/action_bar_background</item>
|
||||
<item name="titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item>
|
||||
<item name="android:titleTextStyle">@style/Session.DarkActionBar.TitleTextStyle</item>
|
||||
<item name="elevation">0dp</item>
|
||||
<item name="android:elevation">0dp</item>
|
||||
<style name="Widget.Session.ActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid">
|
||||
<item name="android:background">?colorPrimary</item>
|
||||
<item name="elevation">1dp</item>
|
||||
<item name="titleTextStyle">@style/TextAppearance.Session.DarkActionBar.TitleTextStyle</item>
|
||||
<item name="popupTheme">@style/Widget.Session.ActionBar</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.DarkSubtitleActionBar" parent="@style/Widget.AppCompat.ActionBar">
|
||||
<item name="background">@color/action_bar_background</item>
|
||||
<item name="android:background">@color/action_bar_background</item>
|
||||
<item name="titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item>
|
||||
<item name="android:titleTextStyle">@style/Session.DarkSubtitleActionBar.TitleTextStyle</item>
|
||||
<item name="subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
|
||||
<item name="android:subtitleTextStyle">@style/Session.DarkSubtitleActionBar.SubtitleTextStyle</item>
|
||||
<item name="elevation">0dp</item>
|
||||
<style name="Widget.Session.ActionBar.Flat">
|
||||
<item name="android:elevation">0dp</item>
|
||||
<item name="elevation">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<style name="TextAppearance.Session.DarkActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:textSize">@dimen/very_large_font_size</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.DarkSubtitleActionBar.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<item name="android:textSize">@dimen/large_font_size</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.DarkSubtitleActionBar.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<item name="android:textSize">@dimen/small_font_size</item>
|
||||
<item name="android:fontFamily">sans-serif</item>
|
||||
<item name="android:textStyle">normal</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.BaseDarkTheme.SearchView" parent="@style/Widget.AppCompat.SearchView">
|
||||
<item name="closeIcon">@drawable/ic_close_white_24dp</item>
|
||||
<item name="closeIcon">@drawable/ic_baseline_clear_24</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
|
||||
<item name="buttonBarNegativeButtonStyle">@style/Session.AlertDialog.NegativeButtonStyle</item>
|
||||
<item name="buttonBarPositiveButtonStyle">@style/Session.AlertDialog.PositiveButtonStyle</item>
|
||||
<style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
|
||||
<item name="buttonBarNegativeButtonStyle">@style/Widget.Session.AlertDialog.NegativeButtonStyle</item>
|
||||
<item name="buttonBarPositiveButtonStyle">@style/Widget.Session.AlertDialog.PositiveButtonStyle</item>
|
||||
</style>
|
||||
|
||||
<style name="SessionBottomSheetDialogTheme" parent="Theme.Design.Light.BottomSheetDialog">
|
||||
<item name="bottomSheetStyle">@style/SessionBottomSheetStyle</item>
|
||||
<style name="Widget.Session.BottomSheetDialog" parent="Widget.Design.BottomSheet.Modal">
|
||||
<item name="android:background">@drawable/default_bottom_sheet_background</item>
|
||||
</style>
|
||||
|
||||
<style name="SessionBottomSheetStyle" parent="Widget.Design.BottomSheet.Modal">
|
||||
<item name="android:background">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.AlertDialog.NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
|
||||
<style name="Widget.Session.AlertDialog.NegativeButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
|
||||
<item name="android:textColor">@color/accent</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.AlertDialog.PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
|
||||
<style name="Widget.Session.AlertDialog.PositiveButtonStyle" parent="Widget.AppCompat.Button.ButtonBar.AlertDialog">
|
||||
<item name="android:textColor">@color/accent</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.DarkTabLayout" parent="Widget.Design.TabLayout">
|
||||
<item name="tabIndicatorColor">@color/accent</item>
|
||||
<style name="Widget.Session.AppBarLayout" parent="@style/Widget.Design.AppBarLayout">
|
||||
|
||||
</style>
|
||||
|
||||
<style name="Widget.Session.TabBar" parent="Widget.AppCompat.ActionBar.TabBar">
|
||||
<item name="elevation">1dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Session.TabLayout" parent="Widget.Design.TabLayout">
|
||||
<item name="elevation">1dp</item>
|
||||
<item name="tabIndicatorColor">?colorAccent</item>
|
||||
<item name="tabSelectedTextColor">?colorAccent</item>>
|
||||
<item name="tabIndicatorHeight">@dimen/accent_line_thickness</item>
|
||||
<item name="tabBackground">@color/action_bar_background</item>
|
||||
<item name="tabRippleColor">@color/cell_selected</item>
|
||||
<item name="tabTextAppearance">@style/Session.DarkTabLayout.TextAppearance</item>
|
||||
<item name="tabSelectedTextColor">@color/text</item>
|
||||
<item name="tabTextAppearance">@style/TextAppearance.Session.Tab</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.DarkTabLayout.TextAppearance" parent="TextAppearance.Design.Tab">
|
||||
<style name="TextAppearance.Session.Tab" parent="TextAppearance.Design.Tab">
|
||||
<item name="android:textSize">@dimen/medium_font_size</item>
|
||||
<item name="android:textColor">@color/unimportant</item>"
|
||||
<item name="textAllCaps">false</item>
|
||||
</style>
|
||||
|
||||
<style name="MediumProminentFilledButton">
|
||||
<item name="android:background">@drawable/prominent_filled_button_medium_background</item>
|
||||
<!-- TODO These button styles require proper background selectors for up/down visual state. -->
|
||||
<style name="Widget.Session.Button.Common" parent="">
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textSize">@dimen/medium_font_size</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<!-- Helps to get rid of nasty elevation. We want a flat style here. -->
|
||||
<!-- https://stackoverflow.com/a/31003693/3802890 -->
|
||||
<item name ="android:stateListAnimator">@null</item>
|
||||
</style>
|
||||
|
||||
<style name="MediumProminentOutlineButton">
|
||||
<style name="Widget.Session.Button.Common.ProminentFilled">
|
||||
<item name="android:background">@drawable/prominent_filled_button_medium_background</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Session.Button.Common.ProminentOutline">
|
||||
<item name="android:background">@drawable/prominent_outline_button_medium_background</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textSize">@dimen/medium_font_size</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textColor">@color/accent</item>
|
||||
</style>
|
||||
|
||||
<style name="MediumUnimportantFilledButton">
|
||||
<style name="Widget.Session.Button.Common.UnimportantFilled">
|
||||
<item name="android:background">@drawable/unimportant_filled_button_medium_background</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textSize">@dimen/medium_font_size</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="MediumUnimportantOutlineButton">
|
||||
<style name="Widget.Session.Button.Common.UnimportantOutline">
|
||||
<item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textSize">@dimen/medium_font_size</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="UnimportantDialogButton">
|
||||
<style name="Widget.Session.Button.Dialog" parent="">
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textSize">@dimen/small_font_size</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Session.Button.Dialog.Unimportant">
|
||||
<item name="android:background">@drawable/unimportant_dialog_button_background</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textSize">@dimen/small_font_size</item>
|
||||
<item name="android:textColor">@color/text</item>
|
||||
</style>
|
||||
|
||||
<style name="ProminentDialogButton">
|
||||
<style name="Widget.Session.Button.Dialog.Prominent">
|
||||
<item name="android:background">@drawable/prominent_dialog_button_background</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textSize">@dimen/small_font_size</item>
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<item name="android:textColor">#222</item>
|
||||
</style>
|
||||
|
||||
<style name="DestructiveDialogButton">
|
||||
<style name="Widget.Session.Button.Dialog.Destructive">
|
||||
<item name="android:background">@drawable/destructive_dialog_button_background</item>
|
||||
<item name="android:textAllCaps">false</item>
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="Widget.Session.EditText.Compose" parent="@style/Signal.Text.Body">
|
||||
<item name="android:padding">2dp</item>
|
||||
<item name="android:background">@null</item>
|
||||
<item name="android:maxLines">4</item>
|
||||
<item name="android:maxLength">65536</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:capitalize">sentences</item>
|
||||
<item name="android:autoText">true</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:imeOptions">flagNoEnterAction</item>
|
||||
<item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
|
||||
<item name="android:contentDescription">@string/conversation_activity__compose_description</item>
|
||||
<item name="android:textColorHint">?android:textColorHint</item>
|
||||
<item name="android:textSize">@dimen/small_font_size</item>
|
||||
<item name="android:textCursorDrawable">@drawable/session_edit_text_cursor</item>
|
||||
<item name="android:textAlignment">viewStart</item>
|
||||
</style>
|
||||
|
||||
<style name="ThemeOverlay.Session.Settings" parent="PreferenceThemeOverlay.v14.Material" >
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<item name="android:textColorSecondary">#99FFFFFF</item>
|
||||
<item name="android:textSize">@dimen/medium_font_size</item>
|
||||
</style>
|
||||
|
||||
<style name="SessionIDTextView">
|
||||
@@ -168,34 +171,23 @@
|
||||
<item name="android:maxLines">1</item>
|
||||
</style>
|
||||
|
||||
<style name="FakeChatViewIncomingMessageBubble">
|
||||
<style name="FakeChatViewMessageBubble">
|
||||
<item name="android:paddingLeft">@dimen/medium_spacing</item>
|
||||
<item name="android:paddingTop">12dp</item>
|
||||
<item name="android:paddingRight">@dimen/medium_spacing</item>
|
||||
<item name="android:paddingBottom">12dp</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:elevation">0dp</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="FakeChatViewMessageBubble.Incoming">
|
||||
<item name="android:background">@drawable/fake_chat_view_incoming_message_background</item>
|
||||
<item name="android:paddingLeft">@dimen/medium_spacing</item>
|
||||
<item name="android:paddingTop">12dp</item>
|
||||
<item name="android:paddingRight">@dimen/medium_spacing</item>
|
||||
<item name="android:paddingBottom">12dp</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textColor">@color/fake_chat_bubble_text</item>
|
||||
<item name="android:elevation">20dp</item>
|
||||
</style>
|
||||
|
||||
<style name="FakeChatViewOutgoingMessageBubble">
|
||||
<style name="FakeChatViewMessageBubble.Outgoing">
|
||||
<item name="android:background">@drawable/fake_chat_view_outgoing_message_background</item>
|
||||
<item name="android:paddingLeft">@dimen/medium_spacing</item>
|
||||
<item name="android:paddingTop">12dp</item>
|
||||
<item name="android:paddingRight">@dimen/medium_spacing</item>
|
||||
<item name="android:paddingBottom">12dp</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<item name="android:elevation">20dp</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.SettingsTheme" parent="PreferenceThemeOverlay.v14.Material" >
|
||||
<item name="android:textColor">@color/text</item>
|
||||
<item name="android:textColorSecondary">#99FFFFFF</item>
|
||||
<item name="android:textSize">@dimen/medium_font_size</item>
|
||||
</style>
|
||||
<!-- Session -->
|
||||
|
||||
@@ -242,7 +234,7 @@
|
||||
parent="@style/Widget.AppCompat.ActionBar">
|
||||
<item name="background">@color/core_grey_90</item>
|
||||
<item name="android:popupTheme" tools:ignore="NewApi">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="elevation">4dp</item>
|
||||
<item name="elevation">1dp</item>
|
||||
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
|
||||
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
|
||||
@@ -252,7 +244,7 @@
|
||||
<style name="TextSecure.LightActionBar"
|
||||
parent="@style/Widget.AppCompat.ActionBar">
|
||||
<item name="background">@color/textsecure_primary</item>
|
||||
<item name="elevation">4dp</item>
|
||||
<item name="elevation">1dp</item>
|
||||
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
|
||||
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
|
||||
@@ -296,13 +288,12 @@
|
||||
<item name="android:textColor">#BFffffff</item>
|
||||
</style>
|
||||
|
||||
<style name="NotificationText">
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<style name="NotificationText" parent="android:TextAppearance.StatusBar.EventContent">
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="NotificationTitle">
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
<style name="NotificationTitle" parent="android:TextAppearance.StatusBar.EventContent.Title">
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
|
||||
<style name="Registration.Description" parent="@android:style/TextAppearance">
|
||||
@@ -350,7 +341,7 @@
|
||||
|
||||
<!-- For Holo Light Dialog Activity Styling Emulation -->
|
||||
|
||||
<style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.ProgressBar.Horizontal">
|
||||
<style name="Widget.ProgressBar.Horizontal" parent="@android:style/Widget.Holo.ProgressBar.Horizontal">
|
||||
</style>
|
||||
|
||||
<style name="MaterialButton">
|
||||
@@ -368,22 +359,8 @@
|
||||
<item name="android:background">@drawable/error_round</item>
|
||||
</style>
|
||||
|
||||
<style name="ComposeEditText" parent="@style/Signal.Text.Body">
|
||||
<item name="android:padding">2dp</item>
|
||||
<item name="android:background">@null</item>
|
||||
<item name="android:maxLines">4</item>
|
||||
<item name="android:maxLength">65536</item>
|
||||
<item name="android:textColor">?conversation_item_sent_text_primary_color</item>
|
||||
<item name="android:capitalize">sentences</item>
|
||||
<item name="android:autoText">true</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:imeOptions">flagNoEnterAction</item>
|
||||
<item name="android:inputType">textAutoCorrect|textCapSentences|textMultiLine</item>
|
||||
<item name="android:contentDescription">@string/conversation_activity__compose_description</item>
|
||||
</style>
|
||||
|
||||
<style name="AttachmentTypeLabel">
|
||||
<item name="android:textColor">#99FFFFFF</item>
|
||||
<item name="android:textColor">?android:textColorTertiary</item>
|
||||
<item name="android:textSize">@dimen/small_font_size</item>
|
||||
</style>
|
||||
|
||||
@@ -440,15 +417,20 @@
|
||||
<item name="colorControlActivated">@color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionItem">
|
||||
<item name="android:textSize">@dimen/text_size</item>
|
||||
<item name="android:drawablePadding">@dimen/drawable_padding</item>
|
||||
<style name="BottomSheetActionItem">
|
||||
<item name="android:layout_width">match_parent</item>
|
||||
<item name="android:layout_height">@dimen/action_item_height</item>
|
||||
<item name="android:textSize">@dimen/medium_font_size</item>
|
||||
<item name="android:drawablePadding">@dimen/drawable_padding</item>
|
||||
<item name="android:padding">@dimen/normal_padding</item>
|
||||
<item name="android:gravity">center_vertical</item>
|
||||
<item name="android:selectable">true</item>
|
||||
<item name="android:foreground">?attr/selectableItemBackground</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>
|
||||
|
||||
</resources>
|
||||
|
||||
@@ -3,104 +3,160 @@
|
||||
<resources>
|
||||
|
||||
<!-- Session -->
|
||||
<style name="Session.DarkTheme" parent="@style/Theme.AppCompat">
|
||||
<item name="actionBarStyle">@style/Session.DarkActionBar</item>
|
||||
|
||||
<!-- Due to historical reasons the base theme is dark and the light one
|
||||
is implemented using "notnight" type of resources. -->
|
||||
<style name="Base.Theme.Session" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
|
||||
<item name="colorPrimary">@color/action_bar_background</item>
|
||||
<item name="colorPrimaryDark">@color/action_bar_background</item>
|
||||
<item name="android:navigationBarColor">@color/navigation_bar_background</item>
|
||||
<item name="alertDialogTheme">@style/Session.AlertDialog</item>
|
||||
<item name="android:windowBackground">@drawable/default_session_background</item>
|
||||
<item name="preferenceTheme">@style/Session.SettingsTheme</item>
|
||||
<item name="colorAccent">@color/accent</item>
|
||||
<item name="actionModeBackground">@color/compose_view_background</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
<style name="Session.DarkTheme.NoActionBar" parent="@style/Theme.AppCompat.NoActionBar">
|
||||
<item name="actionBarStyle">@style/Session.DarkActionBar</item>
|
||||
<item name="colorPrimary">@color/action_bar_background</item>
|
||||
<item name="colorPrimaryDark">@color/action_bar_background</item>
|
||||
<item name="android:navigationBarColor">@color/navigation_bar_background</item>
|
||||
<item name="alertDialogTheme">@style/Session.AlertDialog</item>
|
||||
<item name="colorControlNormal">?android:textColorPrimary</item>
|
||||
<item name="colorControlActivated">?colorAccent</item>
|
||||
<item name="colorControlHighlight">?colorAccent</item>
|
||||
<item name="android:textColorPrimary">@color/text</item>
|
||||
<item name="android:textColorSecondary">?android:textColorPrimary</item>
|
||||
<item name="android:textColorTertiary">@color/unimportant</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:textColorHint">@color/gray27</item>
|
||||
<item name="android:windowBackground">@drawable/default_session_background</item>
|
||||
<item name="preferenceTheme">@style/Session.SettingsTheme</item>
|
||||
<item name="colorAccent">@color/accent</item>
|
||||
<item name="actionModeBackground">@color/compose_view_background</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
|
||||
<item name="emoji_tab_strip_background">@color/compose_view_background</item>
|
||||
<item name="emoji_tab_indicator">@color/accent</item>
|
||||
<item name="emoji_tab_underline">@color/gray78</item>
|
||||
<item name="emoji_tab_seperator">@color/gray70</item>
|
||||
<item name="emoji_drawer_background">@color/compose_text_view_background</item>
|
||||
<item name="emoji_text_color">@color/white</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>
|
||||
</style>
|
||||
|
||||
<style name="Session.DarkTheme.SubtitleActionBar" parent="@style/Theme.AppCompat">
|
||||
<item name="actionBarStyle">@style/Session.DarkSubtitleActionBar</item>
|
||||
<item name="colorPrimary">@color/action_bar_background</item>
|
||||
<item name="colorPrimaryDark">@color/action_bar_background</item>
|
||||
<item name="android:navigationBarColor">@color/navigation_bar_background</item>
|
||||
<item name="alertDialogTheme">@style/Session.AlertDialog</item>
|
||||
<item name="android:windowBackground">@drawable/default_session_background</item>
|
||||
<item name="preferenceTheme">@style/Session.SettingsTheme</item>
|
||||
<item name="colorAccent">@color/accent</item>
|
||||
<item name="actionModeBackground">@color/compose_view_background</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
<!-- Session -->
|
||||
|
||||
<style name="TextSecure.LightNoActionBar" parent="@style/TextSecure.LightTheme">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
|
||||
<item name="theme_type">light</item>
|
||||
<item name="colorPrimary">@color/action_bar_background</item>
|
||||
<item name="colorPrimaryDark">@color/action_bar_background</item>
|
||||
<item name="colorAccent">@color/textsecure_primary_dark</item>
|
||||
<item name="android:colorBackground">@color/default_background_start</item>
|
||||
<item name="android:navigationBarColor">@color/compose_view_background</item>
|
||||
|
||||
<item name="recipient_preference_blocked">#d00000</item>
|
||||
<item name="contact_selection_label_text">#66000000</item>
|
||||
<item name="contact_selection_push_user">#ff000000</item>
|
||||
<item name="contact_selection_lay_user">#a0000000</item>
|
||||
<item name="contact_selection_header_text">@color/textsecure_primary_dark</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.DayNight.ActionBar</item>
|
||||
<item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
|
||||
|
||||
<item name="media_overview_toolbar_background">@color/white</item>
|
||||
<item name="media_overview_toolbar_foreground">@color/gray70</item>
|
||||
<item name="alertDialogTheme">@style/ThemeOverlay.Session.AlertDialog</item>
|
||||
<item name="bottomSheetDialogTheme">@style/Theme.Session.BottomSheet</item>
|
||||
<item name="preferenceTheme">@style/ThemeOverlay.Session.Settings</item>
|
||||
<item name="appBarLayoutStyle">@style/Widget.Session.AppBarLayout</item>
|
||||
<item name="actionBarTabBarStyle">@style/Widget.Session.TabBar</item>
|
||||
|
||||
<item name="statusBarBackground">@color/accent</item>
|
||||
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_baseline_clear_24</item>
|
||||
<item name="actionModeBackground">@color/compose_view_background</item>
|
||||
|
||||
<item name="dividerVertical">@color/separator</item>
|
||||
<item name="dividerHorizontal">?dividerVertical</item>
|
||||
|
||||
<!-- App specific attributes -->
|
||||
<item name="search_toolbar_background">@color/black</item>
|
||||
<item name="search_background">@color/black</item>
|
||||
|
||||
<item name="dialog_background_color">@color/dialog_background</item>
|
||||
|
||||
<item name="media_overview_toolbar_background">@color/transparent</item>
|
||||
<item name="media_overview_toolbar_foreground">@color/white</item>
|
||||
<item name="media_overview_header_foreground">@color/text</item>
|
||||
<item name="media_overview_document_primary">@color/core_grey_90</item>
|
||||
<item name="media_overview_document_primary">@color/core_grey_05</item>
|
||||
<item name="media_overview_document_secondary">#99FFFFFF</item>
|
||||
<item name="media_keyboard_button_color">@color/core_grey_25</item>
|
||||
<item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
|
||||
|
||||
<item name="attachment_type_selector_background">?android:windowBackground</item>
|
||||
<item name="attachment_type_selector_hide_button_background">@color/gray50</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="attachment_document_extension_text_color">#222</item>
|
||||
|
||||
<item name="home_gradient_start">#00000000</item>
|
||||
<item name="home_gradient_end">#FF000000</item>
|
||||
|
||||
<item name="message_received_background_color">#222325</item>
|
||||
<item name="message_sent_background_color">#3F4146</item>
|
||||
|
||||
<item name="menu_accept_icon">@drawable/ic_baseline_done_24</item>
|
||||
<item name="menu_trash_icon">@drawable/ic_baseline_delete_24</item>
|
||||
<item name="menu_block_icon">@drawable/ic_baseline_block_24</item>
|
||||
<item name="menu_forward_icon">@drawable/ic_baseline_forward_24</item>
|
||||
<item name="menu_save_icon">@drawable/ic_baseline_save_24</item>
|
||||
<item name="menu_photo_library_icon">@drawable/ic_baseline_photo_library_24</item>
|
||||
<item name="menu_delete_icon">@drawable/ic_baseline_delete_24</item>
|
||||
<item name="menu_copy_icon">@drawable/ic_baseline_file_copy_24</item>
|
||||
<item name="menu_reply_icon">@drawable/ic_baseline_reply_24</item>
|
||||
<item name="menu_selectall_icon">@drawable/ic_baseline_select_all_24</item>
|
||||
<item name="menu_split_icon">@drawable/ic_baseline_call_split_24</item>
|
||||
<item name="menu_popup_expand">@drawable/ic_baseline_launch_24</item>
|
||||
|
||||
<item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_24</item>
|
||||
<item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_24</item>
|
||||
<item name="conversation_keyboard_toggle">@drawable/ic_baseline_keyboard_24</item>
|
||||
<item name="conversation_input_background">@drawable/compose_background_dark</item>
|
||||
|
||||
<item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkNoActionBar" parent="@style/TextSecure.BaseDarkNoActionBar">
|
||||
<!-- This should be the default theme for the application. -->
|
||||
<style name="Theme.Session.DayNight" parent="Base.Theme.Session">
|
||||
<!-- leave empty to allow overriding -->
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.BaseDarkNoActionBar" parent="@style/TextSecure.BaseDarkTheme">
|
||||
<style name="Theme.Session.DayNight.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Session.DayNight.FlatActionBar">
|
||||
<item name="actionBarStyle">@style/Widget.Session.ActionBar.Flat</item>
|
||||
</style>
|
||||
|
||||
<!--
|
||||
This is a temporary theme that is used by any activity
|
||||
which doesn't have support for light theme
|
||||
(like some old Signal screens or third-party libs with white only icons)
|
||||
-->
|
||||
<!-- TODO Refactor this to use color resources -->
|
||||
<style name="Base.Theme.Session.ForceDark" parent="Theme.Session.DayNight">
|
||||
<item name="colorPrimary">#171717</item>
|
||||
<item name="android:textColorPrimary">#FFFFFF</item>
|
||||
<item name="android:textColorSecondary">#DFFFFFFF</item>
|
||||
<item name="android:textColorTertiary">#90FFFFFF</item>
|
||||
<item name="colorControlNormal">?android:textColorPrimary</item>
|
||||
<item name="android:colorBackground">#121212</item>
|
||||
<item name="android:windowBackground">?android:colorBackground</item>
|
||||
<item name="android:navigationBarColor">?android:colorBackground</item>
|
||||
<item name="android:statusBarColor">@color/transparent</item>
|
||||
|
||||
<item name="theme_type">dark</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
|
||||
<item name="actionBarStyle">@style/Widget.AppCompat.ActionBar</item>
|
||||
|
||||
<item name="conversation_emoji_toggle">@drawable/ic_emoji_filled_keyboard_24</item>
|
||||
<item name="conversation_sticker_toggle">@drawable/ic_sticker_filled_keyboard_24</item>
|
||||
<item name="conversation_keyboard_toggle">@drawable/ic_baseline_keyboard_24</item>
|
||||
<item name="conversation_input_background">@drawable/compose_background_dark</item>
|
||||
</style>
|
||||
<style name="Theme.Session.ForceDark" parent="Base.Theme.Session.ForceDark">
|
||||
<!-- leave empty to allow overriding -->
|
||||
</style>
|
||||
<style name="Theme.Session.ForceDark.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Session.BottomSheet" parent="@style/Theme.AppCompat.DayNight.Dialog">
|
||||
<item name="android:windowBackground">@android:color/transparent</item>
|
||||
<item name="android:windowAnimationStyle">@style/Animation.MaterialComponents.BottomSheetDialog</item>
|
||||
<item name="bottomSheetStyle">@style/Widget.Session.BottomSheetDialog</item>
|
||||
</style>
|
||||
|
||||
<!-- Session -->
|
||||
|
||||
|
||||
|
||||
<!-- Original Signal dark theme -->
|
||||
<style name="Base.Theme.TextSecure" parent="@style/Theme.Session.DayNight">
|
||||
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
|
||||
<item name="colorPrimary">@color/action_bar_background</item>
|
||||
<item name="colorPrimaryDark">@color/action_bar_background</item>
|
||||
<item name="colorAccent">@color/signal_primary_dark</item>
|
||||
<item name="android:navigationBarColor">@color/compose_view_background</item>
|
||||
|
||||
<item name="recipient_preference_blocked">#d00000</item>
|
||||
<item name="contact_selection_label_text">#66eeeeee</item>
|
||||
@@ -111,285 +167,11 @@
|
||||
<item name="media_overview_toolbar_background">@color/transparent</item>
|
||||
<item name="media_overview_toolbar_foreground">@color/white</item>
|
||||
<item name="media_overview_header_foreground">@color/text</item>
|
||||
<item name="media_overview_document_primary">@color/core_grey_05</item>
|
||||
<item name="media_overview_document_secondary">#99FFFFFF</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.HighlightTheme" parent="@style/TextSecure.LightTheme">
|
||||
<item name="actionBarStyle">@style/TextSecure.FlatLightActionBar</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="android:windowBackground">@color/signal_primary</item>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="colorButtonNormal">@color/white</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.LightIntroTheme" parent="@style/Theme.AppCompat.Light">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="colorAccent">@color/signal_primary</item>
|
||||
|
||||
<item name="android:textColorHint">#cc000000</item>
|
||||
<item name="centered_app_title_color">#55000000</item>
|
||||
<item name="ic_arrow_forward">@drawable/ic_arrow_forward_light</item>
|
||||
<item name="lockscreen_watermark">@drawable/lockscreen_watermark_light</item>
|
||||
<item name="android:windowBackground">@color/white</item>
|
||||
<item name="ic_visibility">@drawable/ic_visibility_grey600_24dp</item>
|
||||
<item name="ic_visibility_off">@drawable/ic_visibility_off_grey600_24dp</item>
|
||||
|
||||
<item name="login_top_background">@color/signal_primary</item>
|
||||
<item name="login_floating_background">@drawable/rounded_rectangle_dark</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkIntroTheme" parent="@style/Theme.AppCompat">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
<item name="colorAccent">@color/signal_primary_dark</item>
|
||||
|
||||
<item name="android:textColorHint">@color/white</item>
|
||||
<item name="centered_app_title_color">@color/gray27</item>
|
||||
<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/core_grey_95</item>
|
||||
<item name="ic_visibility">@drawable/ic_visibility_white_24dp</item>
|
||||
<item name="ic_visibility_off">@drawable/ic_visibility_off_white_24dp</item>
|
||||
|
||||
<item name="login_top_background">@color/black</item>
|
||||
<item name="login_floating_background">@drawable/rounded_rectangle_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="PopupAnimation" parent="@android:style/Animation">
|
||||
<item name="android:windowEnterAnimation">@anim/slide_from_top</item>
|
||||
<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>
|
||||
<item name="android:windowContentOverlay">@null</item>
|
||||
<item name="android:windowActionModeOverlay">true</item>
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
<item name="android:windowFrame">@null</item>
|
||||
<item name="android:windowAnimationStyle">@style/PopupAnimation</item>
|
||||
<item name="android:windowCloseOnTouchOutside">true</item>
|
||||
<item name="android:backgroundDimEnabled">false</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.LightTheme" parent="@style/Theme.AppCompat.Light.DarkActionBar">
|
||||
<item name="theme_type">light</item>
|
||||
<item name="actionBarStyle">@style/Session.DarkActionBar</item>
|
||||
<item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
|
||||
<item name="actionBarTabBarStyle">@style/TextSecure.LightActionBar.TabBar</item>
|
||||
<item name="actionModeBackground">@color/compose_view_background</item>
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
|
||||
<item name="colorPrimary">@color/action_bar_background</item>
|
||||
<item name="colorPrimaryDark">@color/action_bar_background</item>
|
||||
<item name="colorAccent">@color/accent</item>
|
||||
<item name="colorControlActivated">@color/accent</item>
|
||||
<item name="colorControlNormal">@color/text</item>
|
||||
<item name="colorControlHighlight">@color/accent</item>
|
||||
<item name="android:windowBackground">@color/loki_darkest_gray</item>
|
||||
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyleLight</item>
|
||||
<item name="android:alertDialogTheme">@style/AppCompatDialogStyleLight</item>
|
||||
<item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.Light.BottomSheetDialog</item>
|
||||
<item name="android:navigationBarColor">@color/compose_view_background</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="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>
|
||||
<item name="conversation_list_item_delivery_icon_color">@color/core_grey_60</item>
|
||||
<item name="conversation_list_item_date_color">@color/core_grey_60</item>
|
||||
<item name="conversation_list_item_unread_color">@color/core_black</item>
|
||||
<item name="conversation_list_item_unread_background">@drawable/unread_count_background_light</item>
|
||||
<item name="conversation_list_item_divider">@drawable/conversation_list_divider_shape</item>
|
||||
<item name="conversation_list_toolbar_background">@color/core_blue</item>
|
||||
<item name="conversation_list_typing_tint">@color/core_grey_60</item>
|
||||
|
||||
<item name="fab_color">@color/textsecure_primary</item>
|
||||
<item name="lower_right_divet">@drawable/divet_lower_right_dark</item>
|
||||
|
||||
<item name="conversation_group_member_name">#99000000</item>
|
||||
|
||||
<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">@drawable/compose_background_light</item>
|
||||
<item name="conversation_input_inline_attach_icon_tint">@color/core_grey_60</item>
|
||||
<item name="conversation_transport_sms_indicator">@drawable/ic_arrow_up</item>
|
||||
<item name="conversation_transport_push_indicator">@drawable/ic_arrow_up</item>
|
||||
<item name="conversation_transport_popup_background">@color/white</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>
|
||||
<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">@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/cell_background</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/compose_view_background</item>
|
||||
<item name="emoji_text_color">@color/black</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/sent_message_background</item>
|
||||
<item name="conversation_item_sent_text_primary_color">@color/core_grey_90</item>
|
||||
<item name="conversation_item_sent_text_secondary_color">@color/core_grey_60</item>
|
||||
<item name="conversation_item_sent_icon_color">@color/core_grey_60</item>
|
||||
<item name="conversation_item_sent_download_icon_color">@color/core_grey_60</item>
|
||||
<item name="conversation_item_sent_text_indicator_tab_color">#99000000</item>
|
||||
<item name="conversation_item_received_text_primary_color">@color/text</item>
|
||||
<item name="conversation_item_received_text_secondary_color">@color/text</item>
|
||||
<item name="conversation_item_update_text_color">@color/core_grey_60</item>
|
||||
<item name="conversation_item_last_seen_text_color">@color/core_grey_90</item>
|
||||
<item name="conversation_item_last_seen_line_color">@color/core_grey_60</item>
|
||||
<item name="conversation_item_date_line_color">@color/core_grey_25</item>
|
||||
<item name="conversation_item_quote_text_color">@color/core_grey_90</item>
|
||||
<item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_light</item>
|
||||
<item name="conversation_item_sticky_date_text_color">@color/core_grey_60</item>
|
||||
<item name="conversation_item_image_outline_color">@color/transparent_black_30</item>
|
||||
|
||||
<item name="quick_camera_icon">@drawable/quick_camera_light</item>
|
||||
<item name="quick_mic_icon">@drawable/ic_mic_grey600_24dp</item>
|
||||
|
||||
<item name="conversation_item_sent_indicator_text_background">@drawable/conversation_item_sent_indicator_text_shape</item>
|
||||
|
||||
<item name="dialog_info_icon">@drawable/ic_info_outline_light</item>
|
||||
<item name="dialog_alert_icon">@drawable/ic_warning_light</item>
|
||||
<item name="dialog_background_color">@color/background_material_light</item>
|
||||
|
||||
<item name="device_link_item_card_background">@color/device_link_item_background_light</item>
|
||||
|
||||
<item name="mediapicker_image_outline">@drawable/mediapicker_item_border_light</item>
|
||||
|
||||
<item name="import_export_item_background_color">@color/import_export_item_background_light</item>
|
||||
<item name="import_export_item_background_shadow_color">@color/import_export_item_background_shadow_light</item>
|
||||
<item name="import_export_item_card_background">@drawable/clickable_card_light</item>
|
||||
|
||||
<item name="linkpreview_background_color">@color/core_white</item>
|
||||
<item name="linkpreview_primary_text_color">@color/core_black</item>
|
||||
<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>
|
||||
<item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
|
||||
<item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
|
||||
<item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
|
||||
<item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
|
||||
<item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
|
||||
<item name="menu_trash_icon">@drawable/ic_delete_white_24dp</item>
|
||||
<item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
|
||||
<item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
|
||||
<item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
|
||||
<item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
|
||||
<item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
|
||||
<item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
|
||||
<item name="menu_forward_icon">@drawable/ic_forward_white_24dp</item>
|
||||
<item name="menu_save_icon">@drawable/ic_save_white_24dp</item>
|
||||
<item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
|
||||
|
||||
<item name="conversation_icon_attach_audio">@drawable/ic_audio_light</item>
|
||||
<item name="conversation_icon_attach_video">@drawable/ic_video_light</item>
|
||||
|
||||
<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>
|
||||
|
||||
<item name="quote_missing_icon_color">@color/core_grey_60</item>
|
||||
|
||||
<item name="group_members_dialog_icon">@drawable/ic_group_grey600_24dp</item>
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.Fix</item>
|
||||
|
||||
<item name="search_toolbar_background">@color/white</item>
|
||||
<item name="search_background">@color/white</item>
|
||||
<item name="invite_background">@color/signal_primary</item>
|
||||
|
||||
<item name="shared_contact_details_header_background">@color/grey_100</item>
|
||||
<item name="shared_contact_details_titlebar">@color/grey_400</item>
|
||||
<item name="shared_contact_item_button_color">@color/core_grey_02</item>
|
||||
<item name="android:statusBarColor">@color/action_bar_background</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkTheme" parent="@style/TextSecure.BaseDarkTheme">
|
||||
<!-- leave empty to allow overriding -->
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.BaseDarkTheme" parent="@style/Theme.AppCompat">
|
||||
<item name="theme_type">dark</item>
|
||||
<item name="actionBarStyle">@style/Session.DarkActionBar</item>
|
||||
<item name="searchViewStyle">@style/TextSecure.BaseDarkTheme.SearchView</item>
|
||||
<item name="actionBarTabBarStyle">@style/TextSecure.DarkActionBar.TabBar</item>
|
||||
<item name="actionBarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="actionModeBackground">@color/compose_view_background</item>
|
||||
<item name="actionModeCloseDrawable">@drawable/ic_close_white_24dp</item>
|
||||
<item name="android:textColor">@color/text_color_dark_theme</item>
|
||||
<item name="android:textColorSecondary">@color/text_color_secondary_dark_theme</item>
|
||||
<item name="colorAccent">@color/accent</item>
|
||||
<item name="colorControlActivated">@color/accent</item>
|
||||
<item name="colorControlNormal">@color/text</item>
|
||||
<item name="colorControlHighlight">@color/accent</item>
|
||||
<item name="android:windowBackground">@color/loki_darkest_gray</item>
|
||||
<item name="alertDialogTheme">@style/AppCompatAlertDialogStyleDark</item>
|
||||
<item name="android:alertDialogTheme">@style/AppCompatDialogStyleDark</item>
|
||||
<item name="bottomSheetDialogTheme">@style/Theme.MaterialComponents.BottomSheetDialog</item>
|
||||
<item name="android:navigationBarColor">@color/compose_view_background</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>
|
||||
|
||||
@@ -408,7 +190,7 @@
|
||||
|
||||
<item name="conversation_group_member_name">#99ffffff</item>
|
||||
|
||||
<item name="conversation_item_bubble_background">@color/sent_message_background</item>
|
||||
<item name="conversation_item_bubble_background">?message_sent_background_color</item>
|
||||
<item name="conversation_item_sent_text_primary_color">@color/core_grey_05</item>
|
||||
<item name="conversation_item_sent_text_secondary_color">@color/core_grey_25</item>
|
||||
<item name="conversation_item_sent_icon_color">@color/core_grey_25</item>
|
||||
@@ -423,7 +205,7 @@
|
||||
<item name="conversation_item_date_line_color">@color/core_grey_45</item>
|
||||
<item name="conversation_item_quote_text_color">@color/core_grey_05</item>
|
||||
<item name="conversation_item_sticky_date_background">@drawable/sticky_date_header_background_dark</item>
|
||||
<item name="conversation_item_sticky_date_text_color">@color/core_grey_25</item>
|
||||
<item name="conversation_item_sticky_date_text_color">@color/core_grey_45</item>
|
||||
<item name="conversation_item_image_outline_color">@color/transparent_white_30</item>
|
||||
|
||||
<item name="contact_list_divider">@drawable/contact_list_divider_dark</item>
|
||||
@@ -432,7 +214,6 @@
|
||||
|
||||
<item name="dialog_info_icon">@drawable/ic_info_outline_dark</item>
|
||||
<item name="dialog_alert_icon">@drawable/ic_warning_dark</item>
|
||||
<item name="dialog_background_color">@color/background_material_dark</item>
|
||||
|
||||
<item name="device_link_item_card_background">@color/device_link_item_background_dark</item>
|
||||
|
||||
@@ -448,14 +229,10 @@
|
||||
<item name="conversation_background">@color/loki_darkest_gray</item>
|
||||
<item name="conversation_editor_background">#22ffffff</item>
|
||||
<item name="conversation_editor_text_color">#ffeeeeee</item>
|
||||
<item name="conversation_input_background">@drawable/compose_background_dark</item>
|
||||
<item name="conversation_input_inline_attach_icon_tint">@color/core_grey_05</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_sms_indicator">@drawable/ic_arrow_up_circle_24</item>
|
||||
<item name="conversation_transport_push_indicator">@drawable/ic_arrow_up_circle_24</item>
|
||||
<item name="conversation_transport_popup_background">@color/black</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>
|
||||
<item name="conversation_attach_video">@drawable/ic_movie_creation_dark</item>
|
||||
@@ -492,7 +269,7 @@
|
||||
<item name="linkpreview_secondary_text_color">@color/text</item>
|
||||
<item name="linkpreview_divider_color">@color/transparent</item>
|
||||
|
||||
<item name="quick_camera_icon">@drawable/quick_camera_dark</item>
|
||||
<!-- <item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>-->
|
||||
<item name="quick_mic_icon">@drawable/ic_mic_white_24dp</item>
|
||||
|
||||
<item name="media_keyboard_button_color">@color/core_grey_25</item>
|
||||
@@ -501,20 +278,12 @@
|
||||
<item name="menu_group_icon">@drawable/ic_group_white_24dp</item>
|
||||
<item name="menu_search_icon">@drawable/ic_search_white_24dp</item>
|
||||
<item name="menu_call_icon">@drawable/ic_call_white_24dp</item>
|
||||
<item name="menu_popup_expand">@drawable/ic_launch_white_24dp</item>
|
||||
<item name="menu_unlock_icon">@drawable/ic_unlocked_white_24dp</item>
|
||||
<item name="menu_lock_icon">@drawable/ic_lock_white_24dp</item>
|
||||
<item name="menu_lock_icon_small">@drawable/ic_lock_white_18dp</item>
|
||||
<item name="menu_trash_icon">@drawable/ic_delete_white_24dp</item>
|
||||
<item name="menu_selectall_icon">@drawable/ic_select_all_white_24dp</item>
|
||||
<item name="menu_split_icon">@drawable/ic_call_split_white_24dp</item>
|
||||
<item name="menu_accept_icon">@drawable/ic_check_white_24dp</item>
|
||||
<item name="menu_refresh_directory">@drawable/ic_refresh_white_24dp</item>
|
||||
<item name="menu_copy_icon">@drawable/ic_content_copy_white_24dp</item>
|
||||
<item name="menu_info_icon">@drawable/ic_info_outline_white_24dp</item>
|
||||
<item name="menu_forward_icon">@drawable/ic_forward_white_24dp</item>
|
||||
<item name="menu_save_icon">@drawable/ic_save_white_24dp</item>
|
||||
<item name="menu_reply_icon">@drawable/ic_reply_white_24dp</item>
|
||||
|
||||
<item name="conversation_icon_attach_audio">@drawable/ic_audio_dark</item>
|
||||
<item name="conversation_icon_attach_video">@drawable/ic_video_dark</item>
|
||||
@@ -548,23 +317,24 @@
|
||||
<item name="shared_contact_details_titlebar">@color/grey_900</item>
|
||||
<item name="shared_contact_item_button_color">@color/core_grey_85</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.TextSecure.DayNight" parent="Base.Theme.TextSecure">
|
||||
<!-- leave empty to allow overriding -->
|
||||
</style>
|
||||
|
||||
<style name="Theme.TextSecure.DayNight.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
<item name="windowActionModeOverlay">true</item>
|
||||
</style>
|
||||
|
||||
<style name="RationaleDialog" parent="Theme.AppCompat.Light.Dialog.Alert">
|
||||
<item name="android:windowBackground">@drawable/permission_rationale_dialog_corners</item>
|
||||
<style name="Theme.TextSecure.Dialog.Rationale" parent="Theme.AppCompat.DayNight.Dialog.Alert">
|
||||
<item name="android:windowBackground">@drawable/default_dialog_background</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.ScribbleTheme" parent="TextSecure.DarkNoActionBar">
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.MediaSendProgressDialog" parent="@android:style/Theme.Dialog">
|
||||
<item name="android:background">@color/dialog_background</item>
|
||||
<style name="Theme.TextSecure.Dialog.MediaSendProgress" parent="@android:style/Theme.Dialog">
|
||||
<item name="android:background">@drawable/default_dialog_background</item>
|
||||
<item name="android:windowNoTitle">true</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.LightRegistrationTheme" parent="TextSecure.LightNoActionBar">
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkRegistrationTheme" parent="TextSecure.DarkNoActionBar">
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user