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

icon, contact list and conversation redesign

Browse Source
This commit is contained in:
Jake McGinty
2014-01-08 12:29:05 -10:00
parent 75ce00cb90
commit 28c1c5006b
119 changed files with 31542 additions and 233 deletions
Download Patch File Download Diff File Expand all files Collapse all files

127
res/layout/conversation_item_received.xml
View File

@@ -5,46 +5,73 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:paddingRight="10dip"
android:orientation="horizontal">
android:orientation="horizontal"
android:background="?conversation_background">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="?conversation_card_background">
android:layout_marginTop="6dp"
android:layout_marginLeft="10dp"
android:layout_marginBottom="6dp"
android:layout_marginRight="0dp">
<view xmlns:android="http://schemas.android.com/apk/res/android"
class="org.thoughtcrime.securesms.components.ImageDivet"
position="right"
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/contact_photo"
android:layout_alignParentLeft="true"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_width="40dp"
android:layout_height="40dp"
android:cropToPadding="true"
android:scaleType="centerCrop" />
android:scaleType="centerCrop"
android:layout_marginRight="10dp"
/>
<View
android:id="@+id/triangle_tick"
android:background="@drawable/conversation_item_received_triangle_shape"
android:layout_width="12dp"
android:layout_height="15dp"
android:layout_marginTop="12dp"
android:layout_alignRight="@id/contact_photo"
/>
<LinearLayout android:id="@+id/conversation_item_parent"
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toLeftOf="@+id/indicators_parent"
android:layout_toRightOf="@id/contact_photo"
android:background="?conversation_background"
android:paddingLeft="10dip"
android:orientation="vertical" >
android:layout_toRightOf="@id/triangle_tick"
android:background="@drawable/conversation_item_received_shape"
android:orientation="vertical">
<TextView android:id="@+id/conversation_item_body"
android:autoLink="all"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:linksClickable="true"
android:paddingTop="5dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?conversation_text_primary_color"
android:textSize="16sp" />
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="5dip"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<ImageView
android:id="@+id/key_exchange_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_menu_login"
android:visibility="gone"
android:contentDescription="Key Exchange Indicator"/>
<TextView android:id="@+id/conversation_item_body"
android:autoLink="all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?conversation_received_text_primary_color"
android:textSize="16sp" />
</LinearLayout>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mms_view"
android:layout_width="fill_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:paddingTop="7dip"
@@ -96,11 +123,14 @@
</LinearLayout>
<LinearLayout android:layout_width="fill_parent"
<LinearLayout android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:paddingTop="5dip"
android:gravity="left">
android:gravity="left"
android:paddingTop="2dip"
android:paddingLeft="8dp"
android:paddingRight="5dp"
android:paddingBottom="5dp" >
<ImageView android:id="@+id/delivered_indicator"
android:layout_width="wrap_content"
@@ -109,17 +139,27 @@
android:src="?conversation_delivered_indicator"
android:visibility="gone"
android:contentDescription="Delivered Indicator"/>
<TextView android:id="@+id/group_message_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:linksClickable="false"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_gravity="left"
android:textColor="?conversation_text_secondary_color"
android:textColor="?conversation_received_text_secondary_color"
android:visibility="gone"
android:layout_marginRight="8dip"
android:paddingTop="1dip"/>
android:paddingTop="1dip"/>
<ImageView android:id="@+id/sms_secure_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="?menu_lock_icon_small"
android:layout_gravity="center_vertical"
android:visibility="gone"
android:paddingRight="4dp"
android:paddingTop="2dp"
android:contentDescription="Secure Message Indicator"/>
<TextView android:id="@+id/conversation_item_date"
android:autoLink="all"
@@ -128,10 +168,11 @@
android:linksClickable="false"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_gravity="left"
android:textColor="?conversation_text_secondary_color"
android:paddingTop="1dip"/>
</LinearLayout>
android:textColor="?conversation_received_text_secondary_color"
android:fontFamily="sans-serif-light"
android:paddingTop="1dip" />
</LinearLayout>
</LinearLayout>
<LinearLayout android:id="@+id/indicators_parent"
@@ -142,21 +183,7 @@
android:gravity="center_vertical"
android:background="?conversation_background">
<ImageView
android:id="@+id/key_exchange_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_menu_login"
android:visibility="gone"
android:contentDescription="Key Exchange Indicator"/>
<ImageView
android:id="@+id/sms_secure_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_menu_lock_holo_light"
android:visibility="gone"
android:contentDescription="Secure Message Indicator"/>
<ImageView
android:id="@+id/sms_failed_indicator"