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

Make style consistent across platforms

Browse Source
This commit is contained in:
nielsandriesse
2020-10-29 10:16:49 +11:00
parent c9ecd0ded3
commit e667c6ee7e
7 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/conversation_activity_attachment_editor_stub.xml
View File

@@ -41,8 +41,8 @@
android:paddingBottom="15dp"
app:widgetBackground="?conversation_item_bubble_background"
app:foregroundTintColor="?android:colorControlNormal"
app:backgroundTintColor="?conversation_item_bubble_background"
app:waveformFillColor="?conversation_item_audio_seek_bar_color"/>
app:waveformFillColor="?conversation_item_audio_seek_bar_color_outgoing"
app:waveformBackgroundColor="?conversation_item_audio_seek_bar_background_color"/>
<org.thoughtcrime.securesms.components.DocumentView
android:id="@+id/attachment_document"

4
res/layout/conversation_item_received_audio.xml
View File

@@ -8,6 +8,6 @@
android:layout_height="wrap_content"
android:visibility="gone"
app:foregroundTintColor="?android:colorControlNormal"
app:backgroundTintColor="?message_received_background_color"
app:waveformFillColor="?conversation_item_audio_seek_bar_color"
app:waveformFillColor="?conversation_item_audio_seek_bar_color_incoming"
app:waveformBackgroundColor="?conversation_item_audio_seek_bar_background_color"
tools:visibility="visible"/>

4
res/layout/conversation_item_sent_audio.xml
View File

@@ -6,6 +6,6 @@
android:layout_width="210dp"
android:layout_height="wrap_content"
app:foregroundTintColor="?android:colorControlNormal"
app:backgroundTintColor="?message_sent_background_color"
app:waveformFillColor="?conversation_item_audio_seek_bar_color"
app:waveformFillColor="?conversation_item_audio_seek_bar_color_outgoing"
app:waveformBackgroundColor="?conversation_item_audio_seek_bar_background_color"
android:visibility="gone"/>

3
res/values-notnight-v21/themes.xml
View File

@@ -28,7 +28,8 @@
<item name="menu_info_icon">@drawable/ic_outline_info_24</item>
<item name="conversation_item_audio_seek_bar_color">?colorControlNormal</item>
<item name="conversation_item_audio_seek_bar_color_incoming">@color/accent</item>
<item name="conversation_item_audio_seek_bar_color_outgoing">@color/white</item>
</style>
<style name="Theme.Session.DayNight" parent="Theme.Session.Light">

6
res/values/attrs.xml
View File

@@ -84,7 +84,9 @@
<attr name="conversation_item_sticky_date_background" format="reference" />
<attr name="conversation_item_sticky_date_text_color" format="color" />
<attr name="conversation_item_image_outline_color" format="color" />
<attr name="conversation_item_audio_seek_bar_color" format="reference|color" />
<attr name="conversation_item_audio_seek_bar_color_incoming" format="reference|color" />
<attr name="conversation_item_audio_seek_bar_color_outgoing" format="reference|color" />
<attr name="conversation_item_audio_seek_bar_background_color" format="reference|color" />
<attr name="dialog_info_icon" format="reference" />
<attr name="dialog_alert_icon" format="reference" />
@@ -173,8 +175,8 @@
<declare-styleable name="MessageAudioView">
<attr name="widgetBackground" format="color"/>
<attr name="foregroundTintColor" format="color" />
<attr name="backgroundTintColor" format="color" />
<attr name="waveformFillColor" format="reference|color" />
<attr name="waveformBackgroundColor" format="reference|color" />
</declare-styleable>
<declare-styleable name="CircleColorImageView">

4
res/values/themes.xml
View File

@@ -88,7 +88,9 @@
<item name="quick_camera_icon">@drawable/ic_baseline_photo_camera_24</item>
<item name="quick_mic_icon">@drawable/ic_baseline_mic_24</item>
<item name="conversation_item_audio_seek_bar_color">?colorAccent</item>
<item name="conversation_item_audio_seek_bar_color_incoming">@color/accent</item>
<item name="conversation_item_audio_seek_bar_color_outgoing">@color/accent</item>
<item name="conversation_item_audio_seek_bar_background_color">@color/text</item>
</style>
<!-- This should be the default theme for the application. -->