aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2016-02-04 14:39:16 +0100
committerDaniel Gultsch <daniel@gultsch.de>2016-02-04 14:39:16 +0100
commit4fdb0d92fe854126ad5201d56752716b9ab581b2 (patch)
treebf699724d717e0a70b0f224119459a6536207e07 /src/main/res
parentf88b8c703eca10f6a0b96e01e5ba912b02488759 (diff)
prevent previoulsly cleared messages from reloading. fixes #1110
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/message_status.xml9
-rw-r--r--src/main/res/values/strings.xml1
2 files changed, 10 insertions, 0 deletions
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index ad2579faa..93a80d84f 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -9,6 +9,15 @@
android:paddingRight="8dp"
android:paddingTop="5dp">
+ <Button
+ android:id="@+id/load_more_messages"
+ style="?android:attr/borderlessButtonStyle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/load_more_messages"
+ android:textColor="@color/accent" android:layout_centerVertical="true"
+ android:layout_centerHorizontal="true"/>
+
<com.makeramen.roundedimageview.RoundedImageView
android:id="@+id/message_photo"
android:layout_width="32dp"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 9c472d0cc..f909d8ec3 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -560,6 +560,7 @@
<item quantity="one">%d message</item>
<item quantity="other">%d messages</item>
</plurals>
+ <string name="load_more_messages">Load more messages</string>
<string name="shared_file_with_x">Shared file with %s</string>
<string name="shared_image_with_x">Shared image with %s</string>
<string name="no_storage_permission">Conversations need access to external storage</string>