mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2024-11-25 10:55:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Fixup SchildiChat theming

Browse source 
Change-Id: I0c6f04ceb4c09be41d5879b6c6a4cee1d082c525
This commit is contained in:
SpiritCroc 2021-06-26 18:22:43 +02:00
parent 5a1e7c8c74
commit 098d98926a
27 changed files with 119 additions and 75 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
library/ui-styles/src/main/res/color/edit_text_outline_dark.xml Normal file
View file

@ -0,0 +1,5 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="?android:colorAccent" android:state_focused="true"/>
<item android:color="?android:textColorHint"/>
</selector>

3
vector/src/main/res/values/attrs_sc.xml → library/ui-styles/src/main/res/values/attrs_sc.xml
View file

@ -7,13 +7,14 @@
<attr name="sc_message_bg_outgoing" format="color" /> <attr name="sc_message_bg_outgoing" format="color" />
<attr name="colorAccentPale" format="color" /> <attr name="colorAccentPale" format="color" />
<attr name="riotx_toolbar_bg" format="color" />
<attr name="riotx_unread_unimportant_room_badge" format="color" /> <attr name="riotx_unread_unimportant_room_badge" format="color" />
<attr name="timestamp_overlay_fg" format="color" /> <attr name="timestamp_overlay_fg" format="color" />
<attr name="timestamp_overlay_bg" format="color" /> <attr name="timestamp_overlay_bg" format="color" />
<attr name="dense_dropdown_text_input" format="reference" />
</declare-styleable> </declare-styleable>
</resources> </resources>

3
library/ui-styles/src/main/res/values/colors_sc.xml
View file

@ -27,7 +27,8 @@
<color name="background_floating_sc">#ff424242</color> <color name="background_floating_sc">#ff424242</color>
<color name="background_touch_guard_sc">#bf000000</color> <color name="background_touch_guard_sc">#bf000000</color>
<color name="list_divider_color_sc">#80ffffff</color> <color name="list_divider_color_sc">#1fffffff</color>
<color name="list_divider_color_sc_light">#1f000000</color>
<color name="timestamp_overlay_fg">#ffffff</color> <color name="timestamp_overlay_fg">#ffffff</color>
<color name="timestamp_overlay_bg">#80000000</color> <color name="timestamp_overlay_bg">#80000000</color>

31
library/ui-styles/src/main/res/values/styles_sc.xml
View file

@ -4,7 +4,7 @@
<style name="VectorAlertDialogStyleDark.SC" parent="AlertDialog.Vector.Dark"> <style name="VectorAlertDialogStyleDark.SC" parent="AlertDialog.Vector.Dark">
<item name="colorPrimary">@color/accent_sc</item> <item name="colorPrimary">@color/accent_sc</item>
<item name="colorSecondary">@color/accent_sc</item> <item name="colorSecondary">@color/accent_sc</item>
<item name="colorSurface">@color/background_sc</item> <item name="colorSurface">@color/background_dark_sc</item>
<item name="colorOnSurface">@color/text_color_primary_sc</item> <item name="colorOnSurface">@color/text_color_primary_sc</item>
<item name="colorError">@color/element_alert_dark</item> <item name="colorError">@color/element_alert_dark</item>
</style> </style>
@ -15,16 +15,16 @@
</style> </style>
<!-- custom action bar --> <!-- custom action bar -->
<style name="Vector.Styled.ActionBar.SC" parent="Widget.Vector.Toolbar.Base"> <style name="Vector.Styled.ActionBar.SC" parent="Widget.Vector.Toolbar">
<item name="android:background">@color/background_dark_sc</item> <item name="android:background">@color/background_sc</item>
<item name="background">@color/background_dark_sc</item> <item name="background">@color/background_sc</item>
</style> </style>
<!-- BottomSheet theming --> <!-- BottomSheet theming -->
<style name="Vector.BottomSheet.SC" parent="Theme.Vector.BottomSheetDialog.Dark"> <style name="Vector.BottomSheet.SC" parent="Theme.Vector.BottomSheetDialog.Dark">
<item name="colorPrimary">@color/text_color_primary_sc</item> <item name="colorPrimary">?android:colorAccent</item>
<item name="colorSecondary">@color/text_color_secondary_sc</item> <item name="colorSecondary">?android:colorAccent</item>
<item name="colorSurface">@color/background_floating_sc</item> <item name="colorSurface">@color/background_dark_sc</item>
<item name="colorOnSurface">@color/text_color_primary_sc</item> <item name="colorOnSurface">@color/text_color_primary_sc</item>
<item name="colorError">@color/element_alert_dark</item> <item name="colorError">@color/element_alert_dark</item>
<!-- Default color for text View --> <!-- Default color for text View -->
@ -41,6 +41,23 @@
<!-- Accent color --> <!-- Accent color -->
<item name="android:colorAccent">@color/accent_sc</item> <item name="android:colorAccent">@color/accent_sc</item>
<item name="colorAccent">@color/accent_sc</item> <item name="colorAccent">@color/accent_sc</item>
<item name="colorPrimary">?android:colorAccent</item>
<item name="colorSecondary">?android:colorAccent</item>
</style>
<style name="Widget.Vector.TextInputLayout.Dark.SC" parent="Widget.Vector.TextInputLayout">
<!-- WTF? Why is this required for dark theme? Since v1.1.10/v1.1.11 merge -->
<!-- While this works to get hint showing for text inputs during login again... this seems like a bad idea
<item name="android:textColorHint">?android:textColorHint</item>
-->
<item name="android:textColorHint">@color/text_color_disabled_sc</item>
<item name="boxStrokeColor">@color/edit_text_outline_dark</item>
</style>
<style name="Widget.Vector.TextInputLayout.Dense.ExposedDropdownMenu.Dark.SC" parent="Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu">
<!-- Same comments as for Widget.Vector.TextInputLayout.Dark.SC apply -->
<item name="android:textColorHint">@color/text_color_disabled_sc</item>
<item name="boxStrokeColor">@color/edit_text_outline_dark</item>
</style> </style>
</resources> </resources>

8
library/ui-styles/src/main/res/values/styles_text_view.xml
View file

@ -10,7 +10,9 @@
<!-- Note: lineHeight attribute cannot be added in textAppearance style --> <!-- Note: lineHeight attribute cannot be added in textAppearance style -->
<style name="Widget.Vector.TextView.Title"> <style name="Widget.Vector.TextView.Title">
<item name="android:textAppearance">@style/TextAppearance.Vector.Title</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Title</item>
<!--
<item name="lineHeight">32sp</item> <item name="lineHeight">32sp</item>
-->
</style> </style>
<style name="Widget.Vector.TextView.Title.Medium"> <style name="Widget.Vector.TextView.Title.Medium">
@ -31,7 +33,9 @@
<style name="Widget.Vector.TextView.Body"> <style name="Widget.Vector.TextView.Body">
<item name="android:textAppearance">@style/TextAppearance.Vector.Body</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Body</item>
<!--
<item name="lineHeight">20sp</item> <item name="lineHeight">20sp</item>
-->
</style> </style>
<style name="Widget.Vector.TextView.Body.Medium"> <style name="Widget.Vector.TextView.Body.Medium">
@ -40,12 +44,16 @@
<style name="Widget.Vector.TextView.Caption"> <style name="Widget.Vector.TextView.Caption">
<item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Caption</item>
<!--
<item name="lineHeight">16sp</item> <item name="lineHeight">16sp</item>
-->
</style> </style>
<style name="Widget.Vector.TextView.Micro"> <style name="Widget.Vector.TextView.Micro">
<item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item> <item name="android:textAppearance">@style/TextAppearance.Vector.Micro</item>
<!--
<item name="lineHeight">16sp</item> <item name="lineHeight">16sp</item>
-->
</style> </style>
</resources> </resources>

12
library/ui-styles/src/main/res/values/styles_timeline.xml
View file

@ -4,12 +4,12 @@
<style name="TimelineContentStubBaseParams"> <style name="TimelineContentStubBaseParams">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item> <item name="android:layout_height">wrap_content</item>
<item name="android:layout_marginStart">8dp</item> <item name="android:layout_marginStart">0dp</item>
<item name="android:layout_marginLeft">8dp</item> <item name="android:layout_marginLeft">0dp</item>
<item name="android:layout_marginEnd">8dp</item> <item name="android:layout_marginEnd">0dp</item>
<item name="android:layout_marginRight">8dp</item> <item name="android:layout_marginRight">0dp</item>
<item name="android:layout_marginBottom">4dp</item> <item name="android:layout_marginBottom">0dp</item>
<item name="android:layout_marginTop">4dp</item> <item name="android:layout_marginTop">0dp</item>
</style> </style>
</resources> </resources>

2
library/ui-styles/src/main/res/values/styles_toolbar.xml
View file

@ -35,4 +35,4 @@
<item name="android:textSize">12sp</item> <item name="android:textSize">12sp</item>
</style> </style>
</resources> </resources>

2
library/ui-styles/src/main/res/values/text_appearances.xml
View file

@ -47,8 +47,10 @@
<!-- Note: this is the default text appearance for all the TextViews --> <!-- Note: this is the default text appearance for all the TextViews -->
<style name="TextAppearance.Vector.Body" parent="TextAppearance.MaterialComponents.Body1"> <style name="TextAppearance.Vector.Body" parent="TextAppearance.MaterialComponents.Body1">
<!--
<item name="fontFamily">sans-serif</item> <item name="fontFamily">sans-serif</item>
<item name="android:fontFamily">sans-serif</item> <item name="android:fontFamily">sans-serif</item>
-->
<item name="android:textSize">14sp</item> <item name="android:textSize">14sp</item>
<item name="android:letterSpacing">0</item> <item name="android:letterSpacing">0</item>
<item name="android:textColor">?vctr_content_primary</item> <item name="android:textColor">?vctr_content_primary</item>

2
library/ui-styles/src/main/res/values/theme_black.xml
View file

@ -7,7 +7,9 @@
<!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting --> <!-- Only setting the items we need to override to get the background to be pure black, otherwise inheriting -->
<!-- other colors --> <!-- other colors -->
<!--
<item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_black</item> <item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_black</item>
-->
<item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_black</item> <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_black</item>
<item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_black</item> <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_black</item>
<item name="vctr_fab_label_color">@color/vctr_fab_label_color_black</item> <item name="vctr_fab_label_color">@color/vctr_fab_label_color_black</item>

4
library/ui-styles/src/main/res/values/theme_dark.xml
View file

@ -16,7 +16,7 @@
<item name="vctr_system">@color/element_system_dark</item> <item name="vctr_system">@color/element_system_dark</item>
<!-- other colors --> <!-- other colors -->
<item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_dark</item> <item name="vctr_unread_room_badge">?colorPrimary</item>
<item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_dark</item> <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_dark</item>
<item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_dark</item> <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_dark</item>
<item name="vctr_fab_label_color">@color/vctr_fab_label_color_dark</item> <item name="vctr_fab_label_color">@color/vctr_fab_label_color_dark</item>
@ -119,11 +119,11 @@
<!-- SC additions --> <!-- SC additions -->
<item name="sc_message_bg_incoming">#FF465561</item> <item name="sc_message_bg_incoming">#FF465561</item>
<item name="sc_message_bg_outgoing">#ff343b47</item> <item name="sc_message_bg_outgoing">#ff343b47</item>
<item name="riotx_toolbar_bg">?android:colorBackground</item>
<item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_dark</item> <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_dark</item>
<item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item> <item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item>
<item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item> <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
<item name="colorAccentPale">@color/element_accent_pale</item> <item name="colorAccentPale">@color/element_accent_pale</item>
<item name="dense_dropdown_text_input">@style/Widget.Vector.TextInputLayout.Dense.ExposedDropdownMenu.Dark.SC</item>
<item name="android:statusBarColor">@color/android_status_bar_background_dark</item> <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>
<item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item> <item name="android:navigationBarColor">@color/android_navigation_bar_background_dark</item>

2
library/ui-styles/src/main/res/values/theme_light.xml
View file

@ -119,11 +119,11 @@
<!-- SC additions --> <!-- SC additions -->
<item name="sc_message_bg_incoming">#FFEEEEEE</item> <item name="sc_message_bg_incoming">#FFEEEEEE</item>
<item name="sc_message_bg_outgoing">#FFDDDDDD</item> <item name="sc_message_bg_outgoing">#FFDDDDDD</item>
<item name="riotx_toolbar_bg">?android:colorBackground</item>
<item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item> <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item>
<item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item> <item name="timestamp_overlay_fg">@color/timestamp_overlay_fg</item>
<item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item> <item name="timestamp_overlay_bg">@color/timestamp_overlay_bg</item>
<item name="colorAccentPale">@color/element_accent_pale</item> <item name="colorAccentPale">@color/element_accent_pale</item>
<item name="dense_dropdown_text_input">@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu</item>
<!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ --> <!-- Use dark color, to have enough contrast with icons color. windowLightStatusBar is only available in API 23+ -->
<item name="android:statusBarColor">@color/android_status_bar_background_dark</item> <item name="android:statusBarColor">@color/android_status_bar_background_dark</item>

25
library/ui-styles/src/main/res/values/theme_sc.xml
View file

@ -22,14 +22,14 @@
<item name="vctr_touch_guard_bg">@color/background_touch_guard_sc</item> <item name="vctr_touch_guard_bg">@color/background_touch_guard_sc</item>
<item name="vctr_keys_backup_banner_accent_color">@color/background_floating_sc</item> <item name="vctr_keys_backup_banner_accent_color">@color/background_floating_sc</item>
<item name="vctr_attachment_selector_background">?colorBackgroundFloating</item> <item name="vctr_attachment_selector_background">?colorBackgroundFloating</item>
<item name="vctr_attachment_selector_border">@color/background_dark_sc</item> <item name="vctr_attachment_selector_border">@color/list_divider_color_sc</item>
<item name="vctr_room_active_widgets_banner_bg">@color/background_floating_sc</item> <item name="vctr_room_active_widgets_banner_bg">@color/background_floating_sc</item>
<item name="vctr_room_active_widgets_banner_text">?vctr_content_secondary</item> <item name="vctr_room_active_widgets_banner_text">?vctr_content_secondary</item>
<item name="vctr_reaction_background_off">@color/background_sc</item> <item name="vctr_reaction_background_off">@color/background_sc</item>
<item name="vctr_reaction_background_on">@color/sc_reaction_background_on_dark</item> <item name="vctr_reaction_background_on">@color/sc_reaction_background_on_dark</item>
<item name="vctr_waiting_background_color">#555555</item> <item name="vctr_waiting_background_color">#555555</item>
<item name="vctr_chat_effect_snow_background">@android:color/transparent</item> <item name="vctr_chat_effect_snow_background">@android:color/transparent</item>
<item name="vctr_toolbar_background">@color/background_dark_sc</item> <item name="vctr_toolbar_background">?android:colorBackground</item>
<!-- room message colors --> <!-- room message colors -->
<item name="vctr_notice_secondary">?vctr_content_secondary</item> <item name="vctr_notice_secondary">?vctr_content_secondary</item>
@ -42,10 +42,10 @@
<item name="vctr_spoiler_background_color">#FFFFFFFF</item> <item name="vctr_spoiler_background_color">#FFFFFFFF</item>
<!-- Some alias --> <!-- Some alias -->
<item name="vctr_header_background">?vctr_system</item> <item name="vctr_header_background">?android:colorBackground</item>
<item name="vctr_list_separator">@color/background_black_sc</item> <item name="vctr_list_separator">@color/list_divider_color_sc</item>
<item name="vctr_list_separator_system">?vctr_system</item> <item name="vctr_list_separator_system">?vctr_list_separator</item>
<item name="vctr_list_separator_on_surface">?vctr_system</item> <item name="vctr_list_separator_on_surface">?vctr_list_separator</item>
<!-- Material color --> <!-- Material color -->
<item name="colorPrimary">?colorAccent</item> <item name="colorPrimary">?colorAccent</item>
@ -56,9 +56,9 @@
<item name="colorOnSecondary">?vctr_content_primary</item> <item name="colorOnSecondary">?vctr_content_primary</item>
<item name="colorError">@color/element_alert_dark</item> <item name="colorError">@color/element_alert_dark</item>
<item name="colorOnError">?vctr_content_primary</item> <item name="colorOnError">?vctr_content_primary</item>
<item name="colorSurface">@color/element_system_dark</item> <item name="colorSurface">?android:colorBackground</item>
<item name="colorOnSurface">?vctr_content_primary</item> <item name="colorOnSurface">?vctr_content_primary</item>
<item name="android:colorBackground">@color/background_dark_sc</item> <item name="android:colorBackground">@color/background_black_sc</item>
<item name="colorOnBackground">?vctr_content_primary</item> <item name="colorOnBackground">?vctr_content_primary</item>
<!-- TODO styles? --> <!-- TODO styles? -->
@ -71,8 +71,7 @@
<!-- Default color for text View --> <!-- Default color for text View -->
<item name="android:textColorTertiary">?vctr_content_tertiary</item> <item name="android:textColorTertiary">?vctr_content_tertiary</item>
<!-- TODO styles? --> <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleDark.SC</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyleDark.SC</item>
<!-- custom action bar --> <!-- custom action bar -->
<item name="android:actionBarStyle">@style/Vector.Styled.ActionBar.SC</item> <item name="android:actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
@ -85,16 +84,18 @@
<item name="android:colorAccent">@color/accent_sc</item> <item name="android:colorAccent">@color/accent_sc</item>
<item name="sc_message_bg_incoming">@color/background_floating_sc</item> <item name="sc_message_bg_incoming">@color/background_floating_sc</item>
<item name="sc_message_bg_outgoing">@color/background_sc</item> <item name="sc_message_bg_outgoing">@color/background_sc</item>
<item name="riotx_toolbar_bg">?android:colorBackground</item>
<item name="riotx_unread_unimportant_room_badge">@color/background_floating_sc</item> <item name="riotx_unread_unimportant_room_badge">@color/background_floating_sc</item>
<item name="colorAccentPale">@color/accent_sc_pale</item> <item name="colorAccentPale">@color/accent_sc_pale</item>
<item name="android:statusBarColor">@color/background_black_sc</item> <item name="android:statusBarColor">@color/background_black_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item> <item name="android:navigationBarColor">@color/background_black_sc</item>
<!-- Broken login screen outline color on dark theme otherwise? -->
<item name="textInputStyle">@style/Widget.Vector.TextInputLayout.Dark.SC</item>
</style> </style>
<style name="AppTheme.Base.SC.Dark"> <style name="AppTheme.Base.SC.Dark">
<item name="riotx_toolbar_bg">@color/background_sc</item> <item name="vctr_toolbar_background">@color/background_sc</item>
<item name="android:colorBackground">@color/background_dark_sc</item> <item name="android:colorBackground">@color/background_dark_sc</item>
<item name="vctr_header_background">@color/background_sc</item> <item name="vctr_header_background">@color/background_sc</item>

10
library/ui-styles/src/main/res/values/theme_sc_light.xml
View file

@ -11,7 +11,7 @@
<!-- Keep color accent for legacy widget--> <!-- Keep color accent for legacy widget-->
<item name="colorAccent">@color/accent_sc</item> <item name="colorAccent">@color/accent_sc</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyleLight.SC</item> <item name="materialAlertDialogTheme">@style/VectorAlertDialogStyleLight.SC</item>
<item name="vctr_encrypting_message_text_color">@color/accent_sc</item> <item name="vctr_encrypting_message_text_color">@color/accent_sc</item>
@ -22,8 +22,7 @@
<!-- SC additions --> <!-- SC additions -->
<item name="sc_message_bg_incoming">#FFEEEEEE</item> <item name="sc_message_bg_incoming">#FFEEEEEE</item>
<item name="sc_message_bg_outgoing">@color/accent_sc_alpha12</item> <item name="sc_message_bg_outgoing">@color/accent_sc_alpha12</item>
<item name="riotx_toolbar_bg">?android:colorBackground</item> <item name="riotx_unread_unimportant_room_badge">?vctr_content_tertiary</item>
<item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item>
<item name="colorAccentPale">@color/accent_sc_pale</item> <item name="colorAccentPale">@color/accent_sc_pale</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item> <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item>
@ -44,6 +43,11 @@
<item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_light</item> <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_light</item>
<item name="vctr_reaction_background_on">@color/sc_reaction_background_on_light</item> <item name="vctr_reaction_background_on">@color/sc_reaction_background_on_light</item>
<!-- Some alias -->
<item name="vctr_list_separator">@color/list_divider_color_sc_light</item>
<item name="vctr_list_separator_system">?vctr_list_separator</item>
<item name="vctr_list_separator_on_surface">?vctr_list_separator</item>
</style> </style>
<!-- Default AppTheme for usage where settings don't apply --> <!-- Default AppTheme for usage where settings don't apply -->

14
vector/src/main/java/im/vector/app/features/home/room/detail/composer/TextComposerView.kt
View file

@ -17,6 +17,7 @@
package im.vector.app.features.home.room.detail.composer package im.vector.app.features.home.room.detail.composer
import android.content.Context import android.content.Context
import android.content.res.ColorStateList
import android.net.Uri import android.net.Uri
import android.text.Editable import android.text.Editable
import android.util.AttributeSet import android.util.AttributeSet
@ -33,6 +34,7 @@ import androidx.transition.TransitionManager
import androidx.transition.TransitionSet import androidx.transition.TransitionSet
import im.vector.app.R import im.vector.app.R
import im.vector.app.databinding.ComposerLayoutBinding import im.vector.app.databinding.ComposerLayoutBinding
import im.vector.app.features.themes.ThemeUtils
/** /**
* Encapsulate the timeline composer UX. * Encapsulate the timeline composer UX.
@ -72,6 +74,7 @@ class TextComposerView @JvmOverloads constructor(
override fun onTextBlankStateChanged(isBlank: Boolean) { override fun onTextBlankStateChanged(isBlank: Boolean) {
callback?.onTextBlankStateChanged(isBlank) callback?.onTextBlankStateChanged(isBlank)
/*
val shouldBeVisible = currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded || !isBlank val shouldBeVisible = currentConstraintSetId == R.layout.composer_layout_constraint_set_expanded || !isBlank
TransitionManager.endTransitions(this@TextComposerView) TransitionManager.endTransitions(this@TextComposerView)
if (views.sendButton.isVisible != shouldBeVisible) { if (views.sendButton.isVisible != shouldBeVisible) {
@ -81,6 +84,8 @@ class TextComposerView @JvmOverloads constructor(
) )
views.sendButton.isVisible = shouldBeVisible views.sendButton.isVisible = shouldBeVisible
} }
*/
updateSendButtonColor(isBlank)
} }
} }
views.composerRelatedMessageCloseButton.setOnClickListener { views.composerRelatedMessageCloseButton.setOnClickListener {
@ -98,6 +103,11 @@ class TextComposerView @JvmOverloads constructor(
} }
} }
private fun updateSendButtonColor(isBlank: Boolean) {
val color = ThemeUtils.getColor(views.sendButton.context, if (isBlank) R.attr.vctr_content_tertiary else R.attr.colorAccent)
views.sendButton.imageTintList = ColorStateList.valueOf(color)
}
fun collapse(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) { fun collapse(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
if (currentConstraintSetId == R.layout.composer_layout_constraint_set_compact) { if (currentConstraintSetId == R.layout.composer_layout_constraint_set_compact) {
// ignore we good // ignore we good
@ -105,7 +115,7 @@ class TextComposerView @JvmOverloads constructor(
} }
currentConstraintSetId = R.layout.composer_layout_constraint_set_compact currentConstraintSetId = R.layout.composer_layout_constraint_set_compact
applyNewConstraintSet(animate, transitionComplete) applyNewConstraintSet(animate, transitionComplete)
views.sendButton.isVisible = !views.composerEditText.text.isNullOrEmpty() //views.sendButton.isVisible = !views.composerEditText.text.isNullOrEmpty()
} }
fun expand(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) { fun expand(animate: Boolean = true, transitionComplete: (() -> Unit)? = null) {
@ -115,7 +125,7 @@ class TextComposerView @JvmOverloads constructor(
} }
currentConstraintSetId = R.layout.composer_layout_constraint_set_expanded currentConstraintSetId = R.layout.composer_layout_constraint_set_expanded
applyNewConstraintSet(animate, transitionComplete) applyNewConstraintSet(animate, transitionComplete)
views.sendButton.isVisible = true //views.sendButton.isVisible = true
} }
private fun applyNewConstraintSet(animate: Boolean, transitionComplete: (() -> Unit)?) { private fun applyNewConstraintSet(animate: Boolean, transitionComplete: (() -> Unit)?) {

5
vector/src/main/res/drawable/ic_radio_off.xml
View file

@ -2,9 +2,10 @@
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24"
android:tint="?android:attr/textColorHint">
<path <path
android:pathData="M12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2ZM12,20C7.6,20 4,16.4 4,12C4,7.6 7.6,4 12,4C16.4,4 20,7.6 20,12C20,16.4 16.4,20 12,20Z" android:pathData="M12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2ZM12,20C7.6,20 4,16.4 4,12C4,7.6 7.6,4 12,4C16.4,4 20,7.6 20,12C20,16.4 16.4,20 12,20Z"
android:fillColor="#8E99A4" android:fillColor="#808080"
android:fillType="evenOdd"/> android:fillType="evenOdd"/>
</vector> </vector>

5
vector/src/main/res/drawable/ic_radio_on.xml
View file

@ -2,13 +2,14 @@
android:width="24dp" android:width="24dp"
android:height="24dp" android:height="24dp"
android:viewportWidth="24" android:viewportWidth="24"
android:viewportHeight="24"> android:viewportHeight="24"
android:tint="?android:attr/colorAccent">
<group> <group>
<clip-path <clip-path
android:pathData="M12,7C9.2,7 7,9.2 7,12C7,14.8 9.2,17 12,17C14.8,17 17,14.8 17,12C17,9.2 14.8,7 12,7V7ZM12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2V2ZM12,20C7.6,20 4,16.4 4,12C4,7.6 7.6,4 12,4C16.4,4 20,7.6 20,12C20,16.4 16.4,20 12,20V20Z" android:pathData="M12,7C9.2,7 7,9.2 7,12C7,14.8 9.2,17 12,17C14.8,17 17,14.8 17,12C17,9.2 14.8,7 12,7V7ZM12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2V2ZM12,20C7.6,20 4,16.4 4,12C4,7.6 7.6,4 12,4C16.4,4 20,7.6 20,12C20,16.4 16.4,20 12,20V20Z"
android:fillType="evenOdd"/> android:fillType="evenOdd"/>
<path <path
android:pathData="M2,2h20v20h-20z" android:pathData="M2,2h20v20h-20z"
android:fillColor="#0DBD8B"/> android:fillColor="#808080" />
</group> </group>
</vector> </vector>

11
vector/src/main/res/drawable/line_divider_sc.xml
View file

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size
android:width="1dp"
android:height="1dp" />
<solid android:color="@color/list_divider_color_sc" />
</shape>

5
vector/src/main/res/layout/composer_layout.xml
View file

@ -94,7 +94,7 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/option_send_files" android:contentDescription="@string/option_send_files"
android:src="@drawable/ic_attachment" android:src="@drawable/ic_attachment"
android:tint="?android:textColorHint" app:tint="?android:textColorHint"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
<FrameLayout <FrameLayout
@ -120,7 +120,7 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/a11y_open_emoji_picker" android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji" android:src="@drawable/ic_insert_emoji"
app:tint="?vctr_content_tertiary" app:tint="?android:textColorHint"
tools:ignore="MissingConstraints,MissingPrefix" /> tools:ignore="MissingConstraints,MissingPrefix" />
<ImageButton <ImageButton
@ -130,6 +130,7 @@
android:background="@drawable/bg_send" android:background="@drawable/bg_send"
android:contentDescription="@string/send" android:contentDescription="@string/send"
android:src="@drawable/ic_send" android:src="@drawable/ic_send"
app:tint="?vctr_content_tertiary"
tools:ignore="MissingConstraints" /> tools:ignore="MissingConstraints" />
</merge> </merge>

14
vector/src/main/res/layout/composer_layout_constraint_set_compact.xml
View file

@ -114,7 +114,7 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/option_send_files" android:contentDescription="@string/option_send_files"
android:src="@drawable/ic_attachment" android:src="@drawable/ic_attachment"
android:tint="?android:textColorHint" app:tint="?android:textColorHint"
app:layout_constraintBottom_toBottomOf="@id/sendButton" app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/sendButton" app:layout_constraintEnd_toStartOf="@+id/sendButton"
app:layout_constraintStart_toEndOf="@id/composerEditText" app:layout_constraintStart_toEndOf="@id/composerEditText"
@ -126,11 +126,12 @@
android:id="@+id/composerEditTextOuterBorder" android:id="@+id/composerEditTextOuterBorder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginTop="8dp" android:layout_marginStart="4dp"
android:layout_marginBottom="8dp" android:layout_marginTop="4dp"
android:layout_marginBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/sendButton" app:layout_constraintStart_toEndOf="@id/composerEmojiButton"
app:layout_constraintStart_toEndOf="@id/attachmentButton" app:layout_constraintEnd_toStartOf="@id/attachmentButton"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_goneMarginEnd="12dp" /> app:layout_goneMarginEnd="12dp" />
@ -157,7 +158,7 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/a11y_open_emoji_picker" android:contentDescription="@string/a11y_open_emoji_picker"
android:src="@drawable/ic_insert_emoji" android:src="@drawable/ic_insert_emoji"
android:tint="?vctr_content_quaternary" app:tint="?android:textColorHint"
app:layout_constraintBottom_toBottomOf="@id/sendButton" app:layout_constraintBottom_toBottomOf="@id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/composerEditText" app:layout_constraintEnd_toStartOf="@+id/composerEditText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -172,7 +173,6 @@
android:contentDescription="@string/send" android:contentDescription="@string/send"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_send" android:src="@drawable/ic_send"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/attachmentButton" app:layout_constraintStart_toEndOf="@id/attachmentButton"

13
vector/src/main/res/layout/composer_layout_constraint_set_expanded.xml
View file

@ -127,7 +127,7 @@
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:contentDescription="@string/option_send_files" android:contentDescription="@string/option_send_files"
android:src="@drawable/ic_attachment" android:src="@drawable/ic_attachment"
android:tint="?android:textColorHint" app:tint="?android:textColorHint"
app:layout_constraintEnd_toStartOf="@+id/sendButton" app:layout_constraintEnd_toStartOf="@+id/sendButton"
app:layout_constraintTop_toBottomOf="parent" app:layout_constraintTop_toBottomOf="parent"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
@ -136,12 +136,12 @@
android:id="@+id/composerEditTextOuterBorder" android:id="@+id/composerEditTextOuterBorder"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginStart="8dp" android:layout_marginStart="4dp"
android:layout_marginTop="8dp" android:layout_marginTop="4dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="4dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/composerEmojiButton"
app:layout_constraintEnd_toStartOf="@id/sendButton" app:layout_constraintEnd_toStartOf="@id/sendButton"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier" app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"
app:layout_goneMarginEnd="12dp" /> app:layout_goneMarginEnd="12dp" />
@ -171,7 +171,7 @@
app:layout_constraintBottom_toBottomOf="@+id/sendButton" app:layout_constraintBottom_toBottomOf="@+id/sendButton"
app:layout_constraintEnd_toStartOf="@+id/composerEditText" app:layout_constraintEnd_toStartOf="@+id/composerEditText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:tint="?vctr_content_quaternary" app:tint="?android:textColorHint"
tools:ignore="MissingPrefix" /> tools:ignore="MissingPrefix" />
<ImageButton <ImageButton
@ -182,7 +182,6 @@
android:contentDescription="@string/send" android:contentDescription="@string/send"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_send" android:src="@drawable/ic_send"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier" app:layout_constraintTop_toBottomOf="@id/composer_preview_barrier"

2
vector/src/main/res/layout/fragment_login_server_url_form.xml
View file

@ -55,7 +55,7 @@
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/loginServerUrlFormHomeServerUrlTil" android:id="@+id/loginServerUrlFormHomeServerUrlTil"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu" style="?dense_dropdown_text_input"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"

2
vector/src/main/res/layout/fragment_login_server_url_form_2.xml
View file

@ -26,7 +26,7 @@
<com.google.android.material.textfield.TextInputLayout <com.google.android.material.textfield.TextInputLayout
android:id="@+id/loginServerUrlFormHomeServerUrlTil" android:id="@+id/loginServerUrlFormHomeServerUrlTil"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.Dense.ExposedDropdownMenu" style="?dense_dropdown_text_input"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="26dp" android:layout_marginTop="26dp"

2
vector/src/main/res/layout/fragment_room_detail.xml
View file

@ -178,7 +178,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:colorBackground" android:background="?android:colorBackground"
android:minHeight="56dp" android:minHeight="48dp"
android:transitionName="composer" android:transitionName="composer"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

3
vector/src/main/res/layout/item_generic_footer.xml
View file

@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?vctr_header_background"
android:orientation="vertical" android:orientation="vertical"
android:padding="16dp"> android:padding="16dp">
@ -14,4 +15,4 @@
android:gravity="center" android:gravity="center"
tools:text="Empty list, nothing here" /> tools:text="Empty list, nothing here" />
</LinearLayout> </LinearLayout>

5
vector/src/main/res/layout/item_timeline_event_day_separator.xml
View file

@ -11,7 +11,7 @@
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:background="?vctr_content_tertiary" /> android:background="?vctr_list_separator" />
<TextView <TextView
android:id="@+id/itemDayTextView" android:id="@+id/itemDayTextView"
@ -23,6 +23,7 @@
android:paddingStart="24dp" android:paddingStart="24dp"
android:paddingEnd="24dp" android:paddingEnd="24dp"
android:textColor="?vctr_content_tertiary" android:textColor="?vctr_content_tertiary"
android:textSize="15sp"
tools:text="@tools:sample/date/day_of_week" /> tools:text="@tools:sample/date/day_of_week" />
</FrameLayout> </FrameLayout>

1
vector/src/main/res/layout/item_timeline_event_text_message_stub.xml
View file

@ -18,6 +18,7 @@
style="@style/Widget.Vector.TextView.Body" style="@style/Widget.Vector.TextView.Body"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="0dp"
android:textColor="?vctr_content_primary" android:textColor="?vctr_content_primary"
android:layout_gravity="left" android:layout_gravity="left"
tools:text="@sample/messages.json/data/message" tools:text="@sample/messages.json/data/message"

3
vector/src/main/res/layout/item_verification_action.xml
View file

@ -5,10 +5,9 @@
android:id="@+id/itemVerificationClickableZone" android:id="@+id/itemVerificationClickableZone"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
android:foreground="?attr/selectableItemBackground" android:background="?attr/selectableItemBackground"
android:minHeight="64dp" android:minHeight="64dp"
android:paddingStart="@dimen/layout_horizontal_margin" android:paddingStart="@dimen/layout_horizontal_margin"
android:paddingTop="8dp" android:paddingTop="8dp"