TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 10:05:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
hjubb 2022-12-19 11:06:42 +11:00
commit bda50d263c
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/res/layout/mediasend_fragment.xml
View File

@ -95,7 +95,6 @@
<org.thoughtcrime.securesms.components.ComposeText <org.thoughtcrime.securesms.components.ComposeText
style="@style/Widget.Session.EditText.Compose" style="@style/Widget.Session.EditText.Compose"
android:textColor="?android:textColorPrimary"
android:id="@+id/mediasend_compose_text" android:id="@+id/mediasend_compose_text"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"

1
app/src/main/res/values/styles.xml
View File

@ -154,6 +154,7 @@
<style name="Widget.Session.EditText.Compose" parent="@style/Signal.Text.Body"> <style name="Widget.Session.EditText.Compose" parent="@style/Signal.Text.Body">
<item name="android:padding">2dp</item> <item name="android:padding">2dp</item>
<item name="android:background">@null</item> <item name="android:background">@null</item>
<item name="android:textColor">@color/white</item>
<item name="android:maxLines">4</item> <item name="android:maxLines">4</item>
<item name="android:maxLength">65536</item> <item name="android:maxLength">65536</item>
<item name="android:capitalize">sentences</item> <item name="android:capitalize">sentences</item>

6
app/src/main/res/values/themes.xml
View File

@ -385,7 +385,7 @@
<item name="scroll_to_bottom_button_background">@color/classic_dark_1</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="scroll_to_bottom_button_border">@color/classic_dark_3</item>
<item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item> <item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
<item name="message_selected">@color/classic_dark_3</item> <item name="message_selected">@color/classic_dark_1</item>
</style> </style>
<style name="Classic.Light"> <style name="Classic.Light">
@ -469,7 +469,7 @@
<item name="scroll_to_bottom_button_background">@color/classic_light_4</item> <item name="scroll_to_bottom_button_background">@color/classic_light_4</item>
<item name="scroll_to_bottom_button_border">@color/classic_light_2</item> <item name="scroll_to_bottom_button_border">@color/classic_light_2</item>
<item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item> <item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
<item name="message_selected">@color/classic_light_3</item> <item name="message_selected">@color/classic_light_5</item>
</style> </style>
@ -636,7 +636,7 @@
<item name="conversation_pinned_background_color">?colorCellBackground</item> <item name="conversation_pinned_background_color">?colorCellBackground</item>
<item name="conversation_unread_background_color">@color/ocean_light_5</item> <item name="conversation_unread_background_color">@color/ocean_light_5</item>
<item name="conversation_pinned_icon_color">?android:textColorPrimary</item> <item name="conversation_pinned_icon_color">?android:textColorPrimary</item>
<item name="message_selected">@color/ocean_light_3</item> <item name="message_selected">@color/ocean_light_5</item>
</style> </style>
</resources> </resources>