filippodb
/
SchildiChat-android
mirror of https://github.com/SchildiChat/SchildiChat-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rework SC theme and more fix merge conflicts to make it compile again 

Note: SC colors still need work, this is just to make the semi-merge compile.

Change-Id: Iaf144e1ce6f349d10759ba1c22c3dc404dee4768
This commit is contained in:
SpiritCroc 2021-06-23 12:34:05 +02:00
parent 7f84f79693
commit 9ba32bc5bb
21 changed files with 114 additions and 197 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
vector/src/main/java/im/vector/app/core/resources/ColorProvider.kt
View File

@ -29,12 +29,15 @@ class ColorProvider @Inject constructor(val context: Context) {
@ColorInt @ColorInt
fun getColor(@ColorRes colorRes: Int): Int { fun getColor(@ColorRes colorRes: Int): Int {
return ContextCompat.getColor(context, colorRes)
/*
return when(colorRes) { return when(colorRes) {
R.color.riotx_accent -> getColorFromAttribute(R.attr.colorAccent) R.color.riotx_accent -> getColorFromAttribute(R.attr.colorAccent)
R.color.riotx_positive_accent -> getColorFromAttribute(R.attr.riotx_positive_accent) R.color.riotx_positive_accent -> getColorFromAttribute(R.attr.riotx_positive_accent)
R.color.riotx_positive_accent_alpha12 -> getColorFromAttribute(R.attr.riotx_positive_accent_alpha12) R.color.riotx_positive_accent_alpha12 -> getColorFromAttribute(R.attr.riotx_positive_accent_alpha12)
else -> ContextCompat.getColor(context, colorRes) else -> ContextCompat.getColor(context, colorRes)
} }
*/
} }
/** /**

2
vector/src/main/java/im/vector/app/features/home/room/detail/timeline/item/AbsMessageItem.kt
View File

@ -648,7 +648,7 @@ abstract class AbsMessageItem<H : AbsMessageItem.Holder> : AbsBaseMessageItem<H>
private fun removeFooterOverlayStyle(holder: H, density: Float) { private fun removeFooterOverlayStyle(holder: H, density: Float) {
holder.bubbleFootView.background = null holder.bubbleFootView.background = null
tintFooter(holder, ThemeUtils.getColor(holder.bubbleFootView.context, R.attr.riotx_text_secondary)) tintFooter(holder, ThemeUtils.getColor(holder.bubbleFootView.context, R.attr.vctr_content_secondary))
holder.bubbleFootView.setPaddingRelative( holder.bubbleFootView.setPaddingRelative(
0, 0,
round(4*density).toInt(), round(4*density).toInt(),

2
vector/src/main/java/im/vector/app/features/home/room/list/actions/RoomListQuickActionsEpoxyController.kt
View File

@ -63,7 +63,7 @@ class RoomListQuickActionsEpoxyController @Inject constructor(
if (vectorPreferences.labAllowMarkUnread()) { if (vectorPreferences.labAllowMarkUnread()) {
// Mark read/unread // Mark read/unread
dividerItem { bottomSheetDividerItem {
id("mark_unread_separator") id("mark_unread_separator")
} }
if (roomSummary.scIsUnread(scSdkPreferences)) { if (roomSummary.scIsUnread(scSdkPreferences)) {

4
vector/src/main/java/im/vector/app/features/roomdirectory/createroom/CreateRoomController.kt
View File

@ -110,8 +110,8 @@ class CreateRoomController @Inject constructor(
id("alias") id("alias")
enabled(enableFormElement) enabled(enableFormElement)
value(viewState.roomVisibilityType.aliasLocalPart) value(viewState.roomVisibilityType.aliasLocalPart)
suffixText(":" + viewState.homeServerName) //suffixText(":" + viewState.homeServerName)
prefixText("#") //prefixText("#")
hint(host.stringProvider.getString(R.string.room_alias_address_hint)) hint(host.stringProvider.getString(R.string.room_alias_address_hint))
errorMessage( errorMessage(
host.roomAliasErrorFormatter.format( host.roomAliasErrorFormatter.format(

6
vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
View File

@ -308,10 +308,8 @@ object ThemeUtils {
color.data color.data
} catch (e: Exception) { } catch (e: Exception) {
when (colorAttribute) { when (colorAttribute) {
android.R.attr.colorAccent -> ContextCompat.getColor(c, R.color.riotx_accent) android.R.attr.colorAccent -> ContextCompat.getColor(c, R.color.accent_sc)
R.attr.colorAccent -> ContextCompat.getColor(c, R.color.riotx_accent) R.attr.colorAccent -> ContextCompat.getColor(c, R.color.accent_sc)
R.attr.riotx_positive_accent -> ContextCompat.getColor(c, R.color.riotx_positive_accent)
R.attr.riotx_positive_accent_alpha12 -> ContextCompat.getColor(c, R.color.riotx_positive_accent_alpha12)
else -> { else -> {
Timber.e(e, "Unable to get color") Timber.e(e, "Unable to get color")
ContextCompat.getColor(c, android.R.color.holo_red_dark) ContextCompat.getColor(c, android.R.color.holo_red_dark)

2
vector/src/main/res/color/button_background_tint_selector.xml
View File

@ -2,4 +2,4 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/color_primary_alpha25" android:state_enabled="false" /> <item android:color="@color/color_primary_alpha25" android:state_enabled="false" />
<item android:color="?colorPrimary" android:state_enabled="true" /> <item android:color="?colorPrimary" android:state_enabled="true" />
</selector> </selector>

5
vector/src/main/res/color/button_background_tint_selector_sc.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/accent_sc_alpha25" android:state_enabled="false" />
<item android:color="@color/accent_sc" android:state_enabled="true" />
</selector>

2
vector/src/main/res/layout/fragment_attachments_preview.xml
View File

@ -68,7 +68,7 @@
android:layout_margin="16dp" android:layout_margin="16dp"
android:contentDescription="@string/send" android:contentDescription="@string/send"
android:src="@drawable/ic_send" android:src="@drawable/ic_send"
app:tint="?attr/riotx_text_primary" app:tint="?vctr_content_primary"
app:layout_constraintBottom_toTopOf="@id/attachmentPreviewerBottomContainer" app:layout_constraintBottom_toTopOf="@id/attachmentPreviewerBottomContainer"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/attachmentPreviewerBottomContainer" /> app:layout_constraintTop_toTopOf="@id/attachmentPreviewerBottomContainer" />

4
vector/src/main/res/layout/fragment_login_server_selection.xml
View File

@ -64,7 +64,7 @@
android:gravity="start" android:gravity="start"
android:text="@string/login_connect_using_matrix_id_title_sc" android:text="@string/login_connect_using_matrix_id_title_sc"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textColor="?riotx_text_primary" android:textColor="?vctr_content_primary"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/loginServerIKnowMyIdSubmitText" app:layout_constraintBottom_toTopOf="@+id/loginServerIKnowMyIdSubmitText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -107,7 +107,7 @@
android:gravity="start" android:gravity="start"
android:text="@string/login_server_other_title_sc" android:text="@string/login_server_other_title_sc"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textColor="?riotx_text_primary" android:textColor="?vctr_content_primary"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText" app:layout_constraintBottom_toTopOf="@+id/loginServerChoiceOtherText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

6
vector/src/main/res/layout/fragment_prompt_simplified_mode.xml
View File

@ -4,7 +4,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="match_parent" android:layout_height="match_parent"
android:background="?riotx_background"> android:background="?android:colorBackground">
<androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView"> <androidx.core.widget.NestedScrollView style="@style/LoginFormScrollView">
@ -65,7 +65,7 @@
android:gravity="start" android:gravity="start"
android:text="@string/prompt_simplified_mode_on" android:text="@string/prompt_simplified_mode_on"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textColor="?riotx_text_primary" android:textColor="?vctr_content_primary"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOnText" app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOnText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@ -109,7 +109,7 @@
android:gravity="start" android:gravity="start"
android:text="@string/prompt_simplified_mode_off" android:text="@string/prompt_simplified_mode_off"
android:textAppearance="@style/TextAppearance.Vector.Login.Text" android:textAppearance="@style/TextAppearance.Vector.Login.Text"
android:textColor="?riotx_text_primary" android:textColor="?vctr_content_primary"
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOffText" app:layout_constraintBottom_toTopOf="@+id/promptSimplifiedModeOffText"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"

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

@ -227,7 +227,7 @@
android:src="@drawable/ic_expand_more" android:src="@drawable/ic_expand_more"
app:backgroundTint="?android:colorAccent" app:backgroundTint="?android:colorAccent"
app:badgeBackgroundColor="?colorAccent" app:badgeBackgroundColor="?colorAccent"
app:badgeTextColor="@color/white" app:badgeTextColor="@android:color/white"
app:badgeTextPadding="2dp" app:badgeTextPadding="2dp"
app:badgeTextSize="10sp" app:badgeTextSize="10sp"
app:layout_constraintBottom_toTopOf="@id/badgeBarrier" app:layout_constraintBottom_toTopOf="@id/badgeBarrier"

2
vector/src/main/res/layout/item_room.xml
View File

@ -83,7 +83,7 @@
app:layout_constraintCircle="@id/roomAvatarContainer" app:layout_constraintCircle="@id/roomAvatarContainer"
app:layout_constraintCircleAngle="135" app:layout_constraintCircleAngle="135"
app:layout_constraintCircleRadius="28dp" app:layout_constraintCircleRadius="28dp"
app:tint="?riotx_text_secondary" app:tint="?vctr_content_secondary"
tools:ignore="MissingConstraints,MissingPrefix" tools:ignore="MissingConstraints,MissingPrefix"
tools:visibility="visible" /> tools:visibility="visible" />

10
vector/src/main/res/layout/item_timeline_event_base.xml
View File

@ -110,7 +110,7 @@
android:layout_toStartOf="@id/bubbleMessageTimeView" android:layout_toStartOf="@id/bubbleMessageTimeView"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="?riotx_text_primary" android:textColor="?vctr_content_primary"
android:textSize="15sp" android:textSize="15sp"
android:textStyle="bold" android:textStyle="bold"
tools:text="@sample/matrix.json/data/displayName" /> tools:text="@sample/matrix.json/data/displayName" />
@ -123,7 +123,7 @@
android:layout_alignEnd="@id/viewStubContainer" android:layout_alignEnd="@id/viewStubContainer"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:maxLines="1" android:maxLines="1"
android:textColor="?riotx_text_secondary" android:textColor="?vctr_content_secondary"
android:textSize="12sp" android:textSize="12sp"
tools:text="@tools:sample/date/hhmm" /> tools:text="@tools:sample/date/hhmm" />
@ -198,7 +198,7 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="0dp" android:layout_marginEnd="0dp"
android:maxLines="1" android:maxLines="1"
android:textColor="?riotx_text_secondary" android:textColor="?vctr_content_secondary"
android:textSize="12sp" android:textSize="12sp"
tools:text="@tools:sample/date/hhmm" /> tools:text="@tools:sample/date/hhmm" />
--> -->
@ -222,7 +222,7 @@
android:paddingStart="4dp" android:paddingStart="4dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:maxLines="1" android:maxLines="1"
tools:textColor="?riotx_text_secondary" tools:textColor="?vctr_content_secondary"
android:textSize="12sp" android:textSize="12sp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
tools:text="@tools:sample/date/hhmm" /> tools:text="@tools:sample/date/hhmm" />
@ -236,7 +236,7 @@
android:paddingStart="4dp" android:paddingStart="4dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:layout_gravity="bottom" android:layout_gravity="bottom"
tools:tint="?riotx_text_secondary" tools:tint="?vctr_content_secondary"
tools:src="@drawable/ic_processing_msg" tools:src="@drawable/ic_processing_msg"
android:contentDescription="@string/footer_read_receipt_content_description" /> android:contentDescription="@string/footer_read_receipt_content_description" />
</LinearLayout> </LinearLayout>

2
vector/src/main/res/values-v23/theme_sc.xml
View File

@ -18,7 +18,7 @@
</style> </style>
<style name="AppTheme.SC.Light.v23" parent="AppTheme.Base.SC.Light"> <style name="AppTheme.SC.Light.v23" parent="AppTheme.Base.SC.Light">
<item name="android:statusBarColor">@color/riotx_header_panel_background_light</item> <item name="android:statusBarColor">@color/android_status_bar_background_light</item>
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
</style> </style>

2
vector/src/main/res/values/attrs_sc.xml
View File

@ -7,8 +7,6 @@
<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_positive_accent" format="color" />
<attr name="riotx_positive_accent_alpha12" format="color" />
<attr name="riotx_toolbar_bg" 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" />

4
vector/src/main/res/values/styles_login.xml
View File

@ -35,12 +35,12 @@
<item name="android:paddingBottom">32dp</item> <item name="android:paddingBottom">32dp</item>
</style> </style>
<style name="Style.Vector.Login.Button" parent="VectorButtonStyle.SC"> <style name="Style.Vector.Login.Button" parent="VectorButtonStyle">
<item name="android:minHeight">52dp</item> <item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>
<style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined.SC"> <style name="Style.Vector.Login.Button.Outlined" parent="VectorButtonStyleOutlined">
<item name="android:minHeight">52dp</item> <item name="android:minHeight">52dp</item>
<item name="android:textAllCaps">false</item> <item name="android:textAllCaps">false</item>
</style> </style>

30
vector/src/main/res/values/styles_sc.xml
View File

@ -1,24 +1,19 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="VectorButtonStyle.SC">
<item name="backgroundTint">@color/button_background_tint_selector_sc</item>
</style>
<style name="VectorAlertDialogStyleDark.SC"> <style name="VectorAlertDialogStyleDark.SC">
<item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle.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="colorOnSurface">@color/text_color_primary_sc</item>
<item name="colorError">@color/element_alert_dark</item>
</style> </style>
<style name="VectorAlertDialogStyleLight.SC"> <style name="VectorAlertDialogStyleLight.SC">
<item name="buttonBarButtonStyle">@style/VectorAlertDialogButtonStyle.SC</item> <item name="colorPrimary">@color/accent_sc</item>
<item name="colorSecondary">@color/accent_sc</item> <item name="colorSecondary">@color/accent_sc</item>
</style> </style>
<style name="VectorAlertDialogButtonStyle.SC">
<item name="android:textColor">?colorAccent</item>
</style>
<!-- custom action bar --> <!-- custom action bar -->
<style name="Vector.Styled.ActionBar.SC"> <style name="Vector.Styled.ActionBar.SC">
<item name="android:background">@color/background_dark_sc</item> <item name="android:background">@color/background_dark_sc</item>
@ -27,11 +22,16 @@
<!-- BottomSheet theming --> <!-- BottomSheet theming -->
<style name="Vector.BottomSheet.SC" parent="Vector.BottomSheet.Dark"> <style name="Vector.BottomSheet.SC" parent="Vector.BottomSheet.Dark">
<item name="colorPrimary">@color/text_color_primary_sc</item>
<item name="colorSecondary">@color/text_color_secondary_sc</item>
<item name="colorSurface">@color/background_floating_sc</item>
<item name="colorOnSurface">@color/text_color_primary_sc</item>
<item name="colorError">@color/element_alert_dark</item>
<!-- Default color for text View -->
<item name="android:textColorTertiary">@color/text_color_primary_sc</item>
<item name="android:textColorLink">@color/element_link_dark</item>
<item name="android:textColorPrimary">@color/text_color_primary_sc</item> <item name="android:textColorPrimary">@color/text_color_primary_sc</item>
<item name="android:textColorSecondary">@color/text_color_secondary_sc</item> <item name="android:textColorSecondary">@color/text_color_secondary_sc</item>
<!-- Default color for text View -->
<item name="android:textColorTertiary">@color/text_color_tertiary_sc</item>
<item name="android:textColorLink">@color/link_color_dark</item>
<!-- 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>
@ -43,8 +43,4 @@
<item name="colorAccent">@color/accent_sc</item> <item name="colorAccent">@color/accent_sc</item>
</style> </style>
<style name="VectorButtonStyleOutlined.SC">
<item name="strokeColor">@color/button_background_tint_selector_sc</item>
</style>
</resources> </resources>

6
vector/src/main/res/values/theme_dark.xml
View File

@ -129,10 +129,8 @@
<!-- 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_positive_accent">@color/riotx_positive_accent</item> <item name="riotx_toolbar_bg">?android:colorBackground</item>
<item name="riotx_positive_accent_alpha12">@color/riotx_positive_accent_alpha12</item> <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_dark</item>
<item name="riotx_toolbar_bg">?riotx_background</item>
<item name="riotx_unread_unimportant_room_badge">@color/riotx_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>

8
vector/src/main/res/values/theme_light.xml
View File

@ -17,7 +17,7 @@
<!-- other colors --> <!-- other colors -->
<item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item> <item name="vctr_home_drawer_header_background">@color/vctr_home_drawer_header_background_light</item>
<item name="vctr_unread_room_badge">@color/vctr_unread_room_badge_light</item> <item name="vctr_unread_room_badge">?colorPrimary</item>
<item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_light</item> <item name="vctr_fab_label_bg">@color/vctr_fab_label_bg_light</item>
<item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_light</item> <item name="vctr_fab_label_stroke">@color/vctr_fab_label_stroke_light</item>
<item name="vctr_fab_label_color">@color/vctr_fab_label_color_light</item> <item name="vctr_fab_label_color">@color/vctr_fab_label_color_light</item>
@ -129,10 +129,8 @@
<!-- 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_positive_accent">@color/riotx_positive_accent</item> <item name="riotx_toolbar_bg">?android:colorBackground</item>
<item name="riotx_positive_accent_alpha12">@color/riotx_positive_accent_alpha12</item> <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item>
<item name="riotx_toolbar_bg">?riotx_background</item>
<item name="riotx_unread_unimportant_room_badge">@color/riotx_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>

187
vector/src/main/res/values/theme_sc.xml
View File

@ -3,134 +3,82 @@
<!-- SC THEME COLORS --> <!-- SC THEME COLORS -->
<style name="AppTheme.Base.SC" parent="AppTheme.Base.Black"> <style name="AppTheme.Base.SC" parent="AppTheme.Base.Black">
<!-- Riotx attribute for palette --> <!-- Element attribute for palette -->
<item name="riotx_background">@color/background_black_sc</item> <!-- content colors -->
<item name="vctr_home_drawer_header_background">?riotx_background</item> <item name="vctr_content_primary">@color/text_color_primary_sc</item>
<item name="riotx_header_panel_background">@color/background_black_sc</item> <item name="vctr_content_secondary">@color/text_color_secondary_sc</item>
<item name="riotx_header_panel_border_mobile">#20ffffff</item> <item name="vctr_content_tertiary">@color/text_color_tertiary_sc</item>
<item name="riotx_header_panel_text_secondary">@color/text_color_secondary_sc</item> <item name="vctr_content_quaternary">@color/text_color_disabled_sc</item>
<item name="riotx_text_primary">@color/text_color_primary_sc</item> <item name="vctr_content_quinary">@color/text_color_disabled_sc</item>
<item name="riotx_text_secondary">@color/text_color_secondary_sc</item>
<item name="riotx_text_tertiary">@color/text_color_tertiary_sc</item>
<item name="riotx_text_primary_body_contrast">@color/text_color_primary_sc</item>
<item name="riotx_android_secondary">@color/text_color_secondary_sc</item>
<item name="riotx_unread_room_indent">@color/background_dark_sc</item>
<item name="riotx_unread_room_badge">?colorAccent</item>
<item name="riotx_fab_label_bg">@color/background_floating_sc</item>
<item name="riotx_fab_label_stroke">@color/black</item>
<item name="riotx_fab_label_color">#ffffff</item>
<item name="riotx_touch_guard_bg">@color/background_touch_guard_sc</item>
<item name="riotx_attachment_selector_background">?riotx_background</item>
<item name="riotx_attachment_selector_border">@color/background_dark_sc</item>
<item name="riotx_keys_backup_banner_accent_color">@color/background_floating_sc</item> <!-- system colors -->
<item name="vctr_system">@color/background_dark_sc</item>
<item name="riotx_bottom_nav_icon_color">#ff808080</item> <!-- other colors -->
<item name="vctr_home_drawer_header_background">?android:colorBackground</item>
<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes --> <item name="vctr_unread_room_badge">?colorAccent</item>
<item name="colorPrimary">@color/accent_sc</item> <item name="vctr_fab_label_bg">@color/background_floating_sc</item>
<item name="colorPrimaryVariant">@color/background_dark_sc</item> <item name="vctr_fab_label_stroke">@android:color/black</item>
<item name="colorOnPrimary">@color/black</item> <item name="vctr_fab_label_color">@android:color/white</item>
<!-- We do not use color secondary, default will be colorPrimary values: It does not work so declare again the value --> <item name="vctr_touch_guard_bg">@color/background_touch_guard_sc</item>
<item name="colorSecondary">@color/accent_sc</item> <item name="vctr_keys_backup_banner_accent_color">@color/background_floating_sc</item>
<item name="colorSecondaryVariant">@color/background_black_sc</item> <item name="vctr_attachment_selector_background">?colorBackgroundFloating</item>
<item name="colorOnSecondary">@color/white</item> <item name="vctr_attachment_selector_border">@color/background_dark_sc</item>
<item name="colorError">@color/riotx_notice</item> <item name="vctr_room_active_widgets_banner_bg">@color/background_floating_sc</item>
<item name="colorOnError">#FFFFFF</item> <item name="vctr_room_active_widgets_banner_text">?vctr_content_secondary</item>
<!--item name="colorSurface">#FFFFFF</item> <item name="vctr_reaction_background_off">@color/background_sc</item>
<item name="colorOnSurface">#212121</item--> <item name="vctr_reaction_background_on">@color/sc_reaction_background_on_dark</item>
<item name="android:colorBackground">?riotx_background</item> <item name="vctr_bottom_nav_icon_color">#ff808080</item>
<item name="colorOnBackground">?riotx_text_primary</item> <item name="vctr_waiting_background_color">#555555</item>
<item name="vctr_chat_effect_snow_background">@android:color/transparent</item>
<item name="riotx_bottom_sheet_background">@color/background_dark_sc</item>
<!-- Keep color accent for legacy widget-->
<item name="colorAccent">@color/accent_sc</item>
<item name="android:colorAccent">@color/accent_sc</item>
<item name="materialButtonStyle">@style/VectorButtonStyle.SC</item>
<item name="toolbarStyle">@style/VectorToolbarStyle</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyleDark.SC</item>
<!-- Menu text color -->
<item name="android:actionMenuTextColor">?colorAccent</item>
<!-- default background color -->
<item name="riotx_bottom_nav_background_color">@color/background_dark_sc</item>
<item name="riotx_bottom_nav_background_border_color">@color/background_black_sc</item>
<!-- waiting view background -->
<item name="riotx_waiting_background_color">#55555555</item>
<!-- application bar text color -->
<item name="vctr_toolbar_primary_text_color">@color/text_color_primary_sc</item>
<item name="vctr_toolbar_secondary_text_color">@color/text_color_secondary_sc</item>
<item name="vctr_toolbar_link_text_color">@color/link_color_dark</item>
<!-- room message colors --> <!-- room message colors -->
<!--Unread Room Indent--> <item name="vctr_notice_secondary">?vctr_content_secondary</item>
<item name="vctr_notice_secondary">@color/text_color_secondary_sc</item> <item name="vctr_unsent_message_text_color">?colorError</item>
<item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item> <item name="vctr_message_text_color">?vctr_content_primary</item>
<item name="vctr_message_text_color">@android:color/white</item> <item name="vctr_notice_text_color">?vctr_content_primary</item>
<item name="vctr_notice_text_color">@color/text_color_primary_sc</item>
<item name="vctr_encrypting_message_text_color">@color/accent_sc</item> <item name="vctr_encrypting_message_text_color">@color/accent_sc</item>
<item name="vctr_sending_message_text_color">@color/text_color_secondary_sc</item> <item name="vctr_sending_message_text_color">?vctr_content_secondary</item>
<item name="vctr_markdown_block_background_color">@android:color/black</item> <item name="vctr_markdown_block_background_color">@android:color/black</item>
<item name="vctr_spoiler_background_color">#FFFFFFFF</item> <item name="vctr_spoiler_background_color">#FFFFFFFF</item>
<item name="riot_primary_text_color">@color/text_color_primary_sc</item> <!-- Some alias -->
<item name="riot_primary_text_color_disabled">@color/text_color_disabled_sc</item> <item name="vctr_header_background">?vctr_content_quinary</item>
<item name="vctr_list_separator">@color/background_black_sc</item>
<item name="vctr_list_separator_system">?vctr_system</item>
<item name="vctr_list_separator_on_surface">?vctr_system</item>
<!-- list colors --> <!-- Material color -->
<!--Header/Panel Background--> <item name="colorPrimary">?colorAccent</item>
<item name="vctr_list_header_background_color">@color/background_dark_sc</item> <item name="colorPrimaryVariant">?colorAccent</item>
<item name="colorOnPrimary">?vctr_content_primary</item>
<item name="colorSecondary">?colorAccent</item>
<item name="colorSecondaryVariant">?colorAccent</item>
<item name="colorOnSecondary">?vctr_content_primary</item>
<item name="colorError">@color/element_alert_dark</item>
<item name="colorOnError">?vctr_content_primary</item>
<item name="colorSurface">@color/element_system_dark</item>
<item name="colorOnSurface">?vctr_content_primary</item>
<item name="android:colorBackground">@color/background_dark_sc</item>
<item name="colorOnBackground">?vctr_content_primary</item>
<item name="riotx_list_bottom_sheet_divider_color">#1fffffff</item> <!-- TODO styles? -->
<item name="vctr_list_divider_color">@color/background_dark_sc</item>
<!-- room notification text color (typing, unsent...) --> <item name="android:textColorLink">@color/element_link_dark</item>
<!--Notice (secondary)-->
<item name="vctr_room_notification_text_color">@color/text_color_secondary_sc</item>
<!-- icon colors --> <!-- Menu text color -->
<item name="vctr_settings_icon_tint_color">@android:color/white</item> <item name="android:actionMenuTextColor">?colorSecondary</item>
<item name="vctr_icon_tint_on_light_action_bar_color">@color/accent_sc</item>
<item name="list_divider_color">@color/list_divider_color_sc</item> <!-- Default color for text View -->
<item name="android:textColorTertiary">?vctr_content_tertiary</item>
<!-- activities background --> <!-- TODO styles? -->
<item name="android:windowBackground">?riotx_background</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>
<item name="actionBarStyle">@style/Vector.Styled.ActionBar.SC</item> <item name="actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
<!-- actionbar icons color -->
<item name="actionBarTheme">@style/Vector.ActionBarTheme</item>
<!-- remove the shadow under the actionbar -->
<item name="android:windowContentOverlay">@null</item>
<item name="android:popupMenuStyle">@style/Vector.PopupMenu</item>
<!-- no divider -->
<item name="android:actionBarDivider">@null</item>
<!-- tabbar background -->
<item name="android:actionBarTabStyle">@style/Vector.TabView</item>
<item name="actionBarTabStyle">@style/Vector.TabView</item>
<!-- tabbar text color -->
<item name="android:actionBarTabTextStyle">@style/Vector.TabText</item>
<item name="actionBarTabTextStyle">@style/Vector.TabText</item>
<item name="tab_bar_selected_background_color">@color/background_dark_sc</item>
<item name="tab_bar_unselected_background_color">@color/background_dark_sc</item>
<!-- Preference -->
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC</item> <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC</item>
<!-- SnackBar --> <!-- SnackBar -->
@ -142,34 +90,23 @@
<item name="snackbarTextViewStyle">@style/VectorSnackBarText</item> <item name="snackbarTextViewStyle">@style/VectorSnackBarText</item>
<!-- SC additions --> <!-- SC additions -->
<item name="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_positive_accent">@color/accent_sc</item> <item name="riotx_toolbar_bg">?android:colorBackground</item>
<item name="riotx_positive_accent_alpha12">@color/accent_sc_alpha12</item>
<item name="riotx_toolbar_bg">?riotx_background</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="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined.SC</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>
<!-- enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<!-- specify shared element enter and exit transitions -->
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="riotx_reaction_background_off">@color/background_sc</item>
<item name="riotx_reaction_background_on">@color/sc_reaction_background_on_dark</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="riotx_toolbar_bg">@color/background_sc</item>
<item name="riotx_background">@color/background_dark_sc</item> <item name="android:colorBackground">@color/background_dark_sc</item>
<item name="vctr_home_drawer_header_background">@color/background_sc</item> <item name="vctr_home_drawer_header_background">@color/background_sc</item>
<item name="riotx_header_panel_background">@color/background_sc</item> <item name="vctr_header_background">@color/background_sc</item>
<item name="android:statusBarColor">@color/background_dark_sc</item> <item name="android:statusBarColor">@color/background_dark_sc</item>
<item name="android:navigationBarColor">@color/background_black_sc</item> <item name="android:navigationBarColor">@color/background_black_sc</item>

22
vector/src/main/res/values/theme_sc_light.xml
View File

@ -3,21 +3,18 @@
<!-- SC THEME COLORS --> <!-- SC THEME COLORS -->
<style name="AppTheme.Base.SC.Light" parent="AppTheme.Base.Light"> <style name="AppTheme.Base.SC.Light" parent="AppTheme.Base.Light">
<!-- Material color: Note: this block should be the same in all theme because it references only common colors and ?riotx attributes -->
<item name="colorPrimary">@color/accent_sc</item> <item name="colorPrimary">@color/accent_sc</item>
<item name="colorPrimaryVariant">@color/accent_sc</item>
<item name="colorSecondary">@color/accent_sc</item> <item name="colorSecondary">@color/accent_sc</item>
<item name="colorSecondaryVariant">@color/accent_sc</item>
<!-- 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="materialButtonStyle">@style/VectorButtonStyle.SC</item>
<item name="alertDialogTheme">@style/VectorAlertDialogStyleLight.SC</item> <item name="alertDialogTheme">@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>
<!-- icon colors -->
<item name="vctr_icon_tint_on_light_action_bar_color">@color/accent_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>
<item name="actionBarStyle">@style/Vector.Styled.ActionBar.SC</item> <item name="actionBarStyle">@style/Vector.Styled.ActionBar.SC</item>
@ -25,19 +22,16 @@
<!-- 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_positive_accent">@color/accent_sc</item> <item name="riotx_toolbar_bg">?android:colorBackground</item>
<item name="riotx_positive_accent_alpha12">@color/accent_sc_alpha12</item> <item name="riotx_unread_unimportant_room_badge">@color/vctr_unread_room_badge_light</item>
<item name="riotx_toolbar_bg">?riotx_background</item>
<item name="riotx_unread_unimportant_room_badge">?riotx_header_panel_text_secondary</item>
<item name="colorAccentPale">@color/accent_sc_pale</item> <item name="colorAccentPale">@color/accent_sc_pale</item>
<item name="vectorButtonStyleOutlined">@style/VectorButtonStyleOutlined.SC</item>
<item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item> <item name="bottomSheetDialogTheme">@style/Vector.BottomSheet.SC.Light</item>
<item name="riotx_unread_room_badge">?colorAccent</item> <item name="vctr_unread_room_badge">?colorAccent</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/riotx_header_panel_background_dark</item> <item name="android:statusBarColor">@color/background_black_sc</item>
<!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ --> <!-- Use dark color, to have enough contrast with icons color. windowLightNavigationBar is only available in API 27+ -->
<item name="android:navigationBarColor">@color/background_black_sc</item> <item name="android:navigationBarColor">@color/background_black_sc</item>
@ -48,8 +42,8 @@
<item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item> <item name="android:windowSharedElementEnterTransition">@transition/image_preview_transition</item>
<item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item> <item name="android:windowSharedElementExitTransition">@transition/image_preview_transition</item>
<item name="riotx_reaction_background_off">@color/riotx_reaction_background_off_light</item> <item name="vctr_reaction_background_off">@color/vctr_reaction_background_off_light</item>
<item name="riotx_reaction_background_on">@color/sc_reaction_background_on_light</item> <item name="vctr_reaction_background_on">@color/sc_reaction_background_on_light</item>
</style> </style>
<!-- Default AppTheme for usage where settings don't apply --> <!-- Default AppTheme for usage where settings don't apply -->