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

Conversation styling and coloring improvements.

Browse Source
This commit is contained in:
Anton Chekulaev 2020-09-01 18:47:50 +10:00
parent 3236fde416
commit ecd2dd8ef3
9 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/drawable/compose_background_light.xml
View File

@ -5,10 +5,10 @@
<stroke
android:width="1dp"
android:color="@color/core_grey_05" />
android:color="@color/core_grey_15" />
<solid
android:color="@color/core_grey_02" />
android:color="@color/core_grey_05" />
<corners
android:radius="20dp" />

2
res/drawable/conversation_item_background.xml
View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@color/textsecure_primary_alpha33" android:state_selected="true" />
<item android:drawable="@color/accent50" android:state_selected="true" />
<item android:drawable="@color/signal_primary_alpha_focus" android:state_focused="true" />
</selector>

6
res/layout/conversation_input_panel.xml
View File

@ -91,18 +91,14 @@
android:layout_height="@dimen/conversation_compose_height" />
<org.thoughtcrime.securesms.components.ComposeText
style="@style/ComposeEditText"
style="@style/Widget.EditText.Compose"
android:id="@+id/embedded_text_editor"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textAlignment="viewStart"
android:layout_weight="1"
android:textColorHint="?android:attr/textColorHint"
android:textSize="@dimen/small_font_size"
android:nextFocusForward="@+id/send_button"
android:nextFocusRight="@+id/send_button"
android:textCursorDrawable="@drawable/session_edit_text_cursor"
tools:visibility="invisible"
tools:hint="Send TextSecure message" >
<requestFocus />

4
res/layout/mediasend_fragment.xml
View File

@ -95,13 +95,11 @@
android:layout_height="@dimen/conversation_compose_height" />
<org.thoughtcrime.securesms.components.ComposeText
style="@style/ComposeEditText"
style="@style/Widget.EditText.Compose"
android:id="@+id/mediasend_compose_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:textSize="@dimen/small_font_size"
android:textCursorDrawable="@drawable/session_edit_text_cursor"
android:layout_weight="1"
android:nextFocusForward="@+id/send_button"
android:nextFocusRight="@+id/send_button"

1
res/values-notnight-v21/colors.xml
View File

@ -3,6 +3,7 @@
<!-- Session -->
<color name="accent">#5df299</color>
<color name="accent50">#805df299</color>
<color name="text">#000000</color>
<color name="destructive">#f26f55</color>
<color name="unimportant">#606060</color>

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

@ -15,6 +15,8 @@
<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="conversation_input_background">@drawable/compose_background_light</item>
</style>
<style name="Theme.TextSecure.DayNight">
@ -46,7 +48,6 @@
<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_popup_background">@color/white</item>
<item name="conversation_attach_camera">@drawable/ic_photo_camera_light</item>

3
res/values/colors.xml
View File

@ -3,8 +3,9 @@
<!-- Session -->
<color name="accent">#00F782</color>
<color name="accent50">#8000F782</color>
<color name="text">#FFFFFF</color>
<color name="destructive">#E46351</color>
<color name="destructive">#FF453A</color>
<color name="unimportant">#D8D8D8</color>
<color name="border">#979797</color>
<color name="cell_background">#1B1B1B</color>

7
res/values/styles.xml
View File

@ -341,19 +341,22 @@
<item name="android:background">@drawable/error_round</item>
</style>
<style name="ComposeEditText" parent="@style/Signal.Text.Body">
<style name="Widget.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:textColorHint">?android:textColorTertiary</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="AttachmentTypeLabel">

5
res/values/themes.xml
View File

@ -9,7 +9,7 @@
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?android:textColorPrimary</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="colorControlHighlight">?colorAccent</item>
<item name="colorControlHighlight">#00f</item>
<item name="android:textColorPrimary">@color/text</item>
<item name="android:textColorSecondary">?android:textColorPrimary</item>
<item name="android:textColorTertiary">@color/unimportant</item>
@ -82,6 +82,7 @@
<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>
<!-- This should be the default theme for the application. -->
@ -104,7 +105,6 @@
<!-- TODO Refactor this to use color resources -->
<style name="Base.Theme.Session.ForceDark" parent="Theme.Session.DayNight">
<!-- TODO Use a color resource -->
<item name="colorPrimary">#171717</item>
<item name="android:textColorPrimary">#FFFFFF</item>
<item name="android:textColorSecondary">#DFFFFFFF</item>
@ -502,7 +502,6 @@
<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_arrow_up_circle_24</item>
<item name="conversation_transport_push_indicator">@drawable/ic_arrow_up_circle_24</item>