mirror of
https://github.com/signalapp/Signal-Android.git
synced 2026-04-27 04:04:43 +01:00
Apply new Signal icons and color palette.
This commit is contained in:
alex-signal
committed by
Greyson Parrelli
Greyson Parrelli
parent
d698d3bd6f
commit
43954a176a
@@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<resources xmlns:tools="http://schemas.android.com/tools"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
<style name="NoAnimation.Theme.BlackScreen" parent="Theme.AppCompat.NoActionBar">
|
||||
<item name="android:windowAnimationStyle">@null</item>
|
||||
<item name="android:windowBackground">@android:color/black</item>
|
||||
@@ -41,41 +42,41 @@
|
||||
<!-- ActionBar styles -->
|
||||
<style name="TextSecure.DarkActionBar"
|
||||
parent="@style/Widget.AppCompat.ActionBar">
|
||||
<item name="background">@color/core_grey_90</item>
|
||||
<item name="background">?android:attr/windowBackground</item>
|
||||
<item name="android:popupTheme" tools:ignore="NewApi">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="elevation">4dp</item>
|
||||
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
|
||||
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
|
||||
<item name="android:textColorSecondary">@color/white</item>
|
||||
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle.Dark</item>
|
||||
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle.Dark</item>
|
||||
<item name="elevation">0dp</item>
|
||||
<item name="actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
|
||||
<item name="android:actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.LightActionBar"
|
||||
parent="@style/Widget.AppCompat.ActionBar">
|
||||
<item name="background">@color/textsecure_primary</item>
|
||||
<item name="elevation">4dp</item>
|
||||
<item name="background">@color/white</item>
|
||||
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle</item>
|
||||
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle</item>
|
||||
<item name="android:textColorPrimary">@color/white</item>
|
||||
<item name="android:textColorSecondary">@color/white</item>
|
||||
<item name="elevation">0dp</item>
|
||||
<item name="actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
|
||||
<item name="android:actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.LightActionBar.DarkText"
|
||||
parent="TextSecure.LightActionBar">
|
||||
<item name="android:textColorPrimary">@color/black</item>
|
||||
<item name="android:textColorSecondary">@color/black</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.FlatLightActionBar"
|
||||
parent="@style/TextSecure.LightActionBar">
|
||||
<style name="TextSecure.HighlightActionBar" parent="@style/TextSecure.DarkActionBar.Conversation">
|
||||
<item name="background">@color/signal_primary</item>
|
||||
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
|
||||
<item name="elevation">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkActionBar.TabBar"
|
||||
parent="@style/Widget.AppCompat.ActionBar.TabBar">
|
||||
<item name="background">@color/gray95</item>
|
||||
<item name="android:background">@color/gray95</item>
|
||||
<item name="background">@color/core_grey_95</item>
|
||||
<item name="android:background">@color/core_grey_95</item>
|
||||
<item name="elevation">4dp</item>
|
||||
</style>
|
||||
|
||||
@@ -88,15 +89,62 @@
|
||||
<item name="elevation">4dp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.Conversation.TabBar" parent="@style/Widget.AppCompat.ActionBar.TabBar">
|
||||
<item name="android:textColorPrimary">?conversation_title_color</item>
|
||||
<item name="android:textColorSecondary">?conversation_subtitle_color</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.DarkActionBar.Conversation">
|
||||
<item name="android:popupTheme" tools:ignore="NewApi">?conversation_popup_theme</item>
|
||||
<item name="popupTheme">?conversation_popup_theme</item>
|
||||
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle.Conversation</item>
|
||||
<item name="subtitleTextStyle">@style/TextSecure.SubtitleTextStyle.Conversation</item>
|
||||
<item name="actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow.Conversation</item>
|
||||
<item name="android:actionOverflowButtonStyle">@style/Signal.Toolbar.Overflow.Conversation</item>
|
||||
<item name="colorControlHighlight">@color/signal_primary_dark</item>
|
||||
<item name="android:colorControlHighlight" tools:ignore="NewApi">@color/signal_primary_dark</item>
|
||||
<item name="colorControlNormal">?conversation_subtitle_color</item>
|
||||
<item name="android:colorControlNormal" tools:ignore="NewApi">?conversation_subtitle_color</item>
|
||||
<item name="colorControlActivated">@color/signal_primary_dark</item>
|
||||
<item name="android:colorControlActivated" tools:ignore="NewApi">@color/signal_primary_dark</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.TitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
|
||||
<item name="android:textColor">?attr/title_text_color_primary</item>
|
||||
<item name="android:textColorHint">?attr/title_text_color_secondary</item>
|
||||
<item name="android:textSize">16sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.TitleTextStyle.Dark" parent="TextSecure.TitleTextStyle">
|
||||
<item name="android:textColor">@color/transparent_white_90</item>
|
||||
<item name="android:textColorHint">@color/transparent_white_60</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.TitleTextStyle.Light" parent="TextSecure.TitleTextStyle">
|
||||
<item name="android:textColor">@color/white</item>
|
||||
<item name="android:textColorHint">#BFffffff</item>
|
||||
<item name="android:textSize">18sp</item>
|
||||
<item name="android:textColorHint">@color/transparent_white_80</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.TitleTextStyle.Conversation" parent="TextSecure.TitleTextStyle">
|
||||
<item name="android:textColor">?conversation_title_color</item>
|
||||
<item name="android:textColorHint">?conversation_subtitle_color</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.SubtitleTextStyle" parent="TextAppearance.AppCompat.Widget.ActionBar.Subtitle">
|
||||
<item name="android:textColor">#BFffffff</item>
|
||||
<item name="android:textSize">13sp</item>
|
||||
<item name="android:textColor">?attr/title_text_color_secondary</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.SubtitleTextStyle.Dark" parent="TextSecure.SubtitleTextStyle">
|
||||
<item name="android:textColor">@color/transparent_white_60</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.SubtitleTextStyle.Light" parent="TextSecure.SubtitleTextStyle">
|
||||
<item name="android:textColor">@color/transparent_white_80</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.SubtitleTextStyle.Conversation" parent="TextSecure.TitleTextStyle">
|
||||
<item name="android:textColor">?conversation_subtitle_color</item>
|
||||
</style>
|
||||
|
||||
<style name="Registration.Description" parent="@android:style/TextAppearance">
|
||||
@@ -185,7 +233,7 @@
|
||||
<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">#ff999999</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
@@ -262,4 +310,34 @@
|
||||
<item name="android:textSize">40sp</item>
|
||||
</style>
|
||||
|
||||
<style name="Signal.SearchView" parent="Widget.AppCompat.SearchView">
|
||||
<item name="closeIcon">@drawable/ic_x_20</item>
|
||||
<item name="searchHintIcon">@drawable/ic_search_24</item>
|
||||
<item name="searchIcon">@drawable/ic_search_24</item>
|
||||
</style>
|
||||
|
||||
<style name="Signal.SearchView.Dark">
|
||||
<item name="closeIcon">@drawable/ic_x_dark_20</item>
|
||||
<item name="searchHintIcon">@drawable/ic_search_dark_24</item>
|
||||
<item name="searchIcon">@drawable/ic_search_dark_24</item>
|
||||
</style>
|
||||
|
||||
<style name="Signal.Toolbar.Overflow" parent="Widget.AppCompat.ActionButton.Overflow">
|
||||
<item name="srcCompat">@drawable/ic_more_vert_24</item>
|
||||
<item name="android:src">@null</item>
|
||||
<item name="android:tint">?icon_tint</item>
|
||||
</style>
|
||||
|
||||
<style name="Signal.Toolbar.Overflow.Conversation">
|
||||
<item name="android:tint">?conversation_subtitle_color</item>
|
||||
</style>
|
||||
|
||||
<style name="Signal.Toolbar.Navigation.Conversation" parent="Widget.AppCompat.Toolbar.Button.Navigation">
|
||||
<item name="android:tint">?conversation_subtitle_color</item>
|
||||
</style>
|
||||
|
||||
<style name="TextSecure.ActionModeStyle" parent="@style/Widget.AppCompat.ActionMode">
|
||||
<item name="titleTextStyle">@style/TextSecure.TitleTextStyle.Conversation</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user