Add pending contact requests screen

briar-android/src/main/AndroidManifest.xml

@@ -434,5 +434,10 @@
 			</intent-filter>
 		</activity>
 
+		<activity
+			android:name=".android.contact.PendingRequestsActivity"
+			android:label="@string/pending_contact_requests"
+			android:theme="@style/BriarTheme"/>
+
 	</application>
 </manifest>

briar-android/src/main/java/org/briarproject/briar/android/activity/ActivityComponent.java

@@ -20,6 +20,7 @@ import org.briarproject.briar.android.contact.ContactLinkOutputActivity;
 import org.briarproject.briar.android.contact.ContactListFragment;
 import org.briarproject.briar.android.contact.ContactModule;
 import org.briarproject.briar.android.contact.ConversationActivity;
+import org.briarproject.briar.android.contact.PendingRequestsActivity;
 import org.briarproject.briar.android.forum.CreateForumActivity;
 import org.briarproject.briar.android.forum.ForumActivity;
 import org.briarproject.briar.android.forum.ForumListFragment;
@@ -171,6 +172,7 @@ public interface ActivityComponent {
 
 	void inject(ContactLinkOutputActivity activity);
 	void inject(ContactLinkInputActivity activity);
+	void inject(PendingRequestsActivity activity);
 
 	// Fragments
 	void inject(AuthorNameFragment fragment);

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactLinkInputActivity.java

@@ -4,23 +4,23 @@ import android.content.ClipboardManager;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog.Builder;
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.view.MenuItem;
 import android.widget.Button;
 import android.widget.EditText;
-import android.widget.Toast;
 
 import org.briarproject.briar.R;
 import org.briarproject.briar.android.activity.ActivityComponent;
 import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.navdrawer.NavDrawerActivity;
 
 import javax.annotation.Nullable;
 
 import static android.content.ClipDescription.MIMETYPE_TEXT_PLAIN;
 import static android.content.Intent.ACTION_SEND;
 import static android.content.Intent.EXTRA_TEXT;
-import static android.widget.Toast.LENGTH_SHORT;
 import static java.util.Objects.requireNonNull;
 
 public class ContactLinkInputActivity extends BriarActivity
@@ -61,9 +61,7 @@ public class ContactLinkInputActivity extends BriarActivity
 		contactNameInput.addTextChangedListener(this);
 
 		addButton = findViewById(R.id.addButton);
-		addButton.setOnClickListener(v -> Toast.makeText(this,
-				"Contact " + contactNameInput.getText() + " requested",
-				LENGTH_SHORT).show());
+		addButton.setOnClickListener(v -> onAddButtonClicked());
 
 		Intent i = getIntent();
 		if (i != null && ACTION_SEND.equals(i.getAction())) {
@@ -122,4 +120,26 @@ public class ContactLinkInputActivity extends BriarActivity
 				contactNameInput.getText().length() > 0);
 	}
 
+	private void onAddButtonClicked() {
+		addFakeRequest();
+
+		Builder builder = new Builder(this, R.style.BriarDialogTheme_Neutral);
+		builder.setMessage(getString(R.string.add_contact_link_question));
+		builder.setPositiveButton(R.string.yes, (dialog, which) -> {
+			startActivity(new Intent(ContactLinkInputActivity.this,
+					NavDrawerActivity.class));
+			finish();
+		});
+		builder.setNegativeButton(R.string.no, (dialog, which) -> {
+			startActivity(new Intent(ContactLinkInputActivity.this,
+					ContactLinkOutputActivity.class));
+			finish();
+		});
+		builder.show();
+	}
+
+	private void addFakeRequest() {
+		// TODO
+	}
+
 }

briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java

@@ -155,12 +155,11 @@ public class ContactListFragment extends BaseFragment implements EventListener,
 		list.setEmptyText(getString(R.string.no_contacts));
 		list.setEmptyAction(getString(R.string.no_contacts_action));
 
-		snackbar =
-				Snackbar.make(contentView, "There are pending contact requests",
-						LENGTH_INDEFINITE);
+		snackbar = Snackbar.make(contentView,
+				R.string.pending_contact_requests_snackbar, LENGTH_INDEFINITE);
 		snackbar.getView().setBackgroundResource(R.color.briar_primary);
 		snackbar.setAction(R.string.show, v -> startActivity(
-				new Intent(getContext(), ContactLinkInputActivity.class)));
+				new Intent(getContext(), PendingRequestsActivity.class)));
 		snackbar.setActionTextColor(ContextCompat
 				.getColor(getContext(), R.color.briar_button_text_positive));
 

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsActivity.java

@@ -0,0 +1,55 @@
+package org.briarproject.briar.android.contact;
+
+import android.os.Bundle;
+import android.support.v7.app.ActionBar;
+import android.support.v7.widget.LinearLayoutManager;
+import android.view.MenuItem;
+
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.activity.ActivityComponent;
+import org.briarproject.briar.android.activity.BriarActivity;
+import org.briarproject.briar.android.view.BriarRecyclerView;
+
+import javax.annotation.Nullable;
+
+public class PendingRequestsActivity extends BriarActivity {
+
+	private PendingRequestsAdapter adapter;
+	private BriarRecyclerView list;
+
+	@Override
+	public void injectActivity(ActivityComponent component) {
+		component.inject(this);
+	}
+
+	@Override
+	public void onCreate(@Nullable Bundle state) {
+		super.onCreate(state);
+
+		setContentView(R.layout.list);
+
+		ActionBar ab = getSupportActionBar();
+		if (ab != null) {
+			ab.setDisplayHomeAsUpEnabled(true);
+		}
+
+		adapter = new PendingRequestsAdapter(this, PendingRequestsItem.class);
+		list = findViewById(R.id.list);
+		list.setLayoutManager(new LinearLayoutManager(this));
+		list.setAdapter(adapter);
+
+		adapter.add(new PendingRequestsItem("test", System.currentTimeMillis() - 50000));
+	}
+
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				onBackPressed();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsAdapter.java

@@ -0,0 +1,55 @@
+package org.briarproject.briar.android.contact;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+import org.briarproject.briar.android.util.BriarAdapter;
+
+@NotNullByDefault
+public class PendingRequestsAdapter extends
+		BriarAdapter<PendingRequestsItem, PendingRequestsViewHolder> {
+
+	public PendingRequestsAdapter(Context ctx, Class<PendingRequestsItem> c) {
+		super(ctx, c);
+	}
+
+	@NonNull
+	@Override
+	public PendingRequestsViewHolder onCreateViewHolder(
+			ViewGroup viewGroup, int i) {
+		View v = LayoutInflater.from(viewGroup.getContext()).inflate(
+				R.layout.list_item_pending_contact, viewGroup, false);
+		return new PendingRequestsViewHolder(v);
+	}
+
+	@Override
+	public void onBindViewHolder(
+			PendingRequestsViewHolder pendingRequestsViewHolder, int i) {
+		pendingRequestsViewHolder.bind(items.get(i));
+	}
+
+	@Override
+	public int compare(PendingRequestsItem item1, PendingRequestsItem item2) {
+		return (int) (item1.getTimestamp() - item2.getTimestamp());
+	}
+
+	@Override
+	public boolean areContentsTheSame(PendingRequestsItem item1,
+			PendingRequestsItem item2) {
+		return item1.getName().equals(item2.getName()) &&
+				item1.getTimestamp() == item2.getTimestamp();
+	}
+
+	@Override
+	public boolean areItemsTheSame(PendingRequestsItem item1,
+			PendingRequestsItem item2) {
+		return item1.getName().equals(item2.getName()) &&
+				item1.getTimestamp() == item2.getTimestamp();
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsItem.java

@@ -0,0 +1,27 @@
+package org.briarproject.briar.android.contact;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+
+import javax.annotation.concurrent.Immutable;
+
+@Immutable
+@NotNullByDefault
+public class PendingRequestsItem {
+
+	private final String name;
+	private final long timestamp;
+
+	public PendingRequestsItem(String name, long timestamp) {
+		this.name = name;
+		this.timestamp = timestamp;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public long getTimestamp() {
+		return timestamp;
+	}
+
+}

briar-android/src/main/java/org/briarproject/briar/android/contact/PendingRequestsViewHolder.java

@@ -0,0 +1,29 @@
+package org.briarproject.briar.android.contact;
+
+import android.support.v7.widget.RecyclerView.ViewHolder;
+import android.view.View;
+import android.widget.TextView;
+
+import org.briarproject.bramble.api.nullsafety.NotNullByDefault;
+import org.briarproject.briar.R;
+
+import static org.briarproject.briar.android.util.UiUtils.formatDate;
+
+@NotNullByDefault
+public class PendingRequestsViewHolder extends ViewHolder {
+
+	private final TextView name;
+	private final TextView time;
+
+	public PendingRequestsViewHolder(View v) {
+		super(v);
+		name = v.findViewById(R.id.name);
+		time = v.findViewById(R.id.time);
+	}
+
+	public void bind(PendingRequestsItem item) {
+		name.setText(item.getName());
+		time.setText(formatDate(time.getContext(), item.getTimestamp()));
+	}
+
+}

briar-android/src/main/res/layout/list_item_pending_contact.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+	android:id="@+id/linearLayout4"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:app="http://schemas.android.com/apk/res-auto"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content">
+
+	<com.vanniktech.emoji.EmojiTextView
+		android:id="@+id/name"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/margin_large"
+		android:textColor="?android:attr/textColorPrimary"
+		android:textSize="@dimen/text_size_medium"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toStartOf="@+id/time"
+		app:layout_constraintHorizontal_chainStyle="spread_inside"
+		app:layout_constraintStart_toStartOf="parent"
+		app:layout_constraintTop_toTopOf="parent"
+		app:layout_constraintVertical_chainStyle="packed"
+		tools:text="This is a name of a contact"/>
+
+	<TextView
+		android:id="@+id/time"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_margin="@dimen/margin_large"
+		android:textColor="?android:attr/textColorSecondary"
+		android:textSize="@dimen/text_size_small"
+		app:layout_constraintBottom_toBottomOf="@+id/name"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toEndOf="@+id/name"
+		app:layout_constraintTop_toTopOf="@+id/name"
+		tools:text="Dec 24"/>
+
+	<View
+		android:id="@+id/divider"
+		style="@style/Divider.ContactList"
+		android:layout_width="0dp"
+		app:layout_constraintBottom_toBottomOf="parent"
+		app:layout_constraintEnd_toEndOf="parent"
+		app:layout_constraintStart_toStartOf="parent"/>
+
+</android.support.constraint.ConstraintLayout>

briar-android/src/main/res/values/strings.xml

@@ -162,6 +162,11 @@
 	<string name="send_link_instructions">Send this link to your contact:</string>
 	<string name="link_clip_label">Briar link</string>
 	<string name="link_copied_toast">Link copied</string>
+	<string name="pending_contact_requests_snackbar">"There are pending contact requests"</string>
+	<string name="pending_contact_requests">Pending contact requests</string>
+	<string name="add_contact_link_question">Did you send your link already?</string>
+	<string name="yes">Yes</string>
+	<string name="no">No</string>
 
 	<!-- Introductions -->
 	<string name="introduction_onboarding_title">Introduce your contacts</string>