filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1278 from vector-im/feature/fix_misleading_url_color

Browse Source 
Fix the color of misleading url according to design document.
This commit is contained in:
Benoit Marty 2020-04-27 00:50:03 +02:00 committed by GitHub
commit 409d751612
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vector/src/main/java/im/vector/riotx/features/home/room/detail/RoomDetailFragment.kt
View File

@ -957,8 +957,8 @@ class RoomDetailFragment @Inject constructor(
.setMessage(
getString(R.string.external_link_confirmation_message, title, url)
.toSpannable()
.colorizeMatchingText(url, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
.colorizeMatchingText(title, colorProvider.getColorFromAttribute(android.R.attr.textColorLink))
.colorizeMatchingText(url, colorProvider.getColorFromAttribute(R.attr.riotx_text_primary_body_contrast))
.colorizeMatchingText(title, colorProvider.getColorFromAttribute(R.attr.riotx_text_primary_body_contrast))
)
.setPositiveButton(R.string._continue) { _, _ ->
openUrlInExternalBrowser(requireContext(), url)

5
vector/src/main/res/values/colors_riotx.xml
View File

@ -99,6 +99,11 @@
<color name="riotx_text_secondary_dark">#FFA1B2D1</color>
<color name="riotx_text_secondary_black">#FFA1B2D1</color>
<attr name="riotx_text_primary_body_contrast" format="color" />
<color name="riotx_text_primary_body_contrast_light">#FF61708B</color>
<color name="riotx_text_primary_body_contrast_dark">#FFA1B2D1</color>
<color name="riotx_text_primary_body_contrast_black">#FFA1B2D1</color>
<attr name="riotx_android_secondary" format="color" />
<color name="riotx_android_secondary_light">#FF7E899C</color>
<color name="riotx_android_secondary_dark">#FF7E899C</color>

1
vector/src/main/res/values/theme_black.xml
View File

@ -18,6 +18,7 @@
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_black</item>
<item name="riotx_text_primary">@color/riotx_text_primary_black</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_black</item>
<item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_black</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_black</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_black</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_black</item>

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

@ -16,6 +16,7 @@
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_dark</item>
<item name="riotx_text_primary">@color/riotx_text_primary_dark</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_dark</item>
<item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_dark</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_dark</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_dark</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_dark</item>

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

@ -16,6 +16,7 @@
<item name="riotx_header_panel_text_secondary">@color/riotx_header_panel_text_secondary_light</item>
<item name="riotx_text_primary">@color/riotx_text_primary_light</item>
<item name="riotx_text_secondary">@color/riotx_text_secondary_light</item>
<item name="riotx_text_primary_body_contrast">@color/riotx_text_primary_body_contrast_light</item>
<item name="riotx_android_secondary">@color/riotx_android_secondary_light</item>
<item name="riotx_search_placeholder">@color/riotx_search_placeholder_light</item>
<item name="riotx_room_highlight">@color/riotx_room_highlight_light</item>