From 76ac95756fb5e7208f4e5e86578da7ca2f9699d1 Mon Sep 17 00:00:00 2001 From: haffenloher Date: Wed, 22 Feb 2017 16:47:52 +0100 Subject: [PATCH] Fix last seen divider crash on Android <5.0 Apparently, it's not possible to reference an attribute in an xml drawable on API <21, so we have to use separate light and dark theme drawables instead. Closes #6285 --- ...ound.xml => last_seen_divider_text_background_dark.xml} | 2 +- res/drawable/last_seen_divider_text_background_light.xml | 7 +++++++ res/layout/conversation_item_last_seen.xml | 2 +- res/values/attrs.xml | 2 +- res/values/themes.xml | 4 ++-- 5 files changed, 12 insertions(+), 5 deletions(-) rename res/drawable/{last_seen_divider_text_background.xml => last_seen_divider_text_background_dark.xml} (78%) create mode 100644 res/drawable/last_seen_divider_text_background_light.xml diff --git a/res/drawable/last_seen_divider_text_background.xml b/res/drawable/last_seen_divider_text_background_dark.xml similarity index 78% rename from res/drawable/last_seen_divider_text_background.xml rename to res/drawable/last_seen_divider_text_background_dark.xml index ef89bff4ec..ca657c96bb 100644 --- a/res/drawable/last_seen_divider_text_background.xml +++ b/res/drawable/last_seen_divider_text_background_dark.xml @@ -1,6 +1,6 @@ - + diff --git a/res/drawable/last_seen_divider_text_background_light.xml b/res/drawable/last_seen_divider_text_background_light.xml new file mode 100644 index 0000000000..63ce366562 --- /dev/null +++ b/res/drawable/last_seen_divider_text_background_light.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/res/layout/conversation_item_last_seen.xml b/res/layout/conversation_item_last_seen.xml index daa37f4ec8..327d104ffa 100644 --- a/res/layout/conversation_item_last_seen.xml +++ b/res/layout/conversation_item_last_seen.xml @@ -15,6 +15,6 @@ android:textSize="12sp" android:textAllCaps="true" android:textStyle="bold" - android:background="@drawable/last_seen_divider_text_background" + android:background="?conversation_item_last_seen_text_background" tools:text="3 unread messages" /> \ No newline at end of file diff --git a/res/values/attrs.xml b/res/values/attrs.xml index dedd894a49..2df8e1d4ab 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -73,7 +73,7 @@ - + diff --git a/res/values/themes.xml b/res/values/themes.xml index 56e6e50630..d1384844e2 100644 --- a/res/values/themes.xml +++ b/res/values/themes.xml @@ -158,7 +158,7 @@ #BFffffff @drawable/conversation_item_header_background @drawable/last_seen_background - @color/white + @drawable/last_seen_divider_text_background_light @drawable/quick_camera_light @drawable/ic_mic_grey600_24dp @@ -247,7 +247,7 @@ @drawable/conversation_item_sent_indicator_text_shape_dark @drawable/conversation_item_header_background_dark #66333333 - #ff333333 + @drawable/last_seen_divider_text_background_dark #ff333333