diff --git a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java
index b49ba9d6b..d2c4b96d3 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListAdapter.java
@@ -52,19 +52,15 @@ class ForumListAdapter
// Post Count
int postCount = item.getPostCount();
if (postCount > 0) {
- ui.avatar.setProblem(false);
ui.postCount.setText(ctx.getResources()
.getQuantityString(R.plurals.posts, postCount,
postCount));
ui.postCount.setTextColor(
- ContextCompat
- .getColor(ctx, R.color.briar_text_secondary));
+ ContextCompat.getColor(ctx, R.color.briar_text_secondary));
} else {
- ui.avatar.setProblem(true);
ui.postCount.setText(ctx.getString(R.string.no_posts));
ui.postCount.setTextColor(
- ContextCompat
- .getColor(ctx, R.color.briar_text_tertiary));
+ ContextCompat.getColor(ctx, R.color.briar_text_tertiary));
}
// Date
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java
index e09e371bf..a2992ef89 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupViewHolder.java
@@ -74,9 +74,7 @@ class GroupViewHolder extends RecyclerView.ViewHolder {
if (group.isEmpty()) {
postCount.setVisibility(GONE);
date.setVisibility(GONE);
- avatar.setProblem(true);
- status
- .setText(ctx.getString(R.string.groups_group_is_empty));
+ status.setText(ctx.getString(R.string.groups_group_is_empty));
status.setVisibility(VISIBLE);
} else {
// Message Count
@@ -91,7 +89,6 @@ class GroupViewHolder extends RecyclerView.ViewHolder {
long lastUpdate = group.getTimestamp();
date.setText(UiUtils.formatDate(ctx, lastUpdate));
date.setVisibility(VISIBLE);
- avatar.setProblem(false);
status.setVisibility(GONE);
}
remove.setVisibility(GONE);
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
index 9d24bbe75..b06ba5419 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/view/TextAvatarView.java
@@ -5,7 +5,6 @@ import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.graphics.drawable.Drawable;
import android.support.annotation.UiThread;
-import android.support.v4.content.ContextCompat;
import android.support.v7.widget.AppCompatTextView;
import android.util.AttributeSet;
import android.view.LayoutInflater;
@@ -26,7 +25,6 @@ public class TextAvatarView extends FrameLayout {
private final AppCompatTextView character;
private final CircleImageView background;
private final TextView badge;
- private int unreadCount;
public TextAvatarView(Context context, @Nullable AttributeSet attrs) {
super(context, attrs);
@@ -49,30 +47,14 @@ public class TextAvatarView extends FrameLayout {
}
public void setUnreadCount(int count) {
- unreadCount = count;
if (count > 0) {
- badge.setBackgroundResource(R.drawable.bubble);
badge.setText(String.valueOf(count));
- badge.setTextColor(ContextCompat.getColor(getContext(),
- R.color.briar_text_primary_inverse));
badge.setVisibility(VISIBLE);
} else {
badge.setVisibility(INVISIBLE);
}
}
- public void setProblem(boolean problem) {
- if (problem) {
- badge.setBackgroundResource(R.drawable.bubble_problem);
- badge.setText("!");
- badge.setTextColor(ContextCompat
- .getColor(getContext(), R.color.briar_primary));
- badge.setVisibility(VISIBLE);
- } else {
- setUnreadCount(unreadCount);
- }
- }
-
public void setBackgroundBytes(byte[] bytes) {
int r = getByte(bytes, 0) * 3 / 4 + 96;
int g = getByte(bytes, 1) * 3 / 4 + 96;
diff --git a/briar-android/src/main/res/drawable/bubble_problem.xml b/briar-android/src/main/res/drawable/bubble_problem.xml
deleted file mode 100644
index 9d27c9596..000000000
--- a/briar-android/src/main/res/drawable/bubble_problem.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index 01630d889..47e6b8c95 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -36,8 +36,8 @@
Briar could not start
Tap for more information.
Briar Startup Failure
- For some reason, your Briar database is corrupted beyond repair. Your account, your data and all your contacts are lost. Unfortunately, you need to reinstall Briar and set up a new account by choosing \'I have forgotten my password\' at the password prompt.
- Your account was created with an old version of this app and cannot be opened with this version. You must either reinstall the old version or delete your old account by choosing \'I have forgotten my password\' at the password prompt.
+ For some reason, your Briar database is corrupted beyond repair. Your account, your data and all your contacts are lost. Unfortunately, you need to reinstall Briar or set up a new account by choosing \'I have forgotten my password\' at the password prompt.
+ Your account was created with an old version of this app and cannot be opened with this version. You must either reinstall the old version or set up a new account by choosing \'I have forgotten my password\' at the password prompt.
This version of the app is too old. Please upgrade to the latest version and try again.
Briar was unable to start a required plugin. Reinstalling Briar usually solves this problem. However, please note that you will then lose your account and all data associated with it since Briar is not using central servers to store your data on.
@@ -109,9 +109,9 @@
Sorry
- It seems that you are new here and have no contacts yet.\n\nTap the + icon at the top and follow the instructions to add some friends to your list.\n\nPlease remember: You can only add new contacts face-to-face to prevent anyone from impersonating you or reading your messages in the future.
+ No contacts to show\n\nTap the + icon to add a contact
No messages.
- This is the conversation view.\n\nThere seems to be a lack of conversation.\n\nJust tap the input field at the bottom to start a conversation.
+ No messages to show
Type message
Delete contact
Confirm Contact Deletion
@@ -162,7 +162,7 @@
- You are not participating in any groups.\n\nTap the + icon at the top to create a group yourself or ask your contacts to get invited into one of their groups.
+ No groups to show\n\nTap the + icon to create a group, or ask your contacts to share groups with you
Created by %s
- %d message
@@ -218,7 +218,7 @@
Contact relationship is not visible to the group
- You don\'t have any forums yet.\n\nWhy don\'t you create a new one yourself by tapping the + icon at the top?\n\nYou can also ask your contacts to share forums with you.
+ No forums to show\n\nTap the + icon to create a forum, or ask your contacts to share forums with you
Create Forum
Choose a name for your forum
Create Forum
@@ -235,24 +235,24 @@
Reply
Leave Forum
Confirm Leaving Forum
- Are you sure that you want to leave this forum? Contacts you have shared this forum with might get cut off from receiving updates for this forum.
+ Are you sure that you want to leave this forum?\n\nAny contacts you\'ve shared this forum with might stop receiving updates.
Leave
- Left Forum
+ Left forum
Share Forum
Contacts selected
Choose Contacts
- It seems that you are new here and have no contacts yet.\n\nPlease come back here after you added your first contact.
+ No contacts to show\n\nPlease come back here after adding a contact
Forum shared with chosen contacts
Add a message (optional)
There was an error sharing this forum.
%1$s has shared the forum \"%2$s\" with you.
You have shared the forum \"%1$s\" with %2$s.
Forum Invitations
- You accepted an invitation to this forum already. Accepting more invitations will grow and strengthen the communication in the forum.
- Joined Forum
- Forum Invitation Declined
+ You accepted an invitation to this forum already.\n\nAccepting more invitations will make your connection to the forum faster and more reliable.
+ Joined forum
+ Invitation declined
Shared by %s
Already sharing
You accepted the forum invitation from %s.
@@ -270,19 +270,19 @@
Nobody
- This blog is currently empty.\n\nEither the author hasn\'t written anything yet, or the person who shared this blog with you needs to come online, so posts can be synchronized.
+ No posts to show
read more
Write Blog Post
- Type your blog post here
+ Type your blog post
Publish
Blog Post Created
New Blog Post Received
Scroll To
- This is the global blog feed.\n\nIt looks like nobody blogged anything, yet.\n\nBe the first and tap the pen icon to write a new blog post.
+ No posts to show\n\nPosts from your contacts and blogs you subscribe to will appear here\n\nTap the pen icon to write a post
Remove Blog
- Are you sure that you want to remove this blog and all posts?\nNote that this will not remove the blog from other people\'s devices.
- Remove Blog
- Blog Removed
+ Are you sure that you want to remove this blog?\n\nPosts will be removed from your device but not from other people\'s devices.\n\nAny contacts you\'ve shared this blog with might stop receiving updates.
+ Remove
+ Blog removed
Add a comment (optional)
Reblog
@@ -298,8 +298,8 @@
%1$s has shared the blog \"%2$s\" with you.
You have shared the blog \"%1$s\" with %2$s.
Blog Invitations
- Subscribed to Blog
- Blog Invitation Declined
+ Subscribed to blog
+ Invitation declined
Anyone who subscribes to a blog can share it with their contacts. You are sharing this blog with the following contacts. There may also be other subscribers who you can\'t see.
@@ -312,10 +312,10 @@
Author:
Last Updated:
Remove Feed
- Are you sure you want to remove this feed and all its posts?\nAny posts you have shared will not be removed from other people\'s devices.
- Remove Feed
+ Are you sure that you want to remove this feed?\n\nPosts will be removed from your device but not from other people\'s devices.\n\nAny contacts you\'ve shared this feed with might stop receiving updates.
+ Remove
The feed could not be deleted!
- You haven\'t imported any RSS feeds.\n\nWhy don\'t you click the plus in the top right screen corner to add your first?
+ No RSS feeds to show\n\nTap the + icon to import a feed
There was a problem loading your feeds. Please try again later.