Remove key exchange indicator from list view, spruce up create passphrase dialog.

res/layout/conversation_item_received.xml

@@ -15,7 +15,7 @@
         <view  xmlns:android="http://schemas.android.com/apk/res/android"
                class="org.thoughtcrime.securesms.components.ImageDivet"
                position="right"
-               android:id="@id/contact_photo"
+               android:id="@+id/contact_photo"
                android:layout_alignParentLeft="true"
                android:layout_width="60dp"
                android:layout_height="60dp"

res/layout/conversation_list_item_view.xml

@@ -10,13 +10,6 @@
                        android:layout_centerVertical="true"
                        android:layout_alignParentLeft="true" />
 
-   <ImageView android:id="@+id/key_indicator"
-        android:layout_width="wrap_content"
-        android:layout_height="fill_parent"
-        android:layout_alignParentLeft="true"
-        android:visibility="invisible"
-        android:src="@drawable/key_exchange_indicator" />
-
     <CheckBox android:id="@+id/checkbox"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"

res/layout/create_passphrase_activity.xml

@@ -5,58 +5,70 @@
             android:layout_height="fill_parent"
             xmlns:android="http://schemas.android.com/apk/res/android">
 
-<LinearLayout android:id="@+id/LinearLayout"
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
-                android:orientation="vertical"
+                  android:paddingLeft="16dip"
-                android:padding="8px"
+                  android:paddingRight="16dip"
-                xmlns:android="http://schemas.android.com/apk/res/android">
+                  android:orientation="vertical">
 
-<TextView android:text="Please enter a passphrase that will be used to locally encrypt your data.  This should be a strong passphrase."
+        <TextView android:text="Please choose a passphrase that will be used to locally encrypt your data.  This should be a strong passphrase."
                   android:textAppearance="?android:attr/textAppearanceMedium"
-          android:id="@+id/create_pass_label"
                   android:layout_width="fill_parent"
                   android:layout_height="wrap_content"
-          android:layout_margin="10dip"/>
+                  android:layout_marginTop="10dip"
+                  android:layout_marginBottom="10dip"/>
+
+        <TextView android:text="Passphrase:"
+                  android:textAppearance="?android:attr/textAppearanceMedium"
+                  android:layout_width="fill_parent"
+                  android:layout_height="wrap_content"
+                  android:layout_margin="5dip"/>
 
         <EditText android:id="@+id/passphrase_edit"
                   android:layout_height="wrap_content"
                   android:layout_width="fill_parent"
-          android:password="true"
+                  android:password="true"/>
-          android:layout_margin="10dip"/>
 
         <TextView
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:id="@+id/repeat_label"
                   android:textAppearance="?android:attr/textAppearanceMedium"
-          android:layout_margin="10dip"
+                  android:layout_marginBottom="5dip"
-          android:text="Repeat:"></TextView>
+                  android:layout_marginTop="10dip"
+                  android:text="Repeat:"/>
 
         <EditText
                   android:layout_height="wrap_content"
                   android:layout_width="fill_parent"
                   android:password="true"
-          android:layout_margin="10dip"
+                  android:id="@+id/passphrase_edit_repeat"/>
-          android:id="@+id/passphrase_edit_repeat"></EditText>
 
-<RelativeLayout
+        <LinearLayout android:layout_width="fill_parent"
                       android:layout_height="wrap_content"
+                      android:orientation="horizontal"
+                      android:layout_marginBottom="16dip"
+                      android:gravity="right">
+
+            <TableLayout android:layout_width="wrap_content"
+                         android:layout_height="wrap_content"
+                         android:stretchColumns="*">
+                <TableRow>
+                    <Button android:layout_height="wrap_content"
                             android:layout_width="wrap_content"
-        android:id="@+id/RelativeLayout"
+                            android:text="Cancel"
-        >
+                            android:id="@+id/cancel_button"
-<Button android:layout_width="100dip"
+                            android:layout_marginRight="15dip"
-        android:layout_height="wrap_content"
+                            android:layout_marginLeft="16dip"/>
-        android:id="@+id/cancel_button" android:text="Cancel"
-        android:layout_below="@id/passphrase_edit_repeat"
-        android:layout_alignParentRight="true"></Button>
 
-<Button android:layout_below="@id/passphrase_edit_repeat"
+                    <Button android:layout_width="wrap_content"
-        android:layout_width="100dip"
                             android:layout_height="wrap_content"
-        android:text="Ok" android:id="@+id/ok_button"
+                            android:text="OK"
-        android:layout_toLeftOf="@id/cancel_button"></Button>
+                            android:id="@+id/ok_button"
-        </RelativeLayout>
+                            android:layout_marginRight="16dip"/>
-
+                </TableRow>
+            </TableLayout>
+        </LinearLayout>
     </LinearLayout>
 </ScrollView>

src/org/thoughtcrime/securesms/ConversationListItem.java

@@ -54,7 +54,6 @@ public class ConversationListItem extends RelativeLayout {
   private TextView          subjectView;
   private TextView          fromView;
   private TextView          dateView;
-  private View              keyIndicator;
   private CheckBox          checkbox;
   private QuickContactBadge contactPhoto;
 
@@ -69,13 +68,12 @@ public class ConversationListItem extends RelativeLayout {
     super(context);
 
     LayoutInflater li = (LayoutInflater)context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
-    li.inflate(R.layout.conversation_header_view, this, true);
+    li.inflate(R.layout.conversation_list_item_view, this, true);
 
     this.selectedThreads = selectedThreads;
     this.subjectView     = (TextView)findViewById(R.id.subject);
     this.fromView        = (TextView)findViewById(R.id.from);
     this.dateView        = (TextView)findViewById(R.id.date);
-    this.keyIndicator    = findViewById(R.id.key_indicator);
     this.contactPhoto    = (QuickContactBadge)findViewById(R.id.contact_photo);
     this.checkbox        = (CheckBox)findViewById(R.id.checkbox);
 
@@ -105,9 +103,6 @@ public class ConversationListItem extends RelativeLayout {
     if (selectedThreads != null)
       this.checkbox.setChecked(selectedThreads.contains(threadId));
 
-    clearIndicators();
-    setIndicators(message.isKeyExchange());
-
     if (!first) {
       if (batchMode) checkbox.setVisibility(View.VISIBLE);
       else           checkbox.setVisibility(View.GONE);
@@ -122,14 +117,6 @@ public class ConversationListItem extends RelativeLayout {
     checkbox.setOnCheckedChangeListener(new CheckedChangedListener());
   }
 
-  private void clearIndicators() {
-    this.keyIndicator.setVisibility(View.INVISIBLE);
-  }
-
-  private void setIndicators(boolean key) {
-    if (key) this.keyIndicator.setVisibility(View.VISIBLE);
-  }
-
   private CharSequence formatFrom(Recipients from, long count, boolean read) {
     SpannableStringBuilder builder = new SpannableStringBuilder(from.toShortString());
 

src/org/thoughtcrime/securesms/PassphraseCreateActivity.java

@@ -16,22 +16,21 @@
  */
 package org.thoughtcrime.securesms;
 
-import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
-import org.thoughtcrime.securesms.crypto.MasterSecret;
-import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
-import org.thoughtcrime.securesms.util.MemoryCleaner;
-
 import android.app.ProgressDialog;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.Message;
 import android.view.View;
-import android.view.Window;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
 
+import org.thoughtcrime.securesms.crypto.IdentityKeyUtil;
+import org.thoughtcrime.securesms.crypto.MasterSecret;
+import org.thoughtcrime.securesms.crypto.MasterSecretUtil;
+import org.thoughtcrime.securesms.util.MemoryCleaner;
+
 /**
  * Activity for creating a user's local encryption passphrase.
  *
@@ -49,7 +48,7 @@ public class PassphraseCreateActivity extends PassphraseActivity {
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    getWindow().requestFeature(Window.FEATURE_NO_TITLE);
+
     setContentView(R.layout.create_passphrase_activity);
 
     initializeResources();