diff options
Diffstat (limited to 'src/main/res')
| -rw-r--r-- | src/main/res/layout/message_status.xml | 31 | ||||
| -rw-r--r-- | src/main/res/values-v21/themes.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/attrs.xml | 3 | ||||
| -rw-r--r-- | src/main/res/values/strings.xml | 2 | ||||
| -rw-r--r-- | src/main/res/values/themes.xml | 3 |
5 files changed, 42 insertions, 0 deletions
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index e2200844c..afdf317d7 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -2,6 +2,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="wrap_content" + xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:paddingBottom="5dp" android:paddingLeft="8dp" @@ -18,4 +19,34 @@ android:layout_centerVertical="true" android:layout_centerHorizontal="true" /> + <com.makeramen.roundedimageview.RoundedImageView + android:id="@+id/message_photo" + android:visibility="gone" + android:layout_width="32dp" + android:layout_height="32dp" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginRight="-1.5dp" + android:padding="0dp" + android:scaleType="fitXY" + android:src="@drawable/ic_profile" + app:riv_border_width="1dp" + app:riv_border_color="@color/grey500" + app:riv_corner_radius="16dp"/> + + <TextView + android:id="@+id/status_message" + android:visibility="gone" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minHeight="32dp" + android:layout_centerVertical="true" + android:gravity="center_vertical" + android:layout_marginLeft="8dp" + android:layout_toEndOf="@+id/message_photo" + android:layout_toRightOf="@+id/message_photo" + android:text="@string/contact_has_read_up_to_this_point" + android:textColor="?attr/color_text_secondary" + android:textSize="?attr/TextSizeInfo" + android:textStyle="italic"/> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/values-v21/themes.xml b/src/main/res/values-v21/themes.xml index 86346775f..bbb2184f1 100644 --- a/src/main/res/values-v21/themes.xml +++ b/src/main/res/values-v21/themes.xml @@ -16,6 +16,9 @@ <item name="TextSizeHeadline">18sp</item> <item name="TextSeparation">5sp</item> + <item name="attr/color_text_primary">@color/black87</item> + <item name="attr/color_text_secondary">@color/black54</item> + <item name="attr/dialog_horizontal_padding">24dp</item> <item name="attr/dialog_vertical_padding">16dp</item> diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index a315ab796..3154a8443 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -7,6 +7,9 @@ <attr name="TextSeparation" format="dimension"/> <attr name="IconSize" format="dimension" /> + <attr name="color_text_primary" format="reference|color" /> + <attr name="color_text_secondary" format="reference|color" /> + <attr name="icon_add_group" format="reference" /> <attr name="icon_add_person" format="reference" /> <attr name="icon_cancel" format="reference" /> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index f92be75bb..272f18a4e 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -736,4 +736,6 @@ <string name="install_update">Install update?</string> <string name="highlight_in_muc">highlight user</string> <string name="no_application_found_to_open_link">No application found to open link</string> + <string name="contacts_have_read_up_to_this_point">%s have read up to this point</string> + <string name="contact_has_read_up_to_this_point">%s has read up to this point</string> </resources> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 61ffc19ae..4dc939b2d 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -12,6 +12,9 @@ <item name="TextSizeHeadline">18sp</item> <item name="TextSeparation">5sp</item> + <item name="attr/color_text_primary">@color/black87</item> + <item name="attr/color_text_secondary">@color/black54</item> + <item name="attr/icon_add_group">@drawable/ic_group_add_white_24dp</item> <item name="attr/icon_add_person">@drawable/ic_person_add_white_24dp</item> <item name="attr/icon_cancel">@drawable/ic_cancel_white_24dp</item> |