oxen-io
/
session-android
mirror of https://github.com/oxen-io/session-android.git
1
0
Fork 0
Code Issues 1 Projects Releases Wiki Activity

New lock icons.

This commit is contained in:
Moxie Marlinspike 2012-07-30 17:51:31 -07:00
parent 5918353fc7
commit e641a28cf5
7 changed files with 5 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_menu_lock_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 767 B

BIN
res/drawable-mdpi/ic_menu_lock_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 611 B

BIN
res/drawable-xhdpi/ic_menu_lock_holo_light.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

41
res/layout/conversation_activity.xml
View File

@ -149,53 +149,14 @@
android:maxLength="1000"
/>
<!-- <RelativeLayout -->
<!-- android:id="@+id/editor_with_counter" -->
<!-- android:layout_width="0dip" -->
<!-- android:layout_height="wrap_content" -->
<!-- android:layout_weight="1.0" -->
<!-- android:addStatesFromChildren="true" -->
<!-- android:background="@android:drawable/edit_text"> -->
<!-- <EditText -->
<!-- android:id="@+id/embedded_text_editor" -->
<!-- android:layout_width="fill_parent" -->
<!-- android:layout_height="wrap_content" -->
<!-- android:autoText="true" -->
<!-- android:capitalize="sentences" -->
<!-- android:nextFocusRight="@+id/send_button" -->
<!-- android:hint="Type to compose" -->
<!-- android:maxLines="4" -->
<!-- android:inputType="textShortMessage|textAutoCorrect|textCapSentences|textMultiLine" -->
<!-- android:imeOptions="actionSend|flagNoEnterAction" -->
<!-- android:background="@null" -->
<!-- android:maxLength="1000" -->
<!-- /> -->
<!-- <TextView -->
<!-- android:id="@+id/text_counter" -->
<!-- android:layout_width="wrap_content" -->
<!-- android:layout_height="wrap_content" -->
<!-- android:background="#88000000" -->
<!-- android:textColor="#ffffffff" -->
<!-- android:textSize="11sp" -->
<!-- android:textStyle="bold" -->
<!-- android:paddingLeft="3dip" -->
<!-- android:paddingRight="3dip" -->
<!-- android:layout_alignParentRight="true" -->
<!-- android:layout_alignParentTop="true" -->
<!-- android:visibility="gone" -->
<!-- /> -->
<!-- </RelativeLayout> -->
<Button android:id="@+id/send_button"
android:layout_marginLeft="5dip"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
style="?android:attr/buttonStyle"
android:layout_gravity="center_vertical"
android:nextFocusLeft="@+id/embedded_text_editor"
android:text="Send"
android:padding="8dip"
/>
</LinearLayout>
<TextView android:id="@+id/space_left"

2
res/layout/conversation_item_received.xml
View File

@ -123,7 +123,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_lock_message_sms"
android:src="@drawable/ic_menu_lock_holo_light"
android:visibility="gone" />
<ImageView

2
res/layout/conversation_item_sent.xml
View File

@ -32,7 +32,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:src="@drawable/ic_lock_message_sms"
android:src="@drawable/ic_menu_lock_holo_light"
android:visibility="gone" />
<ImageView

4
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -365,8 +365,8 @@ public class ConversationActivity extends SherlockFragmentActivity {
if (isSingleExistingConversation() &&
KeyUtil.isSessionFor(this, recipients.getPrimaryRecipient()))
{
sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_lock_small, 0);
sendButton.setCompoundDrawablePadding(10);
sendButton.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_menu_lock_holo_light, 0);
sendButton.setCompoundDrawablePadding(15);
this.sendEncrypted = true;
this.characterCalculator = new EncryptedCharacterCalculator();
} else {