mirror of
https://github.com/element-hq/element-android
synced 2024-11-24 02:15:35 +03:00
Merge pull request #1880 from vector-im/feature/theme_cleanup
Feature/theme cleanup
This commit is contained in:
Benoit Marty
GitHub
commit
247a34438b
80 changed files with 106 additions and 886 deletions
|
|
@ -23,7 +23,6 @@ import androidx.recyclerview.widget.RecyclerView
|
|||
import com.airbnb.epoxy.EpoxyController
|
||||
import com.airbnb.epoxy.EpoxyVisibilityTracker
|
||||
import im.vector.app.R
|
||||
import im.vector.app.features.themes.ThemeUtils
|
||||
|
||||
/**
|
||||
* Apply a Vertical LinearLayout Manager to the recyclerView and set the adapter from the epoxy controller
|
||||
|
|
@ -46,7 +45,7 @@ fun RecyclerView.configureWith(epoxyController: EpoxyController,
|
|||
if (showDivider) {
|
||||
addItemDecoration(
|
||||
DividerItemDecoration(context, DividerItemDecoration.VERTICAL).apply {
|
||||
ContextCompat.getDrawable(context, ThemeUtils.getResourceId(context, R.drawable.divider_horizontal_light))?.let {
|
||||
ContextCompat.getDrawable(context, R.drawable.divider_horizontal)?.let {
|
||||
setDrawable(it)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -20,7 +20,6 @@ import android.util.AttributeSet
|
|||
import android.view.View
|
||||
import androidx.appcompat.widget.AppCompatTextView
|
||||
import im.vector.app.R
|
||||
import im.vector.app.features.themes.ThemeUtils
|
||||
|
||||
class UnreadCounterBadgeView : AppCompatTextView {
|
||||
|
||||
|
|
@ -38,7 +37,7 @@ class UnreadCounterBadgeView : AppCompatTextView {
|
|||
val bgRes = if (state.highlighted) {
|
||||
R.drawable.bg_unread_highlight
|
||||
} else {
|
||||
ThemeUtils.getResourceId(context, R.drawable.bg_unread_notification_light)
|
||||
R.drawable.bg_unread_notification
|
||||
}
|
||||
setBackgroundResource(bgRes)
|
||||
text = RoomSummaryFormatter.formatUnreadMessagesCounter(state.count)
|
||||
|
|
|
|||
|
|
@ -22,7 +22,6 @@ import androidx.constraintlayout.motion.widget.MotionLayout
|
|||
import androidx.core.view.isVisible
|
||||
import com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||
import im.vector.app.R
|
||||
import im.vector.app.features.themes.ThemeUtils
|
||||
import kotlinx.android.synthetic.main.motion_fab_menu_merge.view.*
|
||||
|
||||
class FabMenuView @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null,
|
||||
|
|
@ -37,12 +36,6 @@ class FabMenuView @JvmOverloads constructor(context: Context, attrs: AttributeSe
|
|||
override fun onFinishInflate() {
|
||||
super.onFinishInflate()
|
||||
|
||||
// Tint label background
|
||||
listOf(createRoomItemChatLabel, createRoomItemGroupLabel)
|
||||
.forEach {
|
||||
it.setBackgroundResource(ThemeUtils.getResourceId(context, R.drawable.vector_label_background_light))
|
||||
}
|
||||
|
||||
listOf(createRoomItemChat, createRoomItemChatLabel)
|
||||
.forEach {
|
||||
it.setOnClickListener {
|
||||
|
|
|
|||
|
|
@ -164,50 +164,6 @@ object ThemeUtils {
|
|||
return null
|
||||
}
|
||||
|
||||
/**
|
||||
* Get the resource Id applied to the current theme
|
||||
*
|
||||
* @param c the context
|
||||
* @param resourceId the resource id in the light theme
|
||||
* @return the resource Id for the current theme
|
||||
*/
|
||||
// TODO Now that we are API 21, this is not necessary anymore
|
||||
fun getResourceId(c: Context, resourceId: Int): Int {
|
||||
val theme = getApplicationTheme(c)
|
||||
|
||||
return when (theme) {
|
||||
THEME_LIGHT_VALUE -> resourceId
|
||||
THEME_DARK_VALUE -> {
|
||||
return when (resourceId) {
|
||||
R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_dark
|
||||
R.drawable.bg_unread_notification_light -> R.drawable.bg_unread_notification_dark
|
||||
R.drawable.vector_label_background_light -> R.drawable.vector_label_background_dark
|
||||
R.drawable.divider_horizontal_light -> R.drawable.divider_horizontal_dark
|
||||
else -> {
|
||||
Timber.w("Warning, missing case for wanted drawable in dark theme")
|
||||
resourceId
|
||||
}
|
||||
}
|
||||
}
|
||||
THEME_BLACK_VALUE -> {
|
||||
return when (resourceId) {
|
||||
R.drawable.bg_search_edit_text_light -> R.drawable.bg_search_edit_text_black
|
||||
R.drawable.bg_unread_notification_light -> R.drawable.bg_unread_notification_black
|
||||
R.drawable.vector_label_background_light -> R.drawable.vector_label_background_black
|
||||
R.drawable.divider_horizontal_light -> R.drawable.divider_horizontal_black
|
||||
else -> {
|
||||
Timber.w("Warning, missing case for wanted drawable in black theme")
|
||||
resourceId
|
||||
}
|
||||
}
|
||||
}
|
||||
else -> {
|
||||
Timber.w("Warning, missing theme: $theme")
|
||||
resourceId
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Update the menu icons colors
|
||||
*
|
||||
|
|
|
|||
|
|
@ -0,0 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item android:color="?riot_primary_text_color" android:state_enabled="true" />
|
||||
<item android:color="?riot_primary_text_color_disabled" android:state_enabled="false" />
|
||||
</selector>
|
||||
|
|
@ -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/riot_primary_text_color_dark" android:state_enabled="true" />
|
||||
<item android:color="@color/riot_primary_text_color_disabled_dark" android:state_enabled="false" />
|
||||
</selector>
|
||||
|
|
@ -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/riot_primary_text_color_light" android:state_enabled="true" />
|
||||
<item android:color="@color/riot_secondary_text_color_light" android:state_enabled="false" />
|
||||
</selector>
|
||||
|
|
@ -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/riot_primary_text_color_status" android:state_enabled="true" />
|
||||
<item android:color="@color/riot_primary_text_color_disabled_status" android:state_enabled="false" />
|
||||
</selector>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 18 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 197 B |
Binary file not shown.
|
Before Width: | Height: | Size: 306 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 43 KiB |
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/riotx_search_background_mobile_black" />
|
||||
<corners android:radius="4dp" />
|
||||
</shape>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/riotx_search_background_mobile_dark" />
|
||||
<corners android:radius="4dp" />
|
||||
</shape>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="@color/riotx_search_background_mobile_light" />
|
||||
<corners android:radius="4dp" />
|
||||
</shape>
|
||||
|
|
@ -5,5 +5,5 @@
|
|||
|
||||
<corners android:radius="40dp" />
|
||||
|
||||
<solid android:color="@color/riotx_unread_room_badge_dark" />
|
||||
<solid android:color="?riotx_unread_room_badge" />
|
||||
</shape>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<corners android:radius="40dp" />
|
||||
|
||||
<solid android:color="@color/riotx_unread_room_badge_black" />
|
||||
</shape>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<corners android:radius="40dp" />
|
||||
|
||||
<solid android:color="@color/riotx_unread_room_badge_light" />
|
||||
</shape>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
|
||||
<!-- required on android < 4.2 devices -->
|
||||
<solid android:color="@android:color/transparent" />
|
||||
|
||||
<stroke
|
||||
android:width="4dp"
|
||||
android:color="@color/direct_chat_ring_color_black" />
|
||||
</shape>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
|
||||
<!-- required on android < 4.2 devices -->
|
||||
<solid android:color="@android:color/transparent" />
|
||||
|
||||
<stroke
|
||||
android:width="4dp"
|
||||
android:color="@color/direct_chat_ring_color_dark" />
|
||||
</shape>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
|
||||
<!-- required on android < 4.2 devices -->
|
||||
<solid android:color="@android:color/transparent" />
|
||||
|
||||
<stroke
|
||||
android:width="4dp"
|
||||
android:color="@color/direct_chat_ring_color_light" />
|
||||
</shape>
|
||||
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="oval">
|
||||
|
||||
<!-- required on android < 4.2 devices -->
|
||||
<solid android:color="@android:color/transparent" />
|
||||
|
||||
<stroke
|
||||
android:width="4dp"
|
||||
android:color="@color/direct_chat_ring_color_status" />
|
||||
</shape>
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<size android:height="1dp" />
|
||||
<solid android:color="@color/riotx_header_panel_border_mobile_dark" />
|
||||
<solid android:color="?riotx_header_panel_border_mobile" />
|
||||
</shape>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<size android:height="1dp" />
|
||||
<solid android:color="@color/riotx_header_panel_border_mobile_black" />
|
||||
</shape>
|
||||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<size android:height="1dp" />
|
||||
<solid android:color="@color/riotx_header_panel_border_mobile_light" />
|
||||
</shape>
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
<item android:left="6dp" android:right="2dp">
|
||||
<shape>
|
||||
<corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
|
||||
<solid android:color="@color/riotx_header_panel_background_dark" />
|
||||
<solid android:color="?riotx_header_panel_background" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:state_checked="true">
|
||||
|
||||
<layer-list>
|
||||
|
||||
<!-- Draw the BG. -->
|
||||
<item android:left="6dp" android:right="2dp">
|
||||
<shape>
|
||||
<corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
|
||||
<solid android:color="@color/riotx_header_panel_background_black" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item android:gravity="start" android:left="2dp">
|
||||
<shape>
|
||||
<size android:width="4dp" />
|
||||
<corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
|
||||
<solid android:color="@color/riotx_accent" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
|
||||
</item>
|
||||
|
||||
<item android:state_checked="false">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
|
||||
</selector>
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item android:state_checked="true">
|
||||
|
||||
<layer-list>
|
||||
|
||||
<!-- Draw the BG. -->
|
||||
<item android:left="6dp" android:right="2dp">
|
||||
<shape>
|
||||
<corners android:bottomRightRadius="4dp" android:topRightRadius="4dp" />
|
||||
<solid android:color="@color/riotx_header_panel_background_light" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item android:gravity="start" android:left="2dp">
|
||||
<shape>
|
||||
<size android:width="4dp" />
|
||||
<corners android:bottomLeftRadius="40dp" android:topLeftRadius="40dp" />
|
||||
<solid android:color="@color/riotx_accent" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
||||
|
||||
</item>
|
||||
|
||||
<item android:state_checked="false">
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/transparent" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
|
||||
</selector>
|
||||
|
|
@ -6,6 +6,6 @@
|
|||
android:width="1dp"
|
||||
android:height="1dp" />
|
||||
|
||||
<solid android:color="@color/list_divider_color_dark" />
|
||||
<solid android:color="?list_divider_color" />
|
||||
|
||||
</shape>
|
||||
|
|
@ -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_light" />
|
||||
|
||||
</shape>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="#343a46" />
|
||||
</shape>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="#1A000000" />
|
||||
</shape>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="#1A000000" />
|
||||
</shape>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="#1A000000" />
|
||||
</shape>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="#1A000000" />
|
||||
</shape>
|
||||
|
|
@ -2,5 +2,5 @@
|
|||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="#343a46" />
|
||||
<solid android:color="?riotx_header_panel_border_mobile" />
|
||||
</shape>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="@color/riotx_header_panel_border_mobile_black" />
|
||||
</shape>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="@color/riotx_header_panel_border_mobile_dark" />
|
||||
</shape>
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="10dp" />
|
||||
<solid android:color="@color/riotx_header_panel_border_mobile_light" />
|
||||
</shape>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<gradient
|
||||
android:angle="90"
|
||||
android:endColor="#1a1a1a"
|
||||
android:startColor="#212121"
|
||||
android:type="linear" />
|
||||
</shape>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<gradient
|
||||
android:angle="90"
|
||||
android:endColor="#c0c0c0"
|
||||
android:startColor="#e1e1e1"
|
||||
android:type="linear" />
|
||||
</shape>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<gradient
|
||||
android:angle="90"
|
||||
android:endColor="#212121"
|
||||
android:startColor="#1a1a1a" />
|
||||
</shape>
|
||||
|
|
@ -1,8 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<gradient
|
||||
android:angle="90"
|
||||
android:endColor="#e1e1e1"
|
||||
android:startColor="#d3d3d3" />
|
||||
</shape>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="#4d4d4d" />
|
||||
<padding
|
||||
android:bottom="4dp"
|
||||
android:left="16dp"
|
||||
android:right="16dp"
|
||||
android:top="4dp" />
|
||||
<corners android:radius="3dp" />
|
||||
</shape>
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="#FFF2F2F2" />
|
||||
<padding
|
||||
android:bottom="4dp"
|
||||
android:left="16dp"
|
||||
android:right="16dp"
|
||||
android:top="4dp" />
|
||||
<corners android:radius="3dp" />
|
||||
</shape>
|
||||
|
|
@ -4,10 +4,10 @@
|
|||
|
||||
<corners android:radius="3dp" />
|
||||
|
||||
<solid android:color="@color/riotx_fab_label_bg_light" />
|
||||
<solid android:color="?riotx_fab_label_bg" />
|
||||
|
||||
<stroke
|
||||
android:width="0.5dp"
|
||||
android:color="#1EFFFFFF" />
|
||||
android:color="?riotx_fab_label_stroke" />
|
||||
|
||||
</shape>
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<corners android:radius="3dp" />
|
||||
|
||||
<solid android:color="@color/riotx_fab_label_bg_black" />
|
||||
|
||||
<stroke
|
||||
android:width="0.5dp"
|
||||
android:color="@color/black" />
|
||||
|
||||
</shape>
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
|
||||
<corners android:radius="3dp" />
|
||||
|
||||
<solid android:color="@color/riotx_fab_label_bg_dark" />
|
||||
|
||||
<stroke
|
||||
android:width="0.5dp"
|
||||
android:color="@color/black" />
|
||||
|
||||
</shape>
|
||||
21
vector/src/main/res/drawable/vector_tabbar_background.xml
Normal file
21
vector/src/main/res/drawable/vector_tabbar_background.xml
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Pressed -->
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
</selector>
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Pressed -->
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_dark" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_dark" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
</selector>
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Pressed -->
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
</selector>
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Pressed -->
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_light" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_light" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
</selector>
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<selector xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="false" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="false" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="true" android:state_pressed="false" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="true" android:state_pressed="false" android:state_selected="true" />
|
||||
|
||||
<!-- Pressed -->
|
||||
<!-- Non focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="false" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="false" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
<!-- Focused states -->
|
||||
<item android:drawable="@drawable/vector_tabbar_unselected_background_status" android:state_focused="true" android:state_pressed="true" android:state_selected="false" />
|
||||
<item android:drawable="@drawable/vector_tabbar_selected_background_status" android:state_focused="true" android:state_pressed="true" android:state_selected="true" />
|
||||
|
||||
</selector>
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/riotx_accent" />
|
||||
<padding android:bottom="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="?tab_bar_selected_background_color" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/list_divider_color_dark" />
|
||||
<padding android:bottom="1dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/white" />
|
||||
<padding android:bottom="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/tab_bar_selected_background_color_dark" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/list_divider_color_light" />
|
||||
<padding android:bottom="1dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/white" />
|
||||
<padding android:bottom="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/tab_groups" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/list_divider_color_light" />
|
||||
<padding android:bottom="1dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/white" />
|
||||
<padding android:bottom="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/tab_bar_selected_background_color_light" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -1,22 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/list_divider_color_light" />
|
||||
<padding android:bottom="1dp" />
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@android:color/white" />
|
||||
<padding android:bottom="2dp" />
|
||||
</shape>
|
||||
</item>
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/tab_bar_selected_background_color_status" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/tab_groups" />
|
||||
<solid android:color="?tab_bar_unselected_background_color" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/tab_bar_unselected_background_color_dark" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/tab_bar_unselected_background_color_light" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -1,9 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid android:color="@color/tab_bar_unselected_background_color_status" />
|
||||
</shape>
|
||||
</item>
|
||||
</layer-list>
|
||||
|
|
@ -13,7 +13,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_alignBottom="@+id/informationBottom"
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="?riotx_highlighted_message_background" />
|
||||
android:background="@drawable/highlighted_message_background" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/messageAvatarImageView"
|
||||
|
|
|
|||
|
|
@ -12,7 +12,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_alignBottom="@+id/readReceiptsView"
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="?riotx_highlighted_message_background" />
|
||||
android:background="@drawable/highlighted_message_background" />
|
||||
|
||||
<View
|
||||
android:id="@+id/messageStartGuideline"
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
android:layout_height="match_parent"
|
||||
android:layout_alignBottom="@+id/informationBottom"
|
||||
android:layout_alignParentTop="true"
|
||||
android:background="?riotx_highlighted_message_background" />
|
||||
android:background="@drawable/highlighted_message_background" />
|
||||
|
||||
<View
|
||||
android:id="@+id/messageStartGuideline"
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@
|
|||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:background="?vctr_line_divider"
|
||||
android:background="@drawable/line_divider"
|
||||
app:layout_constraintBottom_toBottomOf="parent" />
|
||||
|
||||
</merge>
|
||||
|
|
@ -10,7 +10,7 @@
|
|||
android:id="@+id/receiptMore"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="18dp"
|
||||
android:background="?vctr_pill_receipt"
|
||||
android:background="@drawable/pill_receipt"
|
||||
android:gravity="center"
|
||||
android:importantForAccessibility="no"
|
||||
android:paddingStart="4dp"
|
||||
|
|
|
|||
|
|
@ -8,32 +8,21 @@
|
|||
<attr name="vctr_toolbar_secondary_text_color" format="color" />
|
||||
<attr name="vctr_toolbar_link_text_color" format="color" />
|
||||
|
||||
<!-- application bar text hint color -->
|
||||
<attr name="vctr_primary_hint_text_color" format="color" />
|
||||
|
||||
<!-- default text colors -->
|
||||
<attr name="vctr_default_text_hint_color" format="color" />
|
||||
|
||||
<!-- room message colors -->
|
||||
<attr name="vctr_unread_room_indent_color" format="color" />
|
||||
<attr name="vctr_unsent_message_text_color" format="color" />
|
||||
<attr name="vctr_message_text_color" format="color" />
|
||||
<attr name="vctr_notice_text_color" format="color" />
|
||||
<attr name="vctr_notice_secondary" format="color" />
|
||||
<attr name="vctr_encrypting_message_text_color" format="color" />
|
||||
<attr name="vctr_sending_message_text_color" format="color" />
|
||||
<attr name="vctr_highlighted_message_text_color" format="color" />
|
||||
<attr name="vctr_highlighted_searched_message_text_color" format="color" />
|
||||
<attr name="vctr_search_mode_room_name_text_color" format="color" />
|
||||
<attr name="vctr_unread_marker_line_color" format="color" />
|
||||
<attr name="vctr_markdown_block_background_color" format="color" />
|
||||
<attr name="vctr_room_activity_divider_color" format="color" />
|
||||
<attr name="vctr_spoiler_background_color" format="color" />
|
||||
|
||||
<!-- tab bar colors -->
|
||||
<attr name="vctr_tab_bar_inverted_background_color" format="color" />
|
||||
<attr name="vctr_tab_bar_selected_background_color" format="color" />
|
||||
<attr name="vctr_tab_bar_unselected_background_color" format="color" />
|
||||
|
||||
<!-- list colors -->
|
||||
<attr name="vctr_list_header_background_color" format="color" />
|
||||
|
|
@ -42,53 +31,16 @@
|
|||
|
||||
<attr name="vctr_list_divider_color" format="color" />
|
||||
|
||||
<attr name="vctr_redacted_message_color" format="color" />
|
||||
|
||||
<!-- gradient on the bottom of some activities -->
|
||||
<attr name="vctr_activity_bottom_gradient_color" format="color" />
|
||||
|
||||
<!-- outgoing call background color -->
|
||||
<attr name="vctr_pending_outgoing_view_background_color" format="color" />
|
||||
|
||||
<!-- multi selection member background color -->
|
||||
<attr name="vctr_multi_selection_background_color" format="color" />
|
||||
|
||||
<!-- sliding menu icon colors -->
|
||||
<attr name="vctr_home_navigation_icon_color" format="color" />
|
||||
|
||||
<!-- room notification text color (typing, unsent...) -->
|
||||
<attr name="vctr_room_notification_text_color" format="color" />
|
||||
|
||||
<!-- icon colors -->
|
||||
<attr name="vctr_icon_tint_on_light_action_bar_color" format="color" />
|
||||
<attr name="vctr_icon_tint_on_dark_action_bar_color" format="color" />
|
||||
<attr name="vctr_settings_icon_tint_color" format="color" />
|
||||
|
||||
<!-- Tab home colors -->
|
||||
<attr name="vctr_tab_home" format="color" />
|
||||
<attr name="vctr_tab_home_secondary" format="color" />
|
||||
|
||||
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
|
||||
<!-- dedicated drawables are created for each theme -->
|
||||
<attr name="vctr_line_divider" format="reference" />
|
||||
<attr name="vctr_shadow_bottom" format="reference" />
|
||||
<attr name="vctr_shadow_top" format="reference" />
|
||||
<attr name="vctr_tabbar_selected_background" format="reference" />
|
||||
<attr name="vctr_tabbar_unselected_background" format="reference" />
|
||||
<attr name="vctr_tabbar_background" format="reference" />
|
||||
<attr name="vctr_direct_chat_circle" format="reference" />
|
||||
|
||||
<attr name="vctr_pill_background_user_id" format="reference" />
|
||||
<attr name="vctr_pill_background_room_alias" format="reference" />
|
||||
<attr name="vctr_pill_text_color_user_id" format="reference" />
|
||||
<attr name="vctr_pill_text_color_room_alias" format="reference" />
|
||||
<attr name="vctr_pill_receipt" format="reference" />
|
||||
|
||||
<!-- Widget banner background -->
|
||||
<attr name="vctr_widget_banner_background" format="color" />
|
||||
|
||||
<attr name="riotx_highlighted_message_background" format="reference" />
|
||||
|
||||
</declare-styleable>
|
||||
|
||||
<declare-styleable name="PollResultLineView">
|
||||
|
|
|
|||
|
|
@ -12,23 +12,6 @@
|
|||
<color name="vector_silver_color">#FFC7C7C7</color>
|
||||
<color name="vector_dark_grey_color">#FF999999</color>
|
||||
|
||||
<!-- home activity tab bar color -->
|
||||
<color name="tab_favourites">#BD79CC</color>
|
||||
<color name="tab_favourites_secondary">#744C7F</color>
|
||||
<color name="tab_people">#F8A15F</color>
|
||||
<color name="tab_people_secondary">#D97051</color>
|
||||
<color name="tab_rooms">@color/accent_color_light</color>
|
||||
<color name="tab_rooms_secondary">#5EA584</color>
|
||||
<color name="tab_groups">#a6d0e5</color>
|
||||
|
||||
<color name="tab_groups_secondary">#81bddb</color>
|
||||
|
||||
<!-- color of the direct chat avatar ring (it's 50% of color accent) -->
|
||||
<color name="direct_chat_ring_color_light">#7F03b381</color>
|
||||
<color name="direct_chat_ring_color_dark">#7F03b381</color>
|
||||
<color name="direct_chat_ring_color_black">#7F03b381</color>
|
||||
<color name="direct_chat_ring_color_status">#7F586C7B</color>
|
||||
|
||||
<!-- theses colours are requested a background cannot be set by an ?attr on android < 5 -->
|
||||
<!-- dedicated drawables are created for each theme -->
|
||||
<!-- Default/Background-->
|
||||
|
|
@ -63,19 +46,22 @@
|
|||
<color name="accent_color_status">#FF586C7B</color>
|
||||
|
||||
<!--Default/Line break mobile-->
|
||||
<attr name="list_divider_color" format="color" />
|
||||
<color name="list_divider_color_light">#EEEFEF</color>
|
||||
<!--Dark/Line break mobile-->
|
||||
<color name="list_divider_color_dark">#FF61708B</color>
|
||||
<!--Black/Line break mobile-->
|
||||
<color name="list_divider_color_black">#FF22262E</color>
|
||||
|
||||
<color name="tab_bar_selected_background_color_light">@color/primary_color_light</color>
|
||||
<color name="tab_bar_selected_background_color_dark">@color/primary_color_dark</color>
|
||||
<color name="tab_bar_selected_background_color_status">@color/primary_color_status</color>
|
||||
<attr name="tab_bar_selected_background_color" format="color" />
|
||||
<color name="tab_bar_selected_background_color_light">@color/riotx_android_secondary_light</color>
|
||||
<color name="tab_bar_selected_background_color_dark">@color/riotx_android_secondary_dark</color>
|
||||
<color name="tab_bar_selected_background_color_status">@color/riotx_android_secondary_black</color>
|
||||
|
||||
<color name="tab_bar_unselected_background_color_light">@color/primary_color_light</color>
|
||||
<color name="tab_bar_unselected_background_color_dark">@color/primary_color_dark</color>
|
||||
<color name="tab_bar_unselected_background_color_status">@color/primary_color_status</color>
|
||||
<attr name="tab_bar_unselected_background_color" format="color" />
|
||||
<color name="tab_bar_unselected_background_color_light">@color/riotx_background_light</color>
|
||||
<color name="tab_bar_unselected_background_color_dark">@color/riotx_background_dark</color>
|
||||
<color name="tab_bar_unselected_background_color_status">@color/riotx_background_black</color>
|
||||
|
||||
<!-- Hint Colors -->
|
||||
<color name="primary_hint_text_color_light">#FFFFFF</color>
|
||||
|
|
@ -85,6 +71,9 @@
|
|||
<color name="default_text_hint_color_dark">#CCDDDDDD</color>
|
||||
|
||||
<!-- Text Colors -->
|
||||
<attr name="riot_primary_text_color" format="color" />
|
||||
<attr name="riot_primary_text_color_disabled" format="color" />
|
||||
|
||||
<!--Default/Text Primary-->
|
||||
<color name="riot_primary_text_color_light">#FF2E2F32</color>
|
||||
<color name="riot_primary_text_color_disabled_light">#FF9E9E9E</color>
|
||||
|
|
@ -106,10 +95,6 @@
|
|||
<color name="riot_secondary_text_color_status">#7F70808D</color>
|
||||
<color name="riot_tertiary_text_color_status">@color/riot_primary_text_color_status</color>
|
||||
|
||||
<!-- Quote Colors -->
|
||||
<color name="quote_strip_color">#FFDDDDDD</color>
|
||||
<color name="quote_background_color">@android:color/transparent</color>
|
||||
|
||||
<!-- Notification view colors -->
|
||||
<color name="soft_resource_limit_exceeded">#2f9edb</color>
|
||||
<color name="hard_resource_limit_exceeded">@color/vector_fuchsia_color</color>
|
||||
|
|
|
|||
|
|
@ -163,6 +163,11 @@
|
|||
<color name="riotx_fab_label_bg_dark">#FF181B21</color>
|
||||
<color name="riotx_fab_label_bg_black">#FF181B21</color>
|
||||
|
||||
<attr name="riotx_fab_label_stroke" format="color" />
|
||||
<color name="riotx_fab_label_stroke_light">#1EFFFFFF</color>
|
||||
<color name="riotx_fab_label_stroke_dark">@color/black</color>
|
||||
<color name="riotx_fab_label_stroke_black">@color/black</color>
|
||||
|
||||
<attr name="riotx_fab_label_color" format="color" />
|
||||
<color name="riotx_fab_label_color_light">#FF2E2F32</color>
|
||||
<color name="riotx_fab_label_color_dark">#FFA1B2D1</color>
|
||||
|
|
|
|||
|
|
@ -15,11 +15,6 @@
|
|||
<item name="contentInsetStartWithNavigation">0dp</item>
|
||||
</style>
|
||||
|
||||
<style name="VectorToolbarStyle.Group">
|
||||
<item name="android:background">@color/tab_groups</item>
|
||||
<item name="background">@color/tab_groups</item>
|
||||
</style>
|
||||
|
||||
<style name="Vector.Toolbar.Title" parent="TextAppearance.Widget.AppCompat.Toolbar.Title">
|
||||
<item name="android:textSize">20sp</item>
|
||||
<item name="android:fontFamily">"sans-serif-medium"</item>
|
||||
|
|
@ -270,24 +265,6 @@
|
|||
<item name="android:textSize">14sp</item>
|
||||
</style>
|
||||
|
||||
<!--style name="Floating_Action_Button">
|
||||
<item name="fab_labelsPosition">left</item>
|
||||
</style-->
|
||||
|
||||
<style name="Floating_Actions_Menu">
|
||||
<item name="android:background">@drawable/vector_background_fab_label</item>
|
||||
<item name="android:textColor">?android:attr/textColorPrimary</item>
|
||||
</style>
|
||||
|
||||
<style name="Floating_Actions_Menu.Light">
|
||||
<item name="android:background">@drawable/vector_background_fab_label_light</item>
|
||||
</style>
|
||||
|
||||
<style name="Vector.TabView.Group" parent="Widget.AppCompat.ActionBar.TabView">
|
||||
<item name="android:background">@drawable/vector_tabbar_background_group_light</item>
|
||||
<item name="background">@drawable/vector_tabbar_background_group_light</item>
|
||||
</style>
|
||||
|
||||
<!-- Linear Layout orientation, depending on screen size. Vertical by default -->
|
||||
<style name="VectorLinearLayout">
|
||||
<item name="android:gravity">end</item>
|
||||
|
|
@ -340,8 +317,7 @@
|
|||
<item name="android:paddingBottom">4dp</item>
|
||||
<item name="android:textSize">15sp</item>
|
||||
<item name="android:textColor">?riotx_fab_label_color</item>
|
||||
<!-- Note bg will be updated in the code -->
|
||||
<item name="android:background">@drawable/vector_label_background_light</item>
|
||||
<item name="android:background">@drawable/vector_label_background</item>
|
||||
</style>
|
||||
|
||||
<style name="BottomSheetItemTextMain">
|
||||
|
|
@ -395,4 +371,9 @@
|
|||
<item name="android:textColor">?vctr_message_text_color</item>
|
||||
</style>
|
||||
|
||||
<style name="Vector.TabView" parent="Widget.AppCompat.ActionBar.TabView">
|
||||
<item name="android:background">@drawable/vector_tabbar_background</item>
|
||||
<item name="background">@drawable/vector_tabbar_background</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
@ -29,6 +29,7 @@
|
|||
<item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_black</item>
|
||||
<item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_black</item>
|
||||
<item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_black</item>
|
||||
<item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_black</item>
|
||||
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_black</item>
|
||||
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_black</item>
|
||||
<item name="riotx_attachment_selector_background">@color/riotx_attachment_selector_background_black</item>
|
||||
|
|
@ -38,9 +39,6 @@
|
|||
|
||||
<item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_black</item>
|
||||
|
||||
<!-- Drawables -->
|
||||
<item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_black</item>
|
||||
|
||||
<!-- 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/riotx_accent</item>
|
||||
<!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
|
||||
|
|
@ -63,7 +61,6 @@
|
|||
|
||||
<item name="materialButtonStyle">@style/VectorButtonStyle</item>
|
||||
<item name="toolbarStyle">@style/VectorToolbarStyle</item>
|
||||
<item name="alertDialogTheme">@style/VectorAlertDialogStyleDark</item>
|
||||
|
||||
<item name="android:textColorLink">@color/riotx_links</item>
|
||||
|
||||
|
|
@ -73,26 +70,17 @@
|
|||
<!-- list colors -->
|
||||
<!--Header/Panel Background-->
|
||||
<item name="vctr_list_header_background_color">#FF090A0C</item>
|
||||
<!--Header/Panel Text Primary-->
|
||||
<item name="vctr_tab_home">@color/primary_color_black</item>
|
||||
<!--Header/Panel Text Secondary-->
|
||||
<item name="vctr_tab_home_secondary">@color/primary_color_dark_black</item>
|
||||
|
||||
<item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_black</item>
|
||||
<item name="vctr_list_divider_color">@color/riotx_header_panel_background_black</item>
|
||||
|
||||
<item name="vctr_redacted_message_color">@color/list_divider_color_black</item>
|
||||
|
||||
<item name="vctr_markdown_block_background_color">#FF4D4D4D</item>
|
||||
|
||||
<item name="vctr_pill_receipt">@drawable/pill_receipt_black</item>
|
||||
|
||||
<!-- activities background -->
|
||||
<item name="android:windowBackground">@color/riot_primary_background_color_black</item>
|
||||
<item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_black</item>
|
||||
<item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_black</item>
|
||||
|
||||
<item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_black</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.Black" parent="AppTheme.Base.Black" />
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
<item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_dark</item>
|
||||
<item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_dark</item>
|
||||
<item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_dark</item>
|
||||
<item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_dark</item>
|
||||
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_dark</item>
|
||||
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_dark</item>
|
||||
<item name="riotx_attachment_selector_background">@color/riotx_attachment_selector_background_dark</item>
|
||||
|
|
@ -38,9 +39,6 @@
|
|||
|
||||
<item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_dark</item>
|
||||
|
||||
<!-- Drawables -->
|
||||
<item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_dark</item>
|
||||
|
||||
<!-- 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/riotx_accent</item>
|
||||
<item name="colorPrimaryVariant">@color/primary_color_dark_light</item>
|
||||
|
|
@ -83,40 +81,24 @@
|
|||
<item name="vctr_toolbar_secondary_text_color">@color/riot_secondary_text_color_dark</item>
|
||||
<item name="vctr_toolbar_link_text_color">@color/link_color_dark</item>
|
||||
|
||||
<!-- application bar text hint color -->
|
||||
<item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_dark</item>
|
||||
|
||||
<item name="vctr_tab_home">@color/primary_color_dark</item>
|
||||
<item name="vctr_tab_home_secondary">@color/primary_color_dark_dark</item>
|
||||
|
||||
<!-- default text colors -->
|
||||
<item name="vctr_default_text_hint_color">@color/default_text_hint_color_dark</item>
|
||||
|
||||
<!-- room message colors -->
|
||||
<!--Unread Room Indent-->
|
||||
<item name="vctr_unread_room_indent_color">#FF2E3648</item>
|
||||
<item name="vctr_notice_secondary">#61708B</item>
|
||||
<item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
|
||||
<item name="vctr_message_text_color">@android:color/white</item>
|
||||
<item name="vctr_notice_text_color">@color/riot_primary_text_color_dark</item>
|
||||
<item name="vctr_encrypting_message_text_color">@color/accent_color_dark</item>
|
||||
<item name="vctr_sending_message_text_color">@color/riotx_text_secondary_dark</item>
|
||||
<item name="vctr_highlighted_message_text_color">@color/vector_fuchsia_color</item>
|
||||
<item name="vctr_highlighted_searched_message_text_color">@color/primary_color_light</item>
|
||||
<item name="vctr_search_mode_room_name_text_color">#CCC3C3C3</item>
|
||||
<item name="vctr_unread_marker_line_color">@color/accent_color_dark</item>
|
||||
<item name="vctr_markdown_block_background_color">@android:color/black</item>
|
||||
<item name="vctr_spoiler_background_color">#FFFFFFFF</item>
|
||||
<item name="vctr_room_activity_divider_color">#565656</item>
|
||||
|
||||
<item name="riot_primary_text_color">@color/riot_primary_text_color_dark</item>
|
||||
<item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_dark</item>
|
||||
|
||||
<!-- tab bar colors -->
|
||||
<item name="vctr_tab_bar_inverted_background_color">?colorPrimary</item>
|
||||
<item name="vctr_tab_bar_selected_background_color">
|
||||
@color/tab_bar_selected_background_color_dark
|
||||
</item>
|
||||
<item name="vctr_tab_bar_unselected_background_color">
|
||||
@color/tab_bar_unselected_background_color_dark
|
||||
</item>
|
||||
|
||||
<!-- list colors -->
|
||||
<!--Header/Panel Background-->
|
||||
|
|
@ -129,20 +111,9 @@
|
|||
<item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_dark</item>
|
||||
<item name="vctr_list_divider_color">@color/riotx_header_panel_background_dark</item>
|
||||
|
||||
<item name="vctr_redacted_message_color">@color/list_divider_color_dark</item>
|
||||
|
||||
<!-- gradient on the home bottom -->
|
||||
<item name="vctr_activity_bottom_gradient_color">#80000000</item>
|
||||
|
||||
<!-- outgoing call background color -->
|
||||
<item name="vctr_pending_outgoing_view_background_color">#33FFFFFF</item>
|
||||
|
||||
<!-- multi selection member background color -->
|
||||
<item name="vctr_multi_selection_background_color">#4d4d4d</item>
|
||||
|
||||
<!-- sliding menu icon colors -->
|
||||
<item name="vctr_home_navigation_icon_color">@color/riot_primary_text_color_dark</item>
|
||||
|
||||
<!-- room notification text color (typing, unsent...) -->
|
||||
<!--Notice (secondary)-->
|
||||
<item name="vctr_room_notification_text_color">#FF61708b</item>
|
||||
|
|
@ -150,32 +121,8 @@
|
|||
<!-- icon colors -->
|
||||
<item name="vctr_settings_icon_tint_color">@android:color/white</item>
|
||||
<item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
|
||||
<item name="vctr_icon_tint_on_dark_action_bar_color">@android:color/white</item>
|
||||
|
||||
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
|
||||
<!-- dedicated drawables are created for each theme -->
|
||||
<item name="vctr_line_divider">@drawable/line_divider_dark</item>
|
||||
<item name="vctr_shadow_bottom">@drawable/shadow_bottom_dark</item>
|
||||
<item name="vctr_shadow_top">@drawable/shadow_top_dark</item>
|
||||
<item name="vctr_tabbar_selected_background">
|
||||
@drawable/vector_tabbar_selected_background_dark
|
||||
</item>
|
||||
<item name="vctr_tabbar_unselected_background">
|
||||
@drawable/vector_tabbar_unselected_background_dark
|
||||
</item>
|
||||
<item name="vctr_tabbar_background">@drawable/vector_tabbar_background_dark</item>
|
||||
|
||||
<item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_dark</item>
|
||||
<item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_dark</item>
|
||||
|
||||
<item name="vctr_pill_text_color_user_id">@android:color/white</item>
|
||||
<item name="vctr_pill_text_color_room_alias">@color/riot_primary_text_color_dark</item>
|
||||
|
||||
<item name="vctr_pill_receipt">@drawable/pill_receipt_dark</item>
|
||||
|
||||
<item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_dark</item>
|
||||
|
||||
<item name="vctr_widget_banner_background">#FF454545</item>
|
||||
<item name="list_divider_color">@color/list_divider_color_dark</item>
|
||||
|
||||
<!-- ANDROID SUPPORT ATTRIBUTES -->
|
||||
<!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
|
||||
|
|
@ -203,13 +150,16 @@
|
|||
<item name="android:actionBarDivider">@null</item>
|
||||
|
||||
<!-- tabbar background -->
|
||||
<item name="android:actionBarTabStyle">@style/Vector.TabView.Dark</item>
|
||||
<item name="actionBarTabStyle">@style/Vector.TabView.Dark</item>
|
||||
<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/tab_bar_selected_background_color_dark</item>
|
||||
<item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_dark</item>
|
||||
|
||||
<!-- Preference -->
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
|
||||
|
|
@ -236,9 +186,4 @@
|
|||
|
||||
<style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
|
||||
|
||||
<style name="Vector.TabView.Dark" parent="Widget.AppCompat.ActionBar.TabView">
|
||||
<item name="android:background">@drawable/vector_tabbar_background_dark</item>
|
||||
<item name="background">@drawable/vector_tabbar_background_dark</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -27,6 +27,7 @@
|
|||
<item name="riotx_fab_secondary_bg">@color/riotx_fab_secondary_bg_light</item>
|
||||
<item name="riotx_fab_secondary_color">@color/riotx_fab_secondary_color_light</item>
|
||||
<item name="riotx_fab_label_bg">@color/riotx_fab_label_bg_light</item>
|
||||
<item name="riotx_fab_label_stroke">@color/riotx_fab_label_stroke_light</item>
|
||||
<item name="riotx_fab_label_color">@color/riotx_fab_label_color_light</item>
|
||||
<item name="riotx_touch_guard_bg">@color/riotx_touch_guard_bg_light</item>
|
||||
<item name="riotx_keys_backup_banner_accent_color">@color/riotx_keys_backup_banner_accent_color_light</item>
|
||||
|
|
@ -37,9 +38,6 @@
|
|||
|
||||
<item name="riotx_bottom_nav_icon_color">@color/riotx_bottom_nav_icon_color_light</item>
|
||||
|
||||
<!-- Drawables -->
|
||||
<item name="riotx_highlighted_message_background">@drawable/highlighted_message_background_light</item>
|
||||
|
||||
<!-- 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/riotx_accent</item>
|
||||
<!--item name="colorPrimaryVariant">@color/primary_color_dark_light</item-->
|
||||
|
|
@ -83,40 +81,24 @@
|
|||
<item name="vctr_toolbar_secondary_text_color">@color/riotx_text_primary_light</item>
|
||||
<item name="vctr_toolbar_link_text_color">@color/riotx_links</item>
|
||||
|
||||
<!-- application bar text hint color -->
|
||||
<item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
|
||||
|
||||
<item name="vctr_tab_home">@color/primary_color_light</item>
|
||||
<item name="vctr_tab_home_secondary">@color/primary_color_dark_light</item>
|
||||
|
||||
<!-- default text colors -->
|
||||
<item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>
|
||||
|
||||
<!-- room message colors -->
|
||||
<!-- Notice (Secondary) -->
|
||||
<item name="vctr_unread_room_indent_color">#FF2E3648</item>
|
||||
<item name="vctr_notice_secondary">#61708B</item>
|
||||
<item name="vctr_unsent_message_text_color">@color/vector_fuchsia_color</item>
|
||||
<item name="vctr_message_text_color">@color/riot_primary_text_color_light</item>
|
||||
<item name="vctr_notice_text_color">#FF61708b</item>
|
||||
<item name="vctr_encrypting_message_text_color">@color/accent_color_light</item>
|
||||
<item name="vctr_sending_message_text_color">@color/riotx_text_secondary_light</item>
|
||||
<item name="vctr_highlighted_message_text_color">@color/vector_fuchsia_color</item>
|
||||
<item name="vctr_highlighted_searched_message_text_color">@color/primary_color_light</item>
|
||||
<item name="vctr_search_mode_room_name_text_color">#333C3C3C</item>
|
||||
<item name="vctr_unread_marker_line_color">@color/accent_color_light</item>
|
||||
<item name="vctr_markdown_block_background_color">#FFEEEEEE</item>
|
||||
<item name="vctr_spoiler_background_color">#FF000000</item>
|
||||
<item name="vctr_room_activity_divider_color">#FFF2F2F2</item>
|
||||
|
||||
<item name="riot_primary_text_color">@color/riot_primary_text_color_light</item>
|
||||
<item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_light</item>
|
||||
|
||||
<!-- tab bar colors -->
|
||||
<item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>
|
||||
<item name="vctr_tab_bar_selected_background_color">
|
||||
@color/tab_bar_selected_background_color_light
|
||||
</item>
|
||||
<item name="vctr_tab_bar_unselected_background_color">
|
||||
@color/tab_bar_unselected_background_color_light
|
||||
</item>
|
||||
|
||||
<!-- list colors -->
|
||||
<!--Header/Panel Background-->
|
||||
|
|
@ -129,20 +111,9 @@
|
|||
<item name="riotx_list_bottom_sheet_divider_color">@color/riotx_list_bottom_sheet_divider_color_light</item>
|
||||
<item name="vctr_list_divider_color">@color/riotx_header_panel_background_light</item>
|
||||
|
||||
<item name="vctr_redacted_message_color">@color/list_divider_color_light</item>
|
||||
|
||||
<!-- gradient on the home bottom -->
|
||||
<item name="vctr_activity_bottom_gradient_color">#80ffffff</item>
|
||||
|
||||
<!-- outgoing call background color -->
|
||||
<item name="vctr_pending_outgoing_view_background_color">#33000000</item>
|
||||
|
||||
<!-- multi selection member background color -->
|
||||
<item name="vctr_multi_selection_background_color">#FFF2F2F2</item>
|
||||
|
||||
<!-- sliding menu icon colors -->
|
||||
<item name="vctr_home_navigation_icon_color">@color/riot_primary_text_color_light</item>
|
||||
|
||||
<!-- room notification text color (typing, unsent...) -->
|
||||
<!--Notice (secondary)-->
|
||||
<item name="vctr_room_notification_text_color">#FF61708b</item>
|
||||
|
|
@ -150,32 +121,8 @@
|
|||
<!-- icon colors -->
|
||||
<item name="vctr_settings_icon_tint_color">@android:color/black</item>
|
||||
<item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
|
||||
<item name="vctr_icon_tint_on_dark_action_bar_color">@android:color/white</item>
|
||||
|
||||
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
|
||||
<!-- dedicated drawables are created for each theme -->
|
||||
<item name="vctr_line_divider">@drawable/line_divider_light</item>
|
||||
<item name="vctr_shadow_bottom">@drawable/shadow_bottom_light</item>
|
||||
<item name="vctr_shadow_top">@drawable/shadow_top_light</item>
|
||||
<item name="vctr_tabbar_selected_background">
|
||||
@drawable/vector_tabbar_selected_background_light
|
||||
</item>
|
||||
<item name="vctr_tabbar_unselected_background">
|
||||
@drawable/vector_tabbar_unselected_background_light
|
||||
</item>
|
||||
<item name="vctr_tabbar_background">@drawable/vector_tabbar_background_light</item>
|
||||
|
||||
<item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_light</item>
|
||||
<item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_light</item>
|
||||
|
||||
<item name="vctr_pill_text_color_user_id">@color/riot_primary_text_color_light</item>
|
||||
<item name="vctr_pill_text_color_room_alias">@android:color/white</item>
|
||||
|
||||
<item name="vctr_pill_receipt">@drawable/pill_receipt_light</item>
|
||||
|
||||
<item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_light</item>
|
||||
|
||||
<item name="vctr_widget_banner_background">#FFD3EFE1</item>
|
||||
<item name="list_divider_color">@color/list_divider_color_light</item>
|
||||
|
||||
<!-- ANDROID SUPPORT ATTRIBUTES -->
|
||||
<!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
|
||||
|
|
@ -203,13 +150,16 @@
|
|||
<item name="android:actionBarDivider">@null</item>
|
||||
|
||||
<!-- tabbar background -->
|
||||
<item name="android:actionBarTabStyle">@style/Vector.TabView.Light</item>
|
||||
<item name="actionBarTabStyle">@style/Vector.TabView.Light</item>
|
||||
<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/tab_bar_selected_background_color_light</item>
|
||||
<item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_light</item>
|
||||
|
||||
<!-- Preference -->
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
|
||||
|
|
@ -236,9 +186,4 @@
|
|||
|
||||
<style name="AppTheme.Light" parent="AppTheme.Base.Light" />
|
||||
|
||||
<style name="Vector.TabView.Light" parent="Widget.AppCompat.ActionBar.TabView">
|
||||
<item name="android:background">@drawable/vector_tabbar_background_light</item>
|
||||
<item name="background">@drawable/vector_tabbar_background_light</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@
|
|||
<item name="colorPrimary">@color/primary_color_status</item>
|
||||
<item name="colorAccent">@color/accent_color_status</item>
|
||||
|
||||
<item name="android:textColorPrimary">@color/primary_text_color_selector_status</item>
|
||||
<item name="android:textColorPrimary">@color/primary_text_color_selector</item>
|
||||
<item name="android:textColorSecondary">@color/riot_secondary_text_color_status</item>
|
||||
<!-- Default color for text View -->
|
||||
<item name="android:textColorTertiary">@color/riot_tertiary_text_color_status</item>
|
||||
|
|
@ -33,86 +33,35 @@
|
|||
<item name="vctr_toolbar_secondary_text_color">@color/primary_color_dark_status</item>
|
||||
<item name="vctr_toolbar_link_text_color">@color/primary_color_dark_status</item>
|
||||
|
||||
<!-- application bar text hint color -->
|
||||
<item name="vctr_primary_hint_text_color">@color/primary_hint_text_color_light</item>
|
||||
|
||||
<item name="vctr_tab_home">@color/primary_color_status</item>
|
||||
<item name="vctr_tab_home_secondary">@color/primary_color_dark_status</item>
|
||||
|
||||
<!-- default text colors -->
|
||||
<item name="vctr_default_text_hint_color">@color/default_text_hint_color_light</item>
|
||||
|
||||
<!-- room message colors -->
|
||||
<item name="vctr_unread_room_indent_color">?colorAccent</item>
|
||||
<item name="vctr_notice_secondary">#61708B</item>
|
||||
<item name="vctr_unsent_message_text_color">#FFFF4444</item>
|
||||
<item name="vctr_message_text_color">#70879d</item>
|
||||
<item name="vctr_notice_text_color">#adadbe</item>
|
||||
<item name="vctr_encrypting_message_text_color">#AECDF9</item>
|
||||
<item name="vctr_sending_message_text_color">#b3e8d2</item>
|
||||
<item name="vctr_highlighted_message_text_color">@color/vector_fuchsia_color</item>
|
||||
<item name="vctr_highlighted_searched_message_text_color">@color/primary_color_status</item>
|
||||
<item name="vctr_search_mode_room_name_text_color">#333C3C3C</item>
|
||||
<item name="vctr_unread_marker_line_color">#AECDF9</item>
|
||||
<item name="vctr_markdown_block_background_color">#FFEEEEEE</item>
|
||||
<item name="vctr_room_activity_divider_color">#FFF2F2F2</item>
|
||||
|
||||
<item name="riot_primary_text_color">@color/riot_primary_text_color_status</item>
|
||||
<item name="riot_primary_text_color_disabled">@color/riot_primary_text_color_disabled_status</item>
|
||||
|
||||
<!-- tab bar colors -->
|
||||
<item name="vctr_tab_bar_inverted_background_color">#FFF2F2F2</item>
|
||||
<item name="vctr_tab_bar_selected_background_color">
|
||||
@color/tab_bar_selected_background_color_status
|
||||
</item>
|
||||
<item name="vctr_tab_bar_unselected_background_color">
|
||||
@color/tab_bar_unselected_background_color_status
|
||||
</item>
|
||||
|
||||
<!-- list colors -->
|
||||
<item name="vctr_list_header_background_color">#FFF6F6F6</item>
|
||||
<item name="vctr_list_header_primary_text_color">#7F3C3C3C</item>
|
||||
<item name="vctr_list_header_secondary_text_color">#4D3C3C3C</item>
|
||||
|
||||
<!-- gradient on the home bottom -->
|
||||
<item name="vctr_activity_bottom_gradient_color">#80ffffff</item>
|
||||
|
||||
<!-- outgoing call background color -->
|
||||
<item name="vctr_pending_outgoing_view_background_color">#33000000</item>
|
||||
|
||||
<!-- multi selection member background color -->
|
||||
<item name="vctr_multi_selection_background_color">#FFF2F2F2</item>
|
||||
|
||||
<!-- sliding menu icon colors -->
|
||||
<item name="vctr_home_navigation_icon_color">@color/riot_primary_text_color_status</item>
|
||||
|
||||
<!-- room notification text color (typing, unsent...) -->
|
||||
<item name="vctr_room_notification_text_color">#a0a29f</item>
|
||||
|
||||
<!-- icon colors -->
|
||||
<item name="vctr_settings_icon_tint_color">@color/accent_color_status</item>
|
||||
<item name="vctr_icon_tint_on_light_action_bar_color">@color/riotx_accent</item>
|
||||
<item name="vctr_icon_tint_on_dark_action_bar_color">@android:color/white</item>
|
||||
|
||||
<!-- theses colours are requested a background cannot be set by an ?att on android < 5 -->
|
||||
<!-- dedicated drawables are created for each theme -->
|
||||
<item name="vctr_line_divider">@drawable/line_divider_light</item>
|
||||
<item name="vctr_shadow_bottom">@drawable/shadow_bottom_light</item>
|
||||
<item name="vctr_shadow_top">@drawable/shadow_top_light</item>
|
||||
<item name="vctr_tabbar_selected_background">
|
||||
@drawable/vector_tabbar_selected_background_status
|
||||
</item>
|
||||
<item name="vctr_tabbar_unselected_background">
|
||||
@drawable/vector_tabbar_unselected_background_status
|
||||
</item>
|
||||
<item name="vctr_tabbar_background">@drawable/vector_tabbar_background_status</item>
|
||||
|
||||
<item name="vctr_pill_background_user_id">@drawable/pill_background_user_id_status</item>
|
||||
<item name="vctr_pill_background_room_alias">@drawable/pill_background_room_alias_status</item>
|
||||
|
||||
<item name="vctr_pill_text_color_user_id">@color/riot_primary_text_color_status</item>
|
||||
<item name="vctr_pill_text_color_room_alias">@android:color/white</item>
|
||||
|
||||
<item name="vctr_direct_chat_circle">@drawable/direct_chat_circle_status</item>
|
||||
|
||||
<item name="vctr_widget_banner_background">#FFF7F7F7</item>
|
||||
|
||||
<!-- ANDROID SUPPORT ATTRIBUTES -->
|
||||
<!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
|
||||
|
|
@ -139,14 +88,13 @@
|
|||
<!-- no divider -->
|
||||
<item name="android:actionBarDivider">@null</item>
|
||||
|
||||
<!-- tabbar background -->
|
||||
<item name="android:actionBarTabStyle">@style/Vector.TabView.Status</item>
|
||||
<item name="actionBarTabStyle">@style/Vector.TabView.Status</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/tab_bar_selected_background_color_status</item>
|
||||
<item name="tab_bar_unselected_background_color">@color/tab_bar_unselected_background_color_status</item>
|
||||
|
||||
<!-- Preference -->
|
||||
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
|
||||
|
||||
|
|
@ -155,9 +103,4 @@
|
|||
|
||||
<style name="AppTheme.Status" parent="AppTheme.Base.Status" />
|
||||
|
||||
<style name="Vector.TabView.Status" parent="Widget.AppCompat.ActionBar.TabView">
|
||||
<item name="android:background">@drawable/vector_tabbar_background_status</item>
|
||||
<item name="background">@drawable/vector_tabbar_background_status</item>
|
||||
</style>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Reference in a new issue