Update the key exchange icon look.
This commit is contained in:
parent
7cab26750b
commit
1ff278dc81
8 changed files with 61 additions and 81 deletions
|
@ -32,6 +32,12 @@
|
|||
android:windowSoftInputMode="stateHidden"
|
||||
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
|
||||
|
||||
<activity android:name=".PassphraseCreateActivity"
|
||||
android:theme="@style/Theme.Sherlock.Dialog"
|
||||
android:label="Create Passphrase"
|
||||
android:launchMode="singleInstance"
|
||||
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
|
||||
|
||||
<activity android:name=".PassphrasePromptActivity"
|
||||
android:theme="@style/Theme.Sherlock.Dialog"
|
||||
android:label="Enter Passphrase"
|
||||
|
@ -78,7 +84,6 @@
|
|||
android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/>
|
||||
|
||||
<activity android:name=".ApplicationPreferencesActivity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
|
||||
<activity android:name=".PassphraseCreateActivity" android:theme="@android:style/Theme.Dialog" android:label="Create Passphrase" android:launchMode="singleInstance" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
|
||||
<activity android:name=".ReceiveKeyActivity" android:theme="@android:style/Theme.Dialog" android:label="Complete Key Exchange" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
|
||||
<activity android:name=".VerifyImportedIdentityActivity" android:theme="@android:style/Theme.Dialog" android:label="Verify Imported Identity" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"></activity>
|
||||
|
||||
|
|
BIN
res/drawable-hdpi/ic_menu_login.png
Normal file
BIN
res/drawable-hdpi/ic_menu_login.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.6 KiB |
BIN
res/drawable-mdpi/ic_menu_login.png
Normal file
BIN
res/drawable-mdpi/ic_menu_login.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 1.1 KiB |
BIN
res/drawable-xhdpi/ic_menu_login.png
Normal file
BIN
res/drawable-xhdpi/ic_menu_login.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 2.1 KiB |
|
@ -106,7 +106,7 @@
|
|||
<LinearLayout android:id="@+id/indicators_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_centerVertical="true"
|
||||
android:orientation="vertical"
|
||||
android:layout_alignParentRight="true">
|
||||
|
||||
|
@ -115,15 +115,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="@drawable/key"
|
||||
android:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/sms_pending_indicator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="@drawable/ic_sms_mms_pending"
|
||||
android:src="@drawable/ic_menu_login"
|
||||
android:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
|
|
|
@ -15,8 +15,8 @@
|
|||
<LinearLayout android:id="@+id/indicators_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:orientation="vertical"
|
||||
android:layout_centerVertical="true"
|
||||
android:layout_alignParentLeft="true">
|
||||
|
||||
<ImageView
|
||||
|
@ -24,15 +24,7 @@
|
|||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="@drawable/key"
|
||||
android:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/sms_pending_indicator"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="@drawable/ic_sms_mms_pending"
|
||||
android:src="@drawable/ic_menu_login"
|
||||
android:visibility="gone" />
|
||||
|
||||
<ImageView
|
||||
|
|
|
@ -1,62 +1,62 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<ScrollView android:id="@+id/ScrollView"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<LinearLayout android:id="@+id/LinearLayout"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="8px"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<ScrollView android:id="@+id/ScrollView"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<TextView android:text="To get started, please enter a passphrase that will be used to locally encrypt your data. This should be a strong passphrase."
|
||||
android:textSize="19dip"
|
||||
android:id="@+id/create_pass_label"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="10dip"/>
|
||||
|
||||
<EditText android:id="@+id/passphrase_edit"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:password="true"
|
||||
android:layout_margin="10dip"/>
|
||||
<LinearLayout android:id="@+id/LinearLayout"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="8px"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/repeat_label"
|
||||
android:textSize="19dip"
|
||||
android:layout_margin="10dip"
|
||||
android:text="Repeat:"></TextView>
|
||||
|
||||
<EditText
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
<TextView android:text="Please enter 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"/>
|
||||
|
||||
<EditText android:id="@+id/passphrase_edit"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
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:text="Repeat:"></TextView>
|
||||
|
||||
<EditText
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:password="true"
|
||||
android:layout_margin="10dip"
|
||||
android:id="@+id/passphrase_edit_repeat"></EditText>
|
||||
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:id="@+id/RelativeLayout"
|
||||
>
|
||||
<Button android:layout_width="100dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/cancel_button" android:text="Cancel"
|
||||
android:layout_below="@id/passphrase_edit_repeat"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="wrap_content"
|
||||
android:id="@+id/RelativeLayout"
|
||||
>
|
||||
<Button android:layout_width="100dip"
|
||||
android:layout_height="wrap_content"
|
||||
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"
|
||||
android:layout_width="100dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Ok" android:id="@+id/ok_button"
|
||||
android:layout_toLeftOf="@id/cancel_button"></Button>
|
||||
</RelativeLayout>
|
||||
|
||||
<Button android:layout_below="@id/passphrase_edit_repeat"
|
||||
android:layout_width="100dip"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Ok" android:id="@+id/ok_button"
|
||||
android:layout_toLeftOf="@id/cancel_button"></Button>
|
||||
</RelativeLayout>
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
|
|
|
@ -76,7 +76,6 @@ public class ConversationItem extends LinearLayout {
|
|||
|
||||
private TextView bodyText;
|
||||
private TextView dateText;
|
||||
private ImageView pendingImage;
|
||||
private ImageView secureImage;
|
||||
private ImageView failedImage;
|
||||
private ImageView keyImage;
|
||||
|
@ -107,7 +106,6 @@ public class ConversationItem extends LinearLayout {
|
|||
|
||||
this.bodyText = (TextView) findViewById(R.id.conversation_item_body);
|
||||
this.dateText = (TextView) findViewById(R.id.conversation_item_date);
|
||||
this.pendingImage = (ImageView)findViewById(R.id.sms_pending_indicator);
|
||||
this.secureImage = (ImageView)findViewById(R.id.sms_secure_indicator);
|
||||
this.failedImage = (ImageView)findViewById(R.id.sms_failed_indicator);
|
||||
this.keyImage = (ImageView)findViewById(R.id.key_exchange_indicator);
|
||||
|
@ -212,7 +210,7 @@ public class ConversationItem extends LinearLayout {
|
|||
private void setBodyText(MessageRecord messageRecord) {
|
||||
String body = messageRecord.getBody();
|
||||
|
||||
if (messageRecord.isKeyExchange() && messageRecord.isOutgoing()) body = "\nSent key exchange message";
|
||||
if (messageRecord.isKeyExchange() && messageRecord.isOutgoing()) body = "\nKey exchange message";
|
||||
else if (messageRecord.isProcessedKeyExchange() && !messageRecord.isOutgoing()) body = "\nReceived and processed key exchange message.";
|
||||
else if (messageRecord.isStaleKeyExchange()) body = "\nError, received stale key exchange message.";
|
||||
else if (messageRecord.isKeyExchange() && !messageRecord.isOutgoing()) body = "\nReceived key exchange message, click to process";
|
||||
|
@ -250,12 +248,6 @@ public class ConversationItem extends LinearLayout {
|
|||
private void setBodyImage(MessageRecord messageRecord) {
|
||||
Recipient recipient = messageRecord.getMessageRecipient();
|
||||
|
||||
if (messageRecord.isKeyExchange())
|
||||
{
|
||||
contactPhoto.setVisibility(View.GONE);
|
||||
return;
|
||||
}
|
||||
|
||||
if (!messageRecord.isOutgoing()) contactPhoto.setImageBitmap(recipient.getContactPhoto());
|
||||
else setContactPhotoForUserIdentity();
|
||||
|
||||
|
@ -281,7 +273,6 @@ public class ConversationItem extends LinearLayout {
|
|||
}
|
||||
|
||||
private void setStatusIcons(MessageRecord messageRecord) {
|
||||
pendingImage.setVisibility(messageRecord.isPending() ? View.VISIBLE : View.GONE);
|
||||
failedImage.setVisibility(messageRecord.isFailed() ? View.VISIBLE : View.GONE);
|
||||
secureImage.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
|
||||
keyImage.setVisibility(messageRecord.isKeyExchange() ? View.VISIBLE : View.GONE);
|
||||
|
|
Loading…
Add table
Reference in a new issue