aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res/values
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2019-08-18 08:03:58 +0000
committerAlex Ning <chineseperson5@gmail.com>2019-08-18 08:03:58 +0000
commitffd1d6e204fc7032a13216fe0c6dbe78205b2a98 (patch)
tree31d8f2d48a772968d37dc20df0b91359fbe50bf7 /app/src/main/res/values
parent1984332fddeebe02db8e569f821391a45f97d904 (diff)
downloadinfinity-for-reddit-ffd1d6e204fc7032a13216fe0c6dbe78205b2a98.tar
infinity-for-reddit-ffd1d6e204fc7032a13216fe0c6dbe78205b2a98.tar.gz
infinity-for-reddit-ffd1d6e204fc7032a13216fe0c6dbe78205b2a98.tar.bz2
infinity-for-reddit-ffd1d6e204fc7032a13216fe0c6dbe78205b2a98.tar.lz
infinity-for-reddit-ffd1d6e204fc7032a13216fe0c6dbe78205b2a98.tar.xz
infinity-for-reddit-ffd1d6e204fc7032a13216fe0c6dbe78205b2a98.tar.zst
infinity-for-reddit-ffd1d6e204fc7032a13216fe0c6dbe78205b2a98.zip
View messages in ViewMessageActivity. Use LinkResolverActivity to handle link clicking in CustomMarkwonView. Fixed cannot load user profile image after the post is deleted.
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r--app/src/main/res/values/colors.xml2
-rw-r--r--app/src/main/res/values/strings.xml7
2 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index ee3bdeed..ef901a9e 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -47,4 +47,6 @@
<color name="cardViewBackgroundColor">#FFFFFF</color>
<color name="singleCommentThreadBackgroundColor">#B3E5F9</color>
+
+ <color name="unreadMessageBackgroundColor">#B3E5F9</color>
</resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 359315a2..1943b769 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
<string name="search_subreddits_activity_label">Subreddits</string>
<string name="edit_post_activity_label">Edit Post</string>
<string name="edit_comment_activity_label">Edit Comment</string>
+ <string name="view_message_activity">Inbox</string>
<string name="navigation_drawer_open">Open navigation drawer</string>
<string name="navigation_drawer_close">Close navigation drawer</string>
@@ -50,19 +51,23 @@
<string name="no_users">No users found</string>
<string name="no_storage_permission">No storage permission to save this file</string>
- <string name="load_comments_failed">Error loading comments.</string>
+ <string name="load_comments_failed">Error loading comments</string>
<string name="retry">Retry</string>
<string name="comments">Comments</string>
<string name="no_comments_yet">No comments yet. Write a comment?</string>
<string name="vote_failed">Vote failed</string>
<string name="refresh_post_failed">Error refreshing the post</string>
+ <string name="load_messages_failed">Error loading messages</string>
+ <string name="no_messages">Empty</string>
+
<string name="nsfw">NSFW</string>
<string name="karma_info">Karma: %1$d</string>
<string name="profile">Profile</string>
<string name="following">Following</string>
<string name="subscriptions">Subscriptions</string>
+ <string name="inbox">Inbox</string>
<string name="upvoted">Upvoted</string>
<string name="downvoted">Downvoted</string>
<string name="hidden">Hidden</string>