mirrors/element-android
1
0
Fork 0
mirror of https://github.com/element-hq/element-android synced 2024-11-24 18:35:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Move some of colors from attrs.xml to colors_riotx.xml

Browse source
This commit is contained in:
Onuray Sahin 2020-07-02 19:29:45 +03:00
parent 74a3d7619b
commit 332041e13b
15 changed files with 45 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vector/src/main/java/im/vector/riotx/features/widgets/webview/WidgetWebView.kt
View file

@ -32,7 +32,7 @@ import im.vector.riotx.features.webview.WebViewEventListener
@SuppressLint("NewApi")
fun WebView.setupForWidget(webViewEventListener: WebViewEventListener) {
// xml value seems ignored
setBackgroundColor(ThemeUtils.getColor(context, R.attr.vctr_bottom_nav_background_color))
setBackgroundColor(ThemeUtils.getColor(context, R.attr.riotx_bottom_nav_background_color))
// clear caches
clearHistory()

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

@ -26,7 +26,7 @@
android:id="@+id/loginTouchArea"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?vctr_waiting_background_color"
android:background="?riotx_waiting_background_color"
android:clickable="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

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

@ -2,7 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/vctr_waiting_background_color">
android:background="?attr/riotx_waiting_background_color">
<ProgressBar
android:layout_width="40dp"

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

@ -29,7 +29,7 @@
android:id="@+id/vector_settings_spinner_views"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?attr/vctr_waiting_background_color"
android:background="?attr/riotx_waiting_background_color"
android:clickable="true"
android:visibility="gone">

6
vector/src/main/res/layout/constraint_set_composer_layout_compact.xml
View file

@ -13,7 +13,7 @@
android:id="@+id/related_message_backround"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?vctr_bottom_nav_background_color"
android:background="?riotx_bottom_nav_background_color"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -23,7 +23,7 @@
android:id="@+id/related_message_background_top_separator"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?vctr_bottom_nav_background_border_color"
android:background="?riotx_bottom_nav_background_border_color"
app:layout_constraintBottom_toTopOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
@ -32,7 +32,7 @@
android:id="@+id/related_message_background_bottom_separator"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="?vctr_bottom_nav_background_border_color"
android:background="?riotx_bottom_nav_background_border_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

6
vector/src/main/res/layout/constraint_set_composer_layout_expanded.xml
View file

@ -13,7 +13,7 @@
android:id="@+id/related_message_backround"
android:layout_width="match_parent"
android:layout_height="0dp"
android:background="?vctr_bottom_nav_background_color"
android:background="?riotx_bottom_nav_background_color"
app:layout_constraintBottom_toBottomOf="@id/composer_preview_barrier"
app:layout_constraintTop_toTopOf="parent" />
@ -21,7 +21,7 @@
android:id="@+id/related_message_background_top_separator"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="?vctr_bottom_nav_background_border_color"
android:background="?riotx_bottom_nav_background_border_color"
app:layout_constraintEnd_toEndOf="@id/related_message_backround"
app:layout_constraintStart_toStartOf="@+id/related_message_backround"
app:layout_constraintTop_toTopOf="@id/related_message_backround" />
@ -30,7 +30,7 @@
android:id="@+id/related_message_background_bottom_separator"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="?vctr_bottom_nav_background_border_color"
android:background="?riotx_bottom_nav_background_border_color"
app:layout_constraintBottom_toBottomOf="@id/related_message_backround"
app:layout_constraintEnd_toEndOf="@id/related_message_backround"
app:layout_constraintStart_toStartOf="@+id/related_message_backround" />

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

@ -25,7 +25,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="?vctr_bottom_nav_background_color"
android:background="?riotx_bottom_nav_background_color"
android:orientation="horizontal"
android:padding="16dp"
android:visibility="gone"

6
vector/src/main/res/layout/merge_composer_layout.xml
View file

@ -15,21 +15,21 @@
android:id="@+id/related_message_backround"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?vctr_bottom_nav_background_color"
android:background="?riotx_bottom_nav_background_color"
tools:ignore="MissingConstraints" />
<View
android:id="@+id/related_message_background_top_separator"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?vctr_bottom_nav_background_border_color"
android:background="?riotx_bottom_nav_background_border_color"
tools:ignore="MissingConstraints" />
<View
android:id="@+id/related_message_background_bottom_separator"
android:layout_width="0dp"
android:layout_height="0dp"
android:background="?vctr_bottom_nav_background_border_color"
android:background="?riotx_bottom_nav_background_border_color"
tools:ignore="MissingConstraints" />
<ImageView

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

@ -9,7 +9,7 @@
android:id="@+id/waiting_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="?vctr_waiting_background_color"
android:background="?riotx_waiting_background_color"
android:clickable="true"
android:focusable="true"
android:visibility="gone"

6
vector/src/main/res/values/attrs.xml
View file

@ -3,12 +3,6 @@
<declare-styleable name="VectorStyles">
<attr name="vctr_bottom_nav_background_color" format="color" />
<attr name="vctr_bottom_nav_background_border_color" format="color" />
<!-- waiting view background -->
<attr name="vctr_waiting_background_color" format="color" />
<!-- application bar text color -->
<attr name="vctr_toolbar_primary_text_color" format="color" />
<attr name="vctr_toolbar_secondary_text_color" format="color" />

19
vector/src/main/res/values/colors_riotx.xml
View file

@ -185,6 +185,25 @@
<color name="riotx_room_active_widgets_banner_text_dark">#E3E8F0</color>
<color name="riotx_room_active_widgets_banner_text_black">#E3E8F0</color>
<attr name="riotx_bottom_nav_background_color" format="color" />
<color name="riotx_bottom_nav_background_color_light">#FFF3F8FD</color>
<color name="riotx_bottom_nav_background_color_dark">@color/primary_color_dark</color>
<color name="riotx_bottom_nav_background_color_black">@color/primary_color_black</color>
<color name="riotx_bottom_nav_background_color_status">@color/riot_primary_background_color_status</color>
<attr name="riotx_bottom_nav_background_border_color" format="color" />
<color name="riotx_bottom_nav_background_border_color_light">##AAAAAAAA</color>
<color name="riotx_bottom_nav_background_border_color_dark">#55555555</color>
<color name="riotx_bottom_nav_background_border_color_black">#FF15171b</color>
<color name="riotx_bottom_nav_background_border_color_status">FFE9EDF1</color>
<attr name="riotx_waiting_background_color" format="color" />
<color name="riotx_waiting_background_color_light">#FFE9EDF1</color>
<color name="riotx_waiting_background_color_dark">#FF15171b</color>
<color name="riotx_waiting_background_color_status">#AAAAAAAA</color>
<!-- (color from RiotWeb) -->
<attr name="riotx_keys_backup_banner_accent_color" format="color" />
<color name="riotx_keys_backup_banner_accent_color_light">#FFF8E3</color>

4
vector/src/main/res/values/theme_black.xml
View file

@ -85,8 +85,8 @@
<!-- activities background -->
<item name="android:windowBackground">@color/riot_primary_background_color_black</item>
<item name="vctr_bottom_nav_background_color">@color/primary_color_black</item>
<item name="vctr_bottom_nav_background_border_color">#FF15171b</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>

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

@ -67,11 +67,11 @@
<item name="android:actionMenuTextColor">?colorAccent</item>
<!-- default background color -->
<item name="vctr_bottom_nav_background_color">@color/primary_color_dark</item>
<item name="vctr_bottom_nav_background_border_color">#FF15171b</item>
<item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_dark</item>
<item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_dark</item>
<!-- waiting view background -->
<item name="vctr_waiting_background_color">#55555555</item>
<item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_dark</item>
<!-- application bar text color -->

6
vector/src/main/res/values/theme_light.xml
View file

@ -66,11 +66,11 @@
<item name="android:actionMenuTextColor">?colorAccent</item>
<!-- default background color -->
<item name="vctr_bottom_nav_background_color">#FFF3F8FD</item>
<item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
<item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_light</item>
<item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_light</item>
<!-- waiting view background -->
<item name="vctr_waiting_background_color">#AAAAAAAA</item>
<item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_light</item>
<!-- application bar text color -->
<!-- Base Text Primary-->

6
vector/src/main/res/values/theme_status.xml
View file

@ -21,12 +21,12 @@
<!-- default background color -->
<item name="android:colorBackground">@color/riot_primary_background_color_status</item>
<item name="vctr_bottom_nav_background_color">@color/riot_primary_background_color_status
<item name="riotx_bottom_nav_background_color">@color/riotx_bottom_nav_background_color_status
</item>
<item name="vctr_bottom_nav_background_border_color">#FFE9EDF1</item>
<item name="riotx_bottom_nav_background_border_color">@color/riotx_bottom_nav_background_border_color_status</item>
<!-- waiting view background -->
<item name="vctr_waiting_background_color">#AAAAAAAA</item>
<item name="riotx_waiting_background_color">@color/riotx_waiting_background_color_status</item>
<!-- application bar text color -->
<item name="vctr_toolbar_primary_text_color">#FFFFFFFF</item>