Add support for Cc: and Bcc:

app/src/main/res/layout/fragment_new_email.xml

@@ -1,29 +1,57 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:paddingBottom="@dimen/activity_vertical_margin"
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    android:paddingBottom="@dimen/activity_vertical_margin" >
+    android:paddingTop="@dimen/activity_vertical_margin">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
         <Spinner
             android:id="@+id/sender_spinner"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal">
+
+            <i2p.bote.android.util.ContactsCompletionView
+                android:id="@+id/to"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1">
+
+                <requestFocus/>
+            </i2p.bote.android.util.ContactsCompletionView>
+
+            <ImageView
+                android:id="@+id/more"
+                android:layout_width="@dimen/listitem_picture_size"
+                android:layout_height="@dimen/listitem_picture_size"
+                android:layout_gravity="center_vertical"
+                android:scaleType="center"
+                android:src="@drawable/ic_unfold_more_grey600_24dp"/>
+        </LinearLayout>
 
         <i2p.bote.android.util.ContactsCompletionView
-            android:id="@+id/recipients"
+            android:id="@+id/cc"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
 
-            <requestFocus />
-        </i2p.bote.android.util.ContactsCompletionView>
+        <i2p.bote.android.util.ContactsCompletionView
+            android:id="@+id/bcc"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"/>
 
         <EditText
             android:id="@+id/subject"
@@ -31,7 +59,7 @@
             android:layout_height="wrap_content"
             android:ems="10"
             android:hint="@string/subject"
-            android:inputType="textEmailSubject" />
+            android:inputType="textEmailSubject"/>
 
         <EditText
             android:id="@+id/message"
@@ -39,7 +67,7 @@
             android:layout_height="wrap_content"
             android:ems="10"
             android:hint="@string/compose_email"
-            android:inputType="textMultiLine" />
+            android:inputType="textMultiLine"/>
     </LinearLayout>
 
 </ScrollView>

app/src/main/res/layout/fragment_view_email.xml

@@ -93,7 +93,51 @@
                         android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
 
                     <LinearLayout
-                        android:id="@+id/email_recipients"
+                        android:id="@+id/email_to"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                    </LinearLayout>
+                </TableRow>
+
+                <TableRow
+                    android:id="@+id/email_cc_row"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="4dp"
+                        android:layout_marginRight="4dp"
+                        android:text="@string/email_cc"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
+
+                    <LinearLayout
+                        android:id="@+id/email_cc"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="vertical">
+                    </LinearLayout>
+                </TableRow>
+
+                <TableRow
+                    android:id="@+id/email_bcc_row"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginEnd="4dp"
+                        android:layout_marginRight="4dp"
+                        android:text="@string/email_bcc"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Secondary"/>
+
+                    <LinearLayout
+                        android:id="@+id/email_bcc"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:orientation="vertical">

app/src/main/res/values/strings.xml

@@ -103,6 +103,8 @@
     <string name="signature_invalid">This email does not have a valid signature. It was probably not sent by %s.</string>
     <string name="email_from">From:</string>
     <string name="email_to">To:</string>
+    <string name="email_cc">Cc:</string>
+    <string name="email_bcc">Bcc:</string>
     <string name="label_sent">Sent:</string>
     <string name="email_received">Received:</string>
     <string name="email_status">Status:</string>