TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 23:27:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch the conversation color back to incoming messages.

Browse Source
This commit is contained in:
Greyson Parrelli
2018-10-09 12:52:32 -07:00
parent b1d653a230
commit 710fa4a6f0
12 changed files with 49 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/conversation_activity_attachment_editor_stub.xml
View File

@@ -53,8 +53,8 @@
android:paddingLeft="@dimen/message_bubble_horizontal_padding"
android:paddingRight="@dimen/message_bubble_horizontal_padding"
android:background="@drawable/message_bubble_background_sent_alone"
app:doc_titleColor="?attr/conversation_item_received_text_primary_color"
app:doc_captionColor="?attr/conversation_item_received_text_secondary_color"/>
app:doc_titleColor="?attr/conversation_item_sent_text_primary_color"
app:doc_captionColor="?attr/conversation_item_sent_text_secondary_color"/>
</org.thoughtcrime.securesms.components.RemovableEditableMediaView>

4
res/layout/conversation_input_panel.xml
View File

@@ -41,8 +41,8 @@
android:layout_marginTop="6dp"
android:visibility="gone"
app:message_type="preview"
app:quote_colorPrimary="?attr/conversation_item_received_text_primary_color"
app:quote_colorSecondary="?attr/conversation_item_received_text_primary_color"
app:quote_colorPrimary="?attr/conversation_item_sent_text_primary_color"
app:quote_colorSecondary="?attr/conversation_item_sent_text_primary_color"
tools:visibility="visible"/>
<FrameLayout

1
res/layout/conversation_item_sent.xml
View File

@@ -127,7 +127,6 @@
android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
android:clipChildren="false"
android:clipToPadding="false"
android:alpha="0.8"
app:footer_text_color="?attr/conversation_item_sent_text_secondary_color"
app:footer_icon_color="?attr/conversation_item_sent_icon_color"/>

2
res/layout/transfer_controls_view.xml
View File

@@ -18,7 +18,7 @@
android:padding="15dp"
android:gravity="center"
android:longClickable="false"
android:textColor="?conversation_item_sent_text_primary_color"
android:textColor="?conversation_item_received_text_primary_color"
android:drawableLeft="@drawable/ic_file_download_white_36dp"
android:textSize="16dp"
android:visibility="gone"

2
res/values/core_colors.xml
View File

@@ -13,7 +13,7 @@
<color name="core_grey_15">#d5d6d6</color>
<color name="core_grey_25">#bbbdbe</color>
<color name="core_grey_45">#898a8c</color>
<color name="core_grey_60">#636467</color>
<color name="core_grey_60">#6b6d70</color>
<color name="core_grey_75">#3d3e44</color>
<color name="core_grey_85">#23252a</color>
<color name="core_grey_90">#17191d</color>

2
res/values/styles.xml
View File

@@ -174,7 +174,7 @@
<item name="android:background">@null</item>
<item name="android:maxLines">4</item>
<item name="android:maxLength">2000</item>
<item name="android:textColor">?conversation_item_received_text_primary_color</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>

14
res/values/themes.xml
View File

@@ -188,12 +188,12 @@
<item name="conversation_item_bubble_background">@color/core_grey_05</item>
<item name="conversation_item_sent_text_primary_color">@color/core_white</item>
<item name="conversation_item_sent_text_secondary_color">@color/core_white</item>
<item name="conversation_item_sent_icon_color">@color/core_white</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_text_indicator_tab_color">#99000000</item>
<item name="conversation_item_received_text_primary_color">@color/core_grey_90</item>
<item name="conversation_item_received_text_secondary_color">@color/core_grey_60</item>
<item name="conversation_item_received_text_primary_color">@color/core_white</item>
<item name="conversation_item_received_text_secondary_color">@color/core_white</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>
@@ -293,8 +293,8 @@
<item name="conversation_item_bubble_background">@color/core_grey_75</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_05</item>
<item name="conversation_item_sent_icon_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>
<item name="conversation_item_sent_text_indicator_tab_color">#99ffffff</item>
<item name="conversation_item_received_text_primary_color">@color/core_grey_05</item>
<item name="conversation_item_received_text_secondary_color">@color/core_grey_25</item>