fix: some compile issues for themes from merge
This commit is contained in:
0x330a
parent
50bc298490
commit
26211403b9
|
|
@ -10,6 +10,7 @@
|
|||
<string name="please_wait">Please wait…</string>
|
||||
<string name="save">Save</string>
|
||||
<string name="image">Image</string>
|
||||
<string name="video">Video</string>
|
||||
<string name="note_to_self">Note to Self</string>
|
||||
<string name="version_s">Version %s</string>
|
||||
<string name="expand">Expand</string>
|
||||
|
|
@ -909,6 +910,7 @@
|
|||
<string name="notify_type_mute">Mute</string>
|
||||
<string name="deleted_message">This message has been deleted</string>
|
||||
<string name="delete_message_for_me">Delete just for me</string>
|
||||
<string name="delete_message_for_my_devices">Delete from all my devices</string>
|
||||
<string name="delete_message_for_everyone">Delete for everyone</string>
|
||||
<string name="delete_message_for_me_and_recipient">Delete for me and %s</string>
|
||||
<string name="activity_settings_survey_feedback">Feedback/Survey</string>
|
||||
|
|
@ -1054,8 +1056,6 @@
|
|||
<string name="conversation_settings_leave_group">Leave Group</string>
|
||||
<string name="conversation_settings_group_members">Group Members</string>
|
||||
<string name="conversation_settings_delete_group">Delete Group</string>
|
||||
<string name="image">image</string>
|
||||
<string name="video">video</string>
|
||||
<string name="dialog_clear_all_messages_title">Clear All Messages</string>
|
||||
<string name="dialog_clear_all_media_title">Clear All Media</string>
|
||||
<string name="dialog_clear_all_messages_message">Are you sure you want to clear all group messages?</string>
|
||||
|
|
|
|||
|
|
@ -1,81 +1,6 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<style name="Base.Theme.Session" parent="@style/Theme.AppCompat.DayNight">
|
||||
|
||||
<!-- Main styles -->
|
||||
<item name="sessionLogoTint">@color/classic_dark_6</item>
|
||||
<item name="colorPrimary">@color/classic_dark_0</item>
|
||||
<item name="colorPrimaryDark">@color/classic_dark_0</item>
|
||||
<item name="colorControlNormal">?android:textColorPrimary</item>
|
||||
<item name="colorControlActivated">?colorAccent</item>
|
||||
<item name="android:colorControlHighlight">?colorAccent</item>
|
||||
<item name="android:textColorPrimary">@color/classic_dark_6</item>
|
||||
<item name="android:textColorSecondary">?android:textColorPrimary</item>
|
||||
<item name="android:textColorTertiary">@color/classic_dark_5</item>
|
||||
<item name="android:textColor">?android:textColorPrimary</item>
|
||||
<item name="android:textColorHint">@color/gray27</item>
|
||||
<item name="android:windowBackground">?colorPrimary</item>
|
||||
<item name="android:navigationBarColor">@color/compose_view_background</item>
|
||||
<item name="dialog_background_color">@color/classic_dark_1</item>
|
||||
<item name="bottomSheetDialogTheme">@style/Classic.Dark.BottomSheet</item>
|
||||
<item name="actionMenuTextColor">?android:textColorPrimary</item>
|
||||
<item name="popupTheme">?actionBarPopupTheme</item>
|
||||
<item name="colorCellBackground">@color/classic_dark_1</item>
|
||||
<item name="colorSettingsBackground">@color/classic_dark_1</item>
|
||||
<item name="colorDividerBackground">@color/classic_dark_3</item>
|
||||
<item name="colorCellRipple">@color/classic_dark_3</item>
|
||||
<item name="actionBarPopupTheme">@style/Dark.Popup</item>
|
||||
<item name="actionBarWidgetTheme">@null</item>
|
||||
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
|
||||
<item name="actionBarStyle">@style/Widget.Session.ActionBar</item>
|
||||
<item name="prominentButtonColor">?colorAccent</item>
|
||||
<item name="elementBorderColor">@color/classic_dark_3</item>
|
||||
|
||||
<!-- Home screen -->
|
||||
<item name="searchBackgroundColor">#1B1B1B</item>
|
||||
<item name="searchIconColor">#E5E5E8</item>
|
||||
<item name="searchHintColor">@color/classic_dark_5</item>
|
||||
<item name="searchTextColor">?android:textColorPrimary</item>
|
||||
<item name="searchHighlightTint">?colorAccent</item>
|
||||
<item name="home_gradient_start">#00000000</item>
|
||||
<item name="home_gradient_end">@color/classic_dark_1</item>
|
||||
<item name="conversation_pinned_background_color">?colorCellBackground</item>
|
||||
<item name="conversation_unread_background_color">@color/classic_dark_2</item>
|
||||
<item name="conversation_pinned_icon_color">@color/classic_dark_4</item>
|
||||
<item name="unreadIndicatorBackgroundColor">@color/classic_dark_3</item>
|
||||
<item name="unreadIndicatorTextColor">@color/classic_dark_0</item>
|
||||
|
||||
<!-- New conversation button -->
|
||||
<item name="conversation_color_non_main">@color/classic_dark_2</item>
|
||||
<item name="conversation_shadow_non_main">@color/transparent_black_30</item>
|
||||
<item name="conversation_shadow_main">?colorAccent</item>
|
||||
<item name="conversation_menu_background_color">@color/classic_dark_1</item>
|
||||
<item name="conversation_menu_cell_color">?conversation_menu_background_color</item>
|
||||
<item name="conversation_menu_border_color">@color/classic_dark_3</item>
|
||||
<item name="conversationMenuSearchBackgroundColor">@color/classic_dark_0</item>
|
||||
|
||||
<!-- Conversation -->
|
||||
<item name="message_received_background_color">@color/classic_dark_2</item>
|
||||
<item name="message_received_text_color">@color/classic_dark_6</item>
|
||||
<item name="message_sent_background_color">?colorAccent</item>
|
||||
<item name="message_sent_text_color">@color/classic_dark_0</item>
|
||||
<item name="input_bar_background">@color/classic_dark_1</item>
|
||||
<item name="input_bar_text_hint">@color/classic_dark_5</item>
|
||||
<item name="input_bar_text_user">@color/classic_dark_6</item>
|
||||
<item name="input_bar_border">@color/classic_dark_3</item>
|
||||
<item name="input_bar_button_background">@color/classic_dark_2</item>
|
||||
<item name="input_bar_button_text_color">@color/classic_dark_6</item>
|
||||
<item name="input_bar_button_background_opaque">@color/classic_dark_2</item>
|
||||
<item name="input_bar_button_background_opaque_border">@color/classic_dark_3</item>
|
||||
<item name="input_bar_lock_view_background">@color/classic_dark_2</item>
|
||||
<item name="input_bar_lock_view_border">@color/classic_dark_3</item>
|
||||
<item name="mention_candidates_view_background">@color/classic_dark_2</item>
|
||||
<item name="mention_candidates_view_background_ripple">@color/classic_dark_3</item>
|
||||
<item name="scroll_to_bottom_button_background">@color/classic_dark_1</item>
|
||||
<item name="scroll_to_bottom_button_border">@color/classic_dark_3</item>
|
||||
<item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
|
||||
<item name="message_selected">@color/classic_dark_1</item>
|
||||
|
||||
<item name="actionModeBackground">?colorPrimary</item>
|
||||
<item name="android:colorBackground">?colorPrimary</item>
|
||||
<item name="dialog_background_color">?colorPrimary</item>
|
||||
|
|
|
|||
|
|
@ -242,19 +242,6 @@ message CallMessage {
|
|||
required string uuid = 5;
|
||||
}
|
||||
|
||||
message SharedConfigMessage {
|
||||
enum Type {
|
||||
USER = 1;
|
||||
CLOSED_GROUP_INFO = 2;
|
||||
ENCRYPTION_KEYS = 3;
|
||||
CONVERSATION_READ_STATE = 4;
|
||||
}
|
||||
|
||||
// @required
|
||||
required Type type = 1;
|
||||
required bytes data = 2;
|
||||
}
|
||||
|
||||
message ConfigurationMessage {
|
||||
|
||||
message ClosedGroup {
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue