UI for introducing two contacts to each other

Show system notification for successful introductions

briar-android/res/drawable-v21/round_button.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	A FAB does not work, because even with fabSize="mini" it will be too big due to shadow drawing
+	on lower API levels
+-->
+<ripple
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:color="@color/briar_primary_dark">
+
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/briar_primary"/>
+		</shape>
+	</item>
+
+</ripple>

briar-android/res/drawable/contact_offline.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+
+	<path
+		android:fillColor="#2D3E50"
+		android:pathData="M10.8972,19.9503 C6.5514,19.3493,3.43091,15.2154,4.0625,10.896
+C4.55452,7.53099,7.09451,4.8236,10.394,4.14714
+C14.2569,3.35517,18.1698,5.54347,19.5236,9.25295
+C20.0698,10.7495,20.1616,12.4612,19.777,13.9758
+C19.5457,14.8864,18.8106,16.3388,18.2072,17.0771
+C16.4904,19.1779,13.581,20.3215,10.8973,19.9503 Z"
+		android:strokeColor="#FFFFFF"
+		android:strokeLineCap="round"
+		android:strokeLineJoin="round"
+		android:strokeWidth="1"/>
+
+</vector>

briar-android/res/drawable/contact_online.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24"
+        android:viewportWidth="24">
+
+	<path
+		android:fillColor="#95D220"
+		android:pathData="M10.8972,19.9503 C6.5514,19.3493,3.43091,15.2154,4.0625,10.896
+C4.55452,7.53099,7.09451,4.8236,10.394,4.14714
+C14.2569,3.35517,18.1698,5.54347,19.5236,9.25295
+C20.0698,10.7495,20.1616,12.4612,19.777,13.9758
+C19.5457,14.8864,18.8106,16.3388,18.2072,17.0771
+C16.4904,19.1779,13.581,20.3215,10.8973,19.9503 Z"
+		android:strokeColor="#FFFFFF"
+		android:strokeLineCap="round"
+		android:strokeLineJoin="round"
+		android:strokeWidth="1.5"/>
+
+</vector>

briar-android/res/drawable/ic_contact_introduction.xml

@@ -0,0 +1,5 @@
+<vector android:alpha="0.56" android:height="48dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M9.01,14L2,14v2h7.01v3L13,15l-3.99,-4v3zM14.99,13v-3L22,10L22,8h-7.01L14.99,5L11,9l3.99,4z"/>
+</vector>

briar-android/res/drawable/introduction_notification.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21,8V7l-3,2 -3,-2v1l3,2 3,-2zm1,-5H2C0.9,3 0,3.9 0,5v14c0,1.1 0.9,2 2,2h20c1.1,0 1.99,-0.9 1.99,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM8,6c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zm6,12H2v-1c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1zm8,-6h-8V6h8v6z"/>
+</vector>

briar-android/res/drawable/introduction_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M21,8V7l-3,2 -3,-2v1l3,2 3,-2zm1,-5H2C0.9,3 0,3.9 0,5v14c0,1.1 0.9,2 2,2h20c1.1,0 1.99,-0.9 1.99,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM8,6c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zm6,12H2v-1c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1zm8,-6h-8V6h8v6z"/>
+</vector>

briar-android/res/drawable/message_delivered_white.xml

@@ -0,0 +1,5 @@
+<vector android:height="16dp"
+	android:viewportHeight="24.0" android:viewportWidth="24.0"
+	android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
+	<path android:fillColor="#FFFFFFFF" android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zm4.24,-1.41L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+</vector>

briar-android/res/drawable/message_sent_white.xml

@@ -0,0 +1,5 @@
+<vector android:height="16dp"
+	android:viewportHeight="24.0" android:viewportWidth="24.0"
+	android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
+	<path android:fillColor="#FFFFFFFF" android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
+</vector>

briar-android/res/drawable/message_stored_white.xml

@@ -0,0 +1,5 @@
+<vector android:height="16dp"
+	android:viewportHeight="24.0" android:viewportWidth="24.0"
+	android:width="16dp" xmlns:android="http://schemas.android.com/apk/res/android">
+	<path android:fillAlpha=".9" android:fillColor="#FFFFFF" android:pathData="M11.99,2C6.47,2 2,6.48 2,12s4.47,10 9.99,10C17.52,22 22,17.52 22,12S17.52,2 11.99,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8zM12.5,7H11v6l5.25,3.15 0.75,-1.23 -4.5,-2.67z"/>
+</vector>

briar-android/res/drawable/round_button.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+	A FAB does not work, because even with fabSize="mini" it will be too big due to shadow drawing
+	on lower API levels
+-->
+<selector
+	xmlns:android="http://schemas.android.com/apk/res/android">
+	<item>
+		<shape android:shape="oval">
+			<solid android:color="@color/briar_primary"/>
+		</shape>
+	</item>
+</selector>

briar-android/res/drawable/social_send_now_white.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportHeight="24.0"
+        android:viewportWidth="24.0">
+	<path
+		android:fillColor="#FFFFFFFF"
+		android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+</vector>

briar-android/res/layout/activity_contact_list.xml

@@ -7,7 +7,6 @@
 	android:layout_height="match_parent">
 
 	<org.briarproject.android.util.BriarRecyclerView
-		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/contactList"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"/>

briar-android/res/layout/activity_conversation.xml

@@ -1,46 +1,79 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	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:orientation="vertical"
 	android:layout_width="match_parent"
-	android:layout_height="match_parent">
+	android:layout_height="match_parent"
+	tools:context=".android.contact.ConversationActivity">
+
+	<android.support.v7.widget.Toolbar
+		android:id="@+id/toolbar"
+		style="@style/BriarToolbar"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:minHeight="?attr/actionBarSize"
+		app:layout_collapseMode="pin"
+		app:layout_scrollFlags="scroll|enterAlways"
+		app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+
+		<LinearLayout
+			android:layout_width="wrap_content"
+			android:layout_height="match_parent">
+
+			<include layout="@layout/contact_avatar_status"/>
+
+			<TextView
+				android:id="@+id/contactName"
+				style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
+				android:layout_width="wrap_content"
+				android:layout_height="match_parent"
+				android:layout_marginLeft="@dimen/margin_medium"
+				android:layout_marginStart="@dimen/margin_medium"
+				android:gravity="center"
+				tools:text="Contact Name"/>
+
+		</LinearLayout>
+
+	</android.support.v7.widget.Toolbar>
 
 	<org.briarproject.android.util.BriarRecyclerView
 		android:id="@+id/conversationView"
 		android:layout_width="match_parent"
 		android:layout_height="0dp"
-		android:layout_weight="1"/>
+		android:layout_weight="1"
+		android:background="@color/conversation_background"/>
 
 	<View style="@style/Divider.Horizontal"/>
 
 	<LinearLayout
-		android:orientation="horizontal"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:background="@color/button_bar_background"
+		android:orientation="horizontal"
 		android:paddingLeft="@dimen/margin_medium"
 		android:paddingStart="@dimen/margin_medium">
 
 		<EditText
 			android:id="@+id/contentView"
 			android:layout_width="0dp"
-			android:layout_height="wrap_content"
-			android:hint="@string/private_message_hint"
+			android:layout_height="match_parent"
 			android:layout_weight="1"
+			android:hint="@string/private_message_hint"
 			android:inputType="text|textMultiLine|textCapSentences"/>
 
 		<ImageButton
 			android:id="@+id/sendButton"
 			android:layout_width="38dp"
 			android:layout_height="38dp"
-			android:layout_gravity="bottom"
-			android:src="@drawable/social_send_now"
-			android:background="?attr/selectableItemBackground"
-			android:scaleType="fitEnd"
+			android:layout_margin="@dimen/margin_small"
+			android:background="@drawable/round_button"
+			android:src="@drawable/social_send_now_white"
 			android:contentDescription="@string/send"
-			android:paddingRight="@dimen/margin_medium"
-			android:paddingEnd="@dimen/margin_medium"
-			android:paddingBottom="@dimen/margin_medium"/>
+		    android:elevation="@dimen/margin_tiny"
+			/>
+
 	</LinearLayout>
 
 </LinearLayout>

briar-android/res/layout/activity_introduction.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+	android:id="@+id/introductionContainer"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"/>

briar-android/res/layout/contact_avatar_status.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout
+	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="32dp"
+	android:layout_height="32dp"
+	tools:showIn="@layout/activity_conversation">
+
+	<de.hdodenhof.circleimageview.CircleImageView
+		android:id="@+id/contactAvatar"
+		android:layout_width="30dp"
+		android:layout_height="30dp"
+		android:transitionName="avatar"
+		app:civ_border_color="@color/action_bar_text"
+		app:civ_border_width="@dimen/avatar_border_width"
+		tools:src="@drawable/ic_launcher"/>
+
+	<ImageView
+		android:id="@+id/contactStatus"
+		android:layout_width="15dp"
+		android:layout_height="15dp"
+		android:layout_gravity="bottom|right"
+		android:scaleType="fitCenter"
+		tools:src="@drawable/contact_online"
+		tools:ignore="ContentDescription"/>
+
+</FrameLayout>

briar-android/res/layout/introduction_contact_chooser.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<org.briarproject.android.util.BriarRecyclerView
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:id="@+id/contactList"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	tools:listitem="@layout/list_item_contact"/>

briar-android/res/layout/introduction_message.xml

@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v4.widget.NestedScrollView
+	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="match_parent"
+	android:fillViewport="true">
+
+	<LinearLayout
+		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="match_parent"
+		android:padding="@dimen/margin_activity_horizontal"
+		android:orientation="vertical">
+
+		<RelativeLayout
+			android:id="@+id/introductionHeader"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:padding="@dimen/margin_medium">
+
+			<de.hdodenhof.circleimageview.CircleImageView
+				android:id="@+id/avatarContact1"
+				android:layout_width="@dimen/listitem_picture_size"
+				android:layout_height="@dimen/listitem_picture_size"
+				android:layout_centerHorizontal="true"
+				android:layout_marginEnd="@dimen/listitem_horizontal_margin"
+				android:layout_marginRight="@dimen/listitem_horizontal_margin"
+				android:layout_toLeftOf="@+id/introductionIcon"
+				android:layout_toStartOf="@+id/introductionIcon"
+				app:civ_border_color="@color/briar_text_primary"
+				app:civ_border_width="@dimen/avatar_border_width"
+				tools:src="@drawable/ic_launcher"/>
+
+			<ImageView
+				android:id="@+id/introductionIcon"
+				android:layout_width="@dimen/listitem_picture_size"
+				android:layout_height="@dimen/listitem_picture_size"
+				android:layout_centerHorizontal="true"
+				android:src="@drawable/ic_contact_introduction"
+				tools:ignore="ContentDescription"/>
+
+			<de.hdodenhof.circleimageview.CircleImageView
+				android:id="@+id/avatarContact2"
+				android:layout_width="@dimen/listitem_picture_size"
+				android:layout_height="@dimen/listitem_picture_size"
+				android:layout_centerHorizontal="true"
+				android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+				android:layout_marginStart="@dimen/listitem_horizontal_margin"
+				android:layout_toEndOf="@+id/introductionIcon"
+				android:layout_toRightOf="@+id/introductionIcon"
+				android:transitionName="avatar"
+				app:civ_border_color="@color/briar_text_primary"
+				app:civ_border_width="@dimen/avatar_border_width"
+				tools:src="@drawable/ic_launcher"/>
+
+		</RelativeLayout>
+
+		<ProgressBar
+			android:id="@+id/progressBar"
+			style="?android:attr/progressBarStyleLarge"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_gravity="center"
+			tools:visibility="gone"/>
+
+		<TextView
+			android:id="@+id/introductionText"
+			android:layout_width="match_parent"
+			android:layout_height="0dp"
+			android:layout_marginTop="@dimen/margin_medium"
+			android:layout_weight="1"
+			android:gravity="top"
+			android:textSize="@dimen/text_size_medium"
+			tools:text="@string/introduction_message_text"/>
+
+		<EditText
+			android:id="@+id/introductionMessageView"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/margin_medium"
+			android:gravity="bottom"
+			android:hint="@string/introduction_message_hint"
+			android:inputType="text|textMultiLine|textCapSentences"/>
+
+		<Button
+			android:id="@+id/makeIntroductionButton"
+			style="@style/BriarButton"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:text="@string/introduction_button"
+			/>
+
+	</LinearLayout>
+
+</android.support.v4.widget.NestedScrollView>

briar-android/res/layout/list_item_contact.xml

@@ -1,16 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
 	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"
 	android:orientation="vertical">
 
 	<RelativeLayout
 		android:layout_width="match_parent"
-		android:layout_height="@dimen/listitem_height_one_line_avatar"
-		android:background="?attr/selectableItemBackground">
+		android:layout_height="wrap_content"
+		android:paddingTop="@dimen/listitem_horizontal_margin"
+		android:paddingBottom="@dimen/listitem_horizontal_margin"
+		android:background="?attr/selectableItemBackground"
+		>
 
 		<de.hdodenhof.circleimageview.CircleImageView
 			android:id="@+id/avatarView"
@@ -21,56 +24,62 @@
 			android:layout_centerVertical="true"
 			android:layout_marginLeft="@dimen/listitem_horizontal_margin"
 			android:layout_marginStart="@dimen/listitem_horizontal_margin"
+			android:transitionName="avatar"
+			app:civ_border_color="@color/briar_text_primary"
 			app:civ_border_width="@dimen/avatar_border_width"
-			app:civ_border_color="@color/briar_text_primary"/>
+			tools:src="@drawable/ic_launcher"/>
 
 		<LinearLayout
-			android:id="@+id/bulbHolder"
+			android:id="@+id/textViews"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignParentEnd="true"
-			android:layout_alignParentRight="true"
+			android:orientation="vertical"
 			android:layout_centerVertical="true"
-			android:layout_marginEnd="@dimen/listitem_horizontal_margin"
-			android:layout_marginRight="@dimen/listitem_horizontal_margin"
-			android:gravity="right"
-			android:orientation="vertical">
+			android:layout_marginLeft="@dimen/listitem_horizontal_margin"
+			android:layout_marginStart="@dimen/listitem_horizontal_margin"
+			android:layout_toLeftOf="@+id/bulbView"
+			android:layout_toRightOf="@+id/avatarView"
+			android:layout_toEndOf="@+id/avatarView">
 
-			<ImageView
-				android:id="@+id/bulbView"
+			<TextView
+				android:id="@+id/nameView"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				tools:src="@drawable/contact_disconnected"/>
+				android:maxLines="2"
+				android:textColor="@android:color/primary_text_light"
+				android:textSize="@dimen/text_size_medium"
+				tools:text="This is a name of a contact"/>
 
 			<TextView
 				android:id="@+id/dateView"
 				android:layout_width="wrap_content"
 				android:layout_height="wrap_content"
-				android:textColor="@color/no_private_messages"
+				android:textColor="@android:color/secondary_text_light"
+				android:textSize="@dimen/text_size_small"
 				tools:text="Dec 24"/>
 
+			<TextView
+				android:id="@+id/identityView"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:textColor="@android:color/tertiary_text_light"
+				android:textSize="@dimen/text_size_tiny"
+				tools:text="My Identity"/>
+
 		</LinearLayout>
 
-		<TextView
-			android:id="@+id/nameView"
+		<ImageView
+			android:id="@+id/bulbView"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:layout_alignParentLeft="true"
-			android:layout_alignParentStart="true"
+			android:layout_alignParentEnd="true"
+			android:layout_alignParentRight="true"
 			android:layout_centerVertical="true"
-			android:layout_marginEnd="@dimen/margin_small"
-			android:layout_marginLeft="@dimen/listitem_text_left_margin"
-			android:layout_marginRight="@dimen/margin_small"
-			android:layout_marginStart="@dimen/listitem_text_left_margin"
-			android:layout_toLeftOf="@id/bulbHolder"
-			android:layout_toStartOf="@id/bulbHolder"
-			android:gravity="center_vertical"
-			android:maxLines="2"
-			android:textSize="@dimen/text_size_medium"
-			tools:text="This is a name of a contact. It can be quite long."/>
+			android:layout_marginRight="@dimen/listitem_horizontal_margin"
+			tools:src="@drawable/contact_connected"/>
 
 	</RelativeLayout>
 
-	<View style="@style/Divider.Horizontal"/>
+	<View style="@style/Divider.ContactListDevider"/>
 
 </LinearLayout>

briar-android/res/layout/list_item_introduction_in.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<include
+		android:id="@+id/messageLayout"
+		layout="@layout/list_item_msg_in"/>
+
+	<RelativeLayout
+		android:id="@+id/introductionLayout"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="left|start"
+		android:background="@drawable/notice_in"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail">
+
+		<TextView
+			android:id="@+id/introductionText"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:minWidth="80dp"
+			android:textIsSelectable="true"
+			android:textSize="@dimen/text_size_medium"
+			android:textStyle="italic"
+			tools:text="@string/introduction_request_received"/>
+
+		<TextView
+			android:id="@+id/introductionTime"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			android:layout_alignEnd="@+id/acceptButton"
+			android:layout_alignRight="@+id/acceptButton"
+			android:layout_below="@+id/acceptButton"
+			android:textColor="@color/private_message_date"
+			android:textSize="@dimen/text_size_tiny"
+			tools:text="Dec 24, 13:37"/>
+
+		<Button
+			android:id="@+id/acceptButton"
+			style="@style/BriarButtonFlat.Positive"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginBottom="-15dp"
+			android:layout_alignEnd="@+id/introductionText"
+			android:layout_alignRight="@+id/introductionText"
+			android:layout_below="@+id/introductionText"
+			android:text="@string/dialog_button_accept"/>
+
+		<Button
+			android:id="@+id/declineButton"
+			style="@style/BriarButtonFlat.Negative"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_below="@+id/introductionText"
+			android:layout_toLeftOf="@+id/acceptButton"
+			android:layout_toStartOf="@+id/acceptButton"
+			android:text="@string/dialog_button_decline"/>
+
+	</RelativeLayout>
+
+</LinearLayout>

briar-android/res/layout/list_item_introduction_out.xml

@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<include
+		android:id="@+id/messageLayout"
+		layout="@layout/list_item_msg_out"/>
+
+	<RelativeLayout
+		android:id="@+id/introductionLayout"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="right|end"
+		android:background="@drawable/notice_out"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail">
+
+		<TextView
+			android:id="@+id/introductionText"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:minWidth="175dp"
+			android:textIsSelectable="true"
+			android:textSize="@dimen/text_size_medium"
+			android:textStyle="italic"
+			tools:text="@string/introduction_request_received"/>
+
+		<TextView
+			android:id="@+id/introductionTime"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			android:layout_alignParentLeft="true"
+			android:layout_alignParentStart="true"
+			android:layout_below="@+id/introductionText"
+			android:textColor="@color/private_message_date"
+			android:textSize="@dimen/text_size_tiny"
+			tools:text="Dec 24, 13:37"/>
+
+		<ImageView
+			android:id="@+id/introductionStatus"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_toEndOf="@+id/introductionTime"
+			android:layout_toRightOf="@+id/introductionTime"
+			android:layout_alignBottom="@+id/introductionTime"
+			android:layout_marginLeft="@dimen/margin_medium"
+			tools:ignore="ContentDescription"
+			tools:src="@drawable/message_delivered"/>
+
+	</RelativeLayout>
+
+</LinearLayout>

briar-android/res/layout/list_item_msg_in.xml

@@ -1,53 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
-	xmlns:tools="http://schemas.android.com/tools"
 	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"
-	android:orientation="horizontal"
-	android:paddingRight="@dimen/margin_medium"
-	android:paddingEnd="@dimen/margin_medium"
-	android:paddingTop="@dimen/margin_small"
-	android:paddingBottom="@dimen/margin_small">
+	android:orientation="horizontal">
 
 	<de.hdodenhof.circleimageview.CircleImageView
 		android:id="@+id/msgAvatar"
 		android:layout_width="@dimen/listitem_picture_size"
 		android:layout_height="@dimen/listitem_picture_size"
-		android:layout_marginLeft="@dimen/listitem_horizontal_margin"
-		android:layout_marginStart="@dimen/listitem_horizontal_margin"
+		android:layout_marginLeft="@dimen/margin_medium"
+		android:layout_marginStart="@dimen/margin_medium"
+		android:visibility="gone"
+		app:civ_border_color="@color/briar_text_primary"
 		app:civ_border_width="@dimen/avatar_border_width"
-		app:civ_border_color="@color/briar_text_primary"/>
+		tools:src="@drawable/ic_launcher"/>
 
-	<RelativeLayout
+	<LinearLayout
 		android:id="@+id/msgLayout"
 		android:layout_width="wrap_content"
 		android:layout_height="wrap_content"
-		android:layout_gravity="left|start"
 		android:background="@drawable/msg_in"
-		android:paddingLeft="17dp"
-		android:paddingTop="5dp"
-		android:paddingRight="7dp"
-		android:paddingBottom="5dp">
+		android:orientation="vertical"
+		android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_non_tail">
 
 		<TextView
 			android:id="@+id/msgBody"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:minWidth="80dp"
 			android:textIsSelectable="true"
+			android:textSize="@dimen/text_size_medium"
 			tools:text="Short message"/>
 
 		<TextView
 			android:id="@+id/msgTime"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
-			android:textSize="10sp"
+			android:layout_gravity="right|end"
+			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			android:maxLines="1"
 			android:textColor="@color/private_message_date"
-			android:layout_below="@+id/msgBody"
+			android:textSize="@dimen/text_size_tiny"
 			tools:text="Dec 24, 13:37"/>
 
-	</RelativeLayout>
+	</LinearLayout>
 
 </LinearLayout>

briar-android/res/layout/list_item_msg_out.xml

@@ -4,11 +4,7 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
-	android:orientation="vertical"
-	android:paddingLeft="@dimen/margin_medium"
-	android:paddingStart="@dimen/margin_medium"
-	android:paddingTop="@dimen/margin_small"
-	android:paddingBottom="@dimen/margin_small">
+	android:orientation="vertical">
 
 	<RelativeLayout
 		android:id="@+id/msgLayout"
@@ -16,28 +12,29 @@
 		android:layout_height="wrap_content"
 		android:layout_gravity="right|end"
 		android:background="@drawable/msg_out"
-		android:paddingLeft="7dp"
-		android:paddingTop="5dp"
-		android:paddingRight="17dp"
-		android:paddingBottom="5dp">
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail">
 
 		<TextView
 			android:id="@+id/msgBody"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:textColor="@color/briar_text_primary_inverse"
 			android:textIsSelectable="true"
-			android:minWidth="80dp"
+			android:textSize="@dimen/text_size_medium"
 			tools:text="This is a long long long message that spans over several lines.\n\nIt ends here."/>
 
 		<TextView
 			android:id="@+id/msgTime"
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			android:layout_alignParentLeft="true"
+			android:layout_alignParentStart="true"
 			android:layout_below="@+id/msgBody"
-			android:layout_toLeftOf="@+id/msgStatus"
-			android:textSize="10sp"
-			android:textColor="@color/private_message_date"
 			android:singleLine="true"
+			android:textColor="@color/private_message_date_inverse"
+			android:textSize="@dimen/text_size_tiny"
 			tools:text="Dec 24, 13:37"/>
 
 		<ImageView
@@ -45,10 +42,11 @@
 			android:layout_width="wrap_content"
 			android:layout_height="wrap_content"
 			android:layout_alignBottom="@+id/msgTime"
-			android:layout_alignRight="@+id/msgBody"
-			android:layout_alignEnd="@+id/msgBody"
-			android:layout_marginLeft="3dp"
-			tools:src="@drawable/message_delivered"/>
+			android:layout_marginLeft="@dimen/margin_medium"
+			android:layout_toEndOf="@+id/msgTime"
+			android:layout_toRightOf="@+id/msgTime"
+			tools:ignore="ContentDescription"
+			tools:src="@drawable/message_delivered_white"/>
 
 	</RelativeLayout>
 

briar-android/res/layout/list_item_notice_in.xml

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	android:id="@+id/noticeLayout"
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content"
+	android:background="@drawable/notice_in"
+	android:orientation="vertical"
+	android:layout_marginLeft="@dimen/message_bubble_margin_tail"
+	android:layout_marginRight="@dimen/message_bubble_margin_non_tail">
+
+	<TextView
+		android:id="@+id/noticeText"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:minWidth="80dp"
+		android:textIsSelectable="true"
+		android:textSize="@dimen/text_size_medium"
+		android:textStyle="italic"
+		tools:text="@string/introduction_response_accepted_received"/>
+
+	<TextView
+		android:id="@+id/noticeTime"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="right|end"
+		android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+		android:maxLines="1"
+		android:textColor="@color/private_message_date"
+		android:textSize="@dimen/text_size_tiny"
+		tools:text="Dec 24, 13:37"/>
+
+</LinearLayout>

briar-android/res/layout/list_item_notice_out.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	xmlns:tools="http://schemas.android.com/tools"
+	android:layout_width="match_parent"
+	android:layout_height="wrap_content"
+	android:orientation="vertical">
+
+	<RelativeLayout
+		android:id="@+id/noticeLayout"
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:layout_gravity="right|end"
+		android:background="@drawable/notice_out"
+		android:layout_marginLeft="@dimen/message_bubble_margin_non_tail"
+		android:layout_marginRight="@dimen/message_bubble_margin_tail">
+
+		<TextView
+			android:id="@+id/noticeText"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textIsSelectable="true"
+			android:textSize="@dimen/text_size_medium"
+			android:textStyle="italic"
+			tools:text="@string/introduction_response_accepted_sent"/>
+
+		<TextView
+			android:id="@+id/noticeTime"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_marginTop="@dimen/message_bubble_timestamp_margin"
+			android:layout_alignParentLeft="true"
+			android:layout_alignParentStart="true"
+			android:layout_below="@+id/noticeText"
+			android:textColor="@color/private_message_date"
+			android:textSize="@dimen/text_size_tiny"
+			tools:text="Dec 24, 13:37"/>
+
+		<ImageView
+			android:id="@+id/noticeStatus"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_alignBottom="@+id/noticeTime"
+			android:layout_marginLeft="@dimen/margin_medium"
+			android:layout_toEndOf="@+id/noticeTime"
+			android:layout_toRightOf="@+id/noticeTime"
+			tools:ignore="ContentDescription"
+			tools:src="@drawable/message_delivered"/>
+
+	</RelativeLayout>
+
+</LinearLayout>

briar-android/res/menu/conversation_actions.xml

@@ -3,10 +3,16 @@
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:app="http://schemas.android.com/apk/res-auto">
 
+	<item
+		android:id="@+id/action_introduction"
+		android:icon="@drawable/introduction_white"
+		android:title="@string/make_introduction"
+		app:showAsAction="never"/>
+
 	<item
 		android:id="@+id/action_social_remove_person"
 		android:icon="@drawable/social_remove_person"
-		app:showAsAction="always"
-		android:title="@string/delete_contact"/>
+		android:title="@string/delete_contact"
+		app:showAsAction="never"/>
 
 </menu>

briar-android/res/values/color.xml

@@ -8,11 +8,13 @@
 	<color name="briar_red">#C1392B</color>
 
 	<color name="window_background">#EEEEEE</color>
+	<color name="conversation_background">#efebe9</color>
 	<color name="action_bar_text">#FFFFFF</color>
 	<color name="action_bar_background">@color/briar_blue</color>
 	<color name="button_bar_background">#FFFFFF</color>
 	<color name="dashboard_background">#FFFFFF</color>
 	<color name="private_message_date">#AAAAAA</color>
+	<color name="private_message_date_inverse">#e0e0e0</color>
 	<color name="unread_background">#FFFFFF</color>
 	<color name="horizontal_border">#CCCCCC</color>
 	<color name="forums_available_background">@color/briar_gold</color>
@@ -28,6 +30,8 @@
 	<color name="briar_text_link">@color/briar_green_dark</color>
 	<color name="briar_text_primary">@color/briar_primary</color>
 	<color name="briar_text_primary_inverse">#ffffff</color>
+	<color name="briar_text_secondary">#333333</color>
+	<color name="briar_text_tertiary">#333333</color>
 
 	<!-- this is needed as preference_category_material layout uses this color as the text color -->
 	<color name="preference_fallback_accent_color">@color/briar_accent</color>

briar-android/res/values/dimens.xml

@@ -23,8 +23,12 @@
 	<dimen name="listitem_horizontal_margin">16dp</dimen>
 	<dimen name="listitem_text_left_margin">72dp</dimen>
 	<dimen name="listitem_height_one_line_avatar">56dp</dimen>
-	<dimen name="listitem_picture_size">40dp</dimen>
+	<dimen name="listitem_picture_size">48dp</dimen>
 	<dimen name="dropdown_picture_size">32dp</dimen>
 	<dimen name="avatar_border_width">1dp</dimen>
 
+	<dimen name="message_bubble_margin_tail">14dp</dimen>
+	<dimen name="message_bubble_margin_non_tail">51dp</dimen>
+	<dimen name="message_bubble_timestamp_margin">15dp</dimen>
+
 </resources>

briar-android/res/values/strings.xml

@@ -141,6 +141,26 @@
 	<string name="transport_lan">Wi-Fi</string>
 	<string name="no_data">No data</string>
 	<string name="unknown_app">an unknown app</string>
+	<string name="make_introduction">Make Introduction</string>
+	<string name="introduction_activity_title">Select contact</string>
+	<string name="introduction_message_title">Introduce Contacts</string>
+	<string name="introduction_message_text">You can compose a message that will be sent to %1$s and %2$s along with your introduction:</string>
+	<string name="introduction_message_hint">Type message (optional)</string>
+	<string name="introduction_button">Make Introduction</string>
+	<string name="introduction_error">There was an error making the introduction.</string>
+	<string name="introduction_response_error">Error when responding to introduction</string>
+	<string name="introduction_warn_different_identities_title">Warning: Different Identities</string>
+	<string name="introduction_warn_different_identities_text">You are trying to introduce two contacts that you have added with different identities. This might reveal that both identities are yours.</string>
+	<string name="introduction_request_sent">You have introduced %1$s to %2$s.</string>
+	<string name="introduction_request_received">%1$s introduced you to %2$s. Do you want to add %2$s to your contact list?</string>
+	<string name="introduction_request_exists_received">%1$s introduced you to %2$s, but %2$s is already in your contact list. Since %1$s might not know that, you can still respond:</string>
+	<string name="introduction_request_answered_received">%1$s introduced you to %2$s.</string>
+	<string name="introduction_response_accepted_sent">You accepted the introduction to %1$s.</string>
+	<string name="introduction_response_declined_sent">You declined the introduction to %1$s.</string>
+	<string name="introduction_response_accepted_received">%1$s accepted to be introduced to %2$s.</string>
+	<string name="introduction_response_declined_received">%1$s declined to be introduced to %2$s.</string>
+	<string name="introduction_success_title">Introduced contact was added</string>
+	<string name="introduction_success_text">You have been successfully introduced to %1$s who was now added to your contact list.</string>
 
 	<!-- Dialogs -->
 	<string name="dialog_title_lost_password">Lost Password</string>
@@ -152,6 +172,9 @@
 	<string name="dialog_title_welcome">Welcome to Briar</string>
 	<string name="dialog_welcome_message">Add a contact to start communicating securely or press the icon in the upper left corner of the screen for more options.</string>
 	<string name="dialog_button_ok">OK</string>
+	<string name="dialog_button_introduce">Introduce</string>
+	<string name="dialog_button_accept">Accept</string>
+	<string name="dialog_button_decline">Decline</string>
 	<!-- Toolbar headers -->
 	<string name="dashboard_toolbar_header">Briar</string>
 	<string name="settings_toolbar_header">Settings</string>

briar-android/res/values/styles.xml

@@ -51,13 +51,31 @@
 		<item name="elevation">1dp</item>
 	</style>
 
-	<style name="BriarButton">
+	<style name="BriarDialogTheme" parent="Theme.AppCompat.Light.Dialog">
+		<item name="colorPrimary">@color/briar_primary</item>
+		<item name="colorPrimaryDark">@color/briar_primary_dark</item>
+		<item name="colorAccent">@color/briar_accent</item>
+	</style>
+
+	<style name="BriarButton" parent="Widget.AppCompat.Button.Colored">
 		<item name="android:textSize">@dimen/text_size_medium</item>
 		<item name="android:padding">@dimen/margin_large</item>
 	</style>
 
 	<style name="BriarButton.Default"/>
 
+	<style name="BriarButtonFlat.Negative" parent="Widget.AppCompat.Button.Borderless">
+		<item name="android:textColor">#ff0000</item>
+		<item name="android:textSize">@dimen/text_size_medium</item>
+		<item name="android:padding">@dimen/margin_large</item>
+	</style>
+
+	<style name="BriarButtonFlat.Positive" parent="Widget.AppCompat.Button.Borderless">
+		<item name="android:textColor">#06b9ff</item>
+		<item name="android:textSize">@dimen/text_size_medium</item>
+		<item name="android:padding">@dimen/margin_large</item>
+	</style>
+
 	<style name="BriarTextTitle">
 		<item name="android:textSize">@dimen/text_size_medium</item>
 		<item name="android:textColor">@android:color/primary_text_light</item>
@@ -76,11 +94,17 @@
 		<item name="android:background">?android:attr/listDivider</item>
 	</style>
 
-	<style name="Divider.Horizontal">
+	<style name="Divider.Horizontal" parent="Divider">
 		<item name="android:layout_width">match_parent</item>
 		<item name="android:layout_height">1px</item>
 	</style>
 
+	<style name="Divider.ContactListDevider" parent="Divider">
+		<item name="android:layout_width">match_parent</item>
+		<item name="android:layout_height">2dp</item>
+		<item name="android:layout_marginLeft">@dimen/margin_large</item>
+	</style>
+
 	<style name="NavMenuButton" parent="Widget.AppCompat.Button.Borderless.Colored">
 		<item name="android:textSize">@dimen/text_size_medium</item>
 		<item name="android:textColor">@android:color/tertiary_text_light</item>