From 1ff278dc81eae800237f51931fcaa2941030e246 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Mon, 30 Jul 2012 17:15:49 -0700 Subject: [PATCH] Update the key exchange icon look. --- AndroidManifest.xml | 7 +- res/drawable-hdpi/ic_menu_login.png | Bin 0 -> 1656 bytes res/drawable-mdpi/ic_menu_login.png | Bin 0 -> 1114 bytes res/drawable-xhdpi/ic_menu_login.png | Bin 0 -> 2178 bytes res/layout/conversation_item_received.xml | 12 +-- res/layout/conversation_item_sent.xml | 12 +-- res/layout/create_passphrase_activity.xml | 100 +++++++++--------- .../securesms/ConversationItem.java | 11 +- 8 files changed, 61 insertions(+), 81 deletions(-) create mode 100644 res/drawable-hdpi/ic_menu_login.png create mode 100644 res/drawable-mdpi/ic_menu_login.png create mode 100644 res/drawable-xhdpi/ic_menu_login.png diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2c83c8ee9b..c6745ae674 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -32,6 +32,12 @@ android:windowSoftInputMode="stateHidden" android:configChanges="touchscreen|keyboard|keyboardHidden|orientation|screenLayout"/> + + - diff --git a/res/drawable-hdpi/ic_menu_login.png b/res/drawable-hdpi/ic_menu_login.png new file mode 100644 index 0000000000000000000000000000000000000000..afa152b2e991edc1883897dfc6260ad1f8b8ae9e GIT binary patch literal 1656 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 Q4Nwt-r>mdKI;Vst0A&r~QUCw| literal 0 HcmV?d00001 diff --git a/res/drawable-xhdpi/ic_menu_login.png b/res/drawable-xhdpi/ic_menu_login.png new file mode 100644 index 0000000000000000000000000000000000000000..5095ed97245fe08063e7f64b86d893dd2d67bc68 GIT binary patch literal 2178 zcmZ{lXE@sn8^-@gNHuDlB6dQJS`ATZhon}F*ivon)l}@3^BPI48Z}z9s@m9;LvgH00C<&tkVI}e*^&? zIN;sxdf?o?I7=+BpPoDP{9rm1ZbgVXpw+*!7$BPbSzZb^3pybBU;SindIJDorZv{g zC3tqZ*zV$4chUa+Z?hX(VGF~tzI2KAs2CHQ5Nj7M(bPwk=8B=V>R3lzIG2V~fdDaY znu$OlnnURKYaiI87KqdxqSA^)?u|dP^SmWgW5aFTe@P@M8#Rae^&!e5+n721rH3s% z&GC3J&wRSEx3bTOn$z#^s##Cco#8lx(By@UePP)cPMnu0T!R;FBbxBeM%LHd#exud zp7cUJcR5*1Y6(vXI6M@LJR{LBWOOPV0M%Axp4O8pp8r8*Ixb02XA+gjvpxxpMK6Hf zmfrPK3I?J1jIR<=Eqf9A>gC`4=c(;I=EsZ?4LtZ`@|`=u%RY=&!>#OnyG5-+AxI@N znvl@bzx8;O(~<%T^cdjNv>^1 zK|#Y(22!e@NL3sx!Ie)P1F#-j+-UCP+IYt!7N*QmibZYZH_;f} zeM$18a2wOVa%3cv28Ll6_y?uW5Poiqb>fsZ^DS?M$7-b64N9C8*+{GN76g^vpF}hq zs(b;@BM%ussnk5hooMyFZ?{ec2mW^YM=eE(EHBO~^rqAMbK9m^EJ-Y798XJIq@$6| zMrA>}mp$SNb7gMI0#|x23T{Aiq;WZt2mwm>;?LggtVw#6zp?qU@Rfq482f4ZRnOIh zCvQILlBaS@N=_mF$)HS$?K`C&@bkXt6X= z!Ugp7$?mnAtb|ff?QT5}tf*;b6`4I82qT^&Be1fM%NZ~dIv(DgvC7_Ssk|ZGXwsKq zoB?e$rA(EPq9W}jL<2Y+T+MhjPlzis~F^Sh#V$2`}bMDmkJ|eFnYMK zWj}%X*r+GfUiFI3!=|?1vwOoiH_`)%Jlk~?FOTCz0+XWXc!5cVy*NLhivs4)!iL)N}w|b6ZU7cfIa7J<(MBSe}T4YSlfJ z4&@G>furk)z(5(x2k%T2%%jexaQMsj2$m9A-%o|OUqy_Fu$(88vZ8PJ*-&QhRb+3i z0DyYxx^12*sWxk<58#O38F|~`x^(*)7h3WSQKi%ANfo3N0XYiYZERrgRe7FEdChv- zg%9l;xihd!aTO&B%KlSlDnw@cJnIHaAodBtoDP!zsJ^(;=k5^a@lNsy(Z714KNj$2*27GL8xNXc6#b{g0km+ z#W~0?r_Qhms<63Ec^}R&4x|+uUdDyIP)kcGY2Hr}q_;R!du0krRZlIBq6evonn{r} z!)Zy{tt$+(HcS>Tx9!-RvGp4rC9?-CikDz2F+dtd27@c<_u8>Y$_ux#D&U9@{A z-BZf5HsoKeC#thT0-dp+bN!2ug2zm~Ge~8xaGiKv4fbIRH%kDt(DXbj_eJ{ciKDw} z4@^Htm4bMok8e+tH05;(#UB>PlZsT^z(=ukpec2bD{ zQ%m`;wO->q!`kaBL1o`^l=C5qYu7*Rh9hcyInjTI#Tsg^hzT3F(=zb$IG%^igL{f7 zA-T8_2i%vmvq@sz4KAK~ANT+OR5!1dH4kP>l&nlYy%7bT zgkSl>87lqn%F^Aa6rly8JHFjrt;Og2dyKJJ!}+qoz5bd@4$IFM5V<1>9IV&Ddsd7- z?Gf$o6CGgS7a4E>KpUy0rGeDZ(AIT9>KmX=8lX@bNIe52Qc$6>{eJ?XVg4b3asNM% zm?#E52uS>Ca1INMzU&hj0GRoQ`3AtPLw$k*oC19O<01wEj1G(lnwMssiKe*vZ* B;N1WK literal 0 HcmV?d00001 diff --git a/res/layout/conversation_item_received.xml b/res/layout/conversation_item_received.xml index cca4c4e9e7..9675e6786c 100644 --- a/res/layout/conversation_item_received.xml +++ b/res/layout/conversation_item_received.xml @@ -106,7 +106,7 @@ @@ -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" /> - - - - - - - + - - - + - - - + + + + + + - + - - - - + + + diff --git a/src/org/thoughtcrime/securesms/ConversationItem.java b/src/org/thoughtcrime/securesms/ConversationItem.java index 8e7891e7c3..1197560117 100644 --- a/src/org/thoughtcrime/securesms/ConversationItem.java +++ b/src/org/thoughtcrime/securesms/ConversationItem.java @@ -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);