TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-10-10 15:12:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to QuickContactBadge.

Browse Source
This commit is contained in:
Moxie Marlinspike
2012-07-16 20:20:13 -07:00
parent 44c221c9f1
commit 63250b33a8
7 changed files with 39 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.8 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 4.6 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.2 KiB

BIN
res/drawable/ic_contact_picture.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

43
res/layout/conversation_header_view.xml
View File

@@ -2,7 +2,7 @@
<org.thoughtcrime.securesms.ConversationHeaderView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="?android:attr/listPreferredItemHeight"
android:paddingRight="10dip"
android:paddingRight="10dip"
>
<ImageView android:id="@+id/unread_indicator"
@@ -11,22 +11,14 @@
android:layout_alignParentLeft="true"
android:visibility="invisible"
android:src="@drawable/ic_sms_unread_msg_indicator" />
<!-- <android.widget.QuickContactBadge android:id="@+id/contact_photo"-->
<!-- android:layout_width="60dp"-->
<!-- android:layout_height="60dp"-->
<!-- android:cropToPadding="true"-->
<!-- android:scaleType="centerCrop"-->
<!-- android:layout_toRightOf="@id/unread_indicator"-->
<!-- android:visibility="gone" />-->
<ImageView android:id="@+id/contact_photo"
android:layout_width="60dp"
android:layout_height="60dp"
android:cropToPadding="true"
android:scaleType="centerCrop"
android:layout_toRightOf="@id/unread_indicator"
android:visibility="gone" />
<QuickContactBadge android:id="@+id/contact_photo"
android:layout_width="60dp"
android:layout_height="60dp"
android:cropToPadding="true"
android:scaleType="centerCrop"
android:layout_toRightOf="@id/unread_indicator"
android:visibility="gone" />
<ImageView android:id="@+id/key_indicator"
@@ -35,13 +27,13 @@
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"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:visibility="gone" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:visibility="gone" />
<TextView android:id="@+id/from"
android:layout_width="wrap_content"
@@ -55,10 +47,10 @@
android:layout_toRightOf="@id/contact_photo"
android:layout_toLeftOf="@id/checkbox"
android:layout_alignWithParentIfMissing="true"
android:ellipsize="marquee"
android:ellipsize="marquee"
android:textColor="#000000"/>
<TextView android:id="@+id/date"
android:layout_marginBottom="10dip"
android:layout_marginLeft="5dip"
@@ -101,4 +93,3 @@
android:ellipsize="end" />
</org.thoughtcrime.securesms.ConversationHeaderView>

18
res/layout/main.xml
View File

@@ -29,17 +29,13 @@
/>
<ListView android:id="@android:id/list"
style="?android:attr/listViewWhiteStyle"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:drawSelectorOnTop="false"
android:scrollbarStyle="insideOverlay"
android:fadingEdgeLength="16dip"
android:background="@android:color/white"
android:cacheColorHint="@android:color/white"
android:layout_alignParentTop="true"
android:layout_above="@id/search_text" />
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:drawSelectorOnTop="false"
android:scrollbarStyle="insideOverlay"
android:fadingEdgeLength="16dip"
android:layout_alignParentTop="true"
android:layout_above="@id/search_text" />
<ProgressBar android:id="@+id/search_progress"
android:layout_width="wrap_content"