From 83886c78f158a8ddae3fdc16ef0291f1cbbd9001 Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Mon, 20 Aug 2018 15:13:36 -0300
Subject: [PATCH] Empty states: Address review comments

---
 .../android/contactselection/BaseContactSelectorFragment.java  | 2 ++
 .../briar/android/introduction/ContactChooserFragment.java     | 2 +-
 briar-android/src/main/res/layout/briar_recycler_view.xml      | 1 -
 briar-android/src/main/res/values/strings.xml                  | 3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
index 03e6ff06b..2aaf1cecc 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/contactselection/BaseContactSelectorFragment.java
@@ -69,7 +69,9 @@ public abstract class BaseContactSelectorFragment<I extends SelectableContactIte
 
 		list = contentView.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
+		list.setEmptyImage(R.drawable.ic_empty_state_contact_list);
 		list.setEmptyText(getString(R.string.no_contacts_selector));
+		list.setEmptyAction(getString(R.string.no_contacts_selector_action));
 		adapter = getAdapter(getContext(), this);
 		list.setAdapter(adapter);
 
diff --git a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java
index a2961a61b..4acfd0148 100644
--- a/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java
+++ b/briar-android/src/main/java/org/briarproject/briar/android/introduction/ContactChooserFragment.java
@@ -82,7 +82,7 @@ public class ContactChooserFragment extends BaseFragment {
 		list = contentView.findViewById(R.id.list);
 		list.setLayoutManager(new LinearLayoutManager(getActivity()));
 		list.setAdapter(adapter);
-		list.setEmptyText(getString(R.string.no_contacts));
+		list.setEmptyText(R.string.no_contacts);
 
 		contactId = new ContactId(getArguments().getInt(CONTACT_ID));
 
diff --git a/briar-android/src/main/res/layout/briar_recycler_view.xml b/briar-android/src/main/res/layout/briar_recycler_view.xml
index e3791373f..b0f9b1b19 100644
--- a/briar-android/src/main/res/layout/briar_recycler_view.xml
+++ b/briar-android/src/main/res/layout/briar_recycler_view.xml
@@ -76,7 +76,6 @@
 		android:paddingBottom="@dimen/margin_large"
 		android:paddingLeft="@dimen/margin_large"
 		android:paddingRight="@dimen/margin_large"
-		android:text="@string/no_data"
 		android:textSize="@dimen/text_size_small"
 		app:layout_constraintBottom_toBottomOf="parent"
 		app:layout_constraintEnd_toEndOf="parent"
diff --git a/briar-android/src/main/res/values/strings.xml b/briar-android/src/main/res/values/strings.xml
index d9b3fc2f0..3b92a01ca 100644
--- a/briar-android/src/main/res/values/strings.xml
+++ b/briar-android/src/main/res/values/strings.xml
@@ -261,7 +261,8 @@
 	<string name="forum_share_button">Share Forum</string>
 	<string name="contacts_selected">Contacts selected</string>
 	<string name="activity_share_toolbar_header">Choose Contacts</string>
-	<string name="no_contacts_selector">No contacts to show\n\nPlease come back here after adding a contact</string>
+	<string name="no_contacts_selector">No contacts to show</string>
+	<string name="no_contacts_selector_action">Please come back here after adding a contact</string>
 	<string name="forum_shared_snackbar">Forum shared with chosen contacts</string>
 	<string name="forum_share_message">Add a message (optional)</string>
 	<string name="forum_share_error">There was an error sharing this forum.</string>