TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-08-26 04:38:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

simplified layouts

Browse Source
This commit is contained in:
Jake McGinty
2014-03-27 19:46:27 -07:00
parent c43ef8bce0
commit d4d684b670
4 changed files with 41 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
res/layout/conversation_item_received.xml
View File

@@ -48,47 +48,37 @@
android:background="?conversation_item_received_background"
android:orientation="vertical">
<LinearLayout
<TextView android:id="@+id/conversation_item_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dip"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:orientation="horizontal">
<ImageView android:id="@+id/key_exchange_indicator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_menu_login"
android:contentDescription="Key Exchange Indicator"
android:visibility="gone" />
<TextView android:id="@+id/conversation_item_body"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?conversation_received_text_primary_color"
android:textSize="16sp"
android:autoLink="all"
android:linksClickable="true" />
</LinearLayout>
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?conversation_received_text_primary_color"
android:textSize="16sp"
android:autoLink="all"
android:linksClickable="true" />
<FrameLayout android:id="@+id/mms_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone">
<ImageView android:id="@+id/image_view"
android:layout_width="230dip"
android:layout_height="174dip"
android:layout_gravity="center"
android:scaleType="centerInside"
android:adjustViewBounds="true"
android:contentDescription="Message Media"
android:contentDescription="@string/conversation_item__mms_image_description"
android:visibility="gone" />
<ImageButton android:id="@+id/play_slideshow_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/mms_play_btn"
android:contentDescription="Play Button"
android:contentDescription="@string/conversation_item__play_button_description"
android:visibility="gone" />
</FrameLayout>
@@ -130,7 +120,7 @@
android:layout_height="wrap_content"
android:paddingRight="3dip"
android:src="?conversation_delivered_indicator"
android:contentDescription="Delivered Indicator"
android:contentDescription="@string/conversation_item_sent__delivered_description"
android:visibility="gone" />
<ImageView android:id="@+id/sms_secure_indicator"
@@ -140,7 +130,7 @@
android:paddingRight="4dp"
android:paddingTop="2dp"
android:src="?menu_lock_icon_small"
android:contentDescription="Secure Message Indicator"
android:contentDescription="@string/conversation_item__secure_message_description"
android:visibility="gone" />
<TextView android:id="@+id/conversation_item_date"
@@ -168,7 +158,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/ic_list_alert_sms_failed"
android:contentDescription="Send Failed Indicator"
android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description"
android:visibility="gone" />
</LinearLayout>

57
res/layout/conversation_item_sent.xml
View File

@@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:src="@drawable/ic_list_alert_sms_failed"
android:visibility="gone"
android:contentDescription="Send Failed Indicator"/>
android:contentDescription="@string/conversation_item_sent__send_failed_indicator_description"/>
<ImageView
android:id="@+id/pending_approval_indicator"
@@ -38,7 +38,7 @@
android:src="@drawable/ic_dialog_info_holo_light"
android:visibility="gone"
android:layout_gravity="center_vertical"
android:contentDescription="Pending Approval"/>
android:contentDescription="@string/conversation_item_sent__pending_approval_description"/>
</LinearLayout>
<LinearLayout android:id="@+id/conversation_item_parent"
@@ -52,30 +52,16 @@
android:layout_marginRight="12dp"
android:orientation="vertical">
<LinearLayout android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="5dip">
<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:gravity="right"
android:textColor="?conversation_sent_text_primary_color"
android:textColorLink="?conversation_sent_text_primary_color"
android:textSize="16sp" />
<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"/>
</LinearLayout>
<TextView android:id="@+id/conversation_item_body"
android:autoLink="all"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="5dip"
android:linksClickable="true"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?conversation_sent_text_primary_color"
android:textColorLink="?conversation_sent_text_primary_color"
android:textSize="16sp" />
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/mms_view"
@@ -91,7 +77,7 @@
android:scaleType="centerInside"
android:adjustViewBounds="true"
android:visibility="gone"
android:contentDescription="Media Message"/>
android:contentDescription="@string/conversation_item__mms_image_description"/>
<ImageButton
android:id="@+id/play_slideshow_button"
@@ -100,7 +86,7 @@
android:src="@drawable/mms_play_btn"
android:layout_gravity="center"
android:visibility="gone"
android:contentDescription="Play Button"/>
android:contentDescription="@string/conversation_item__play_button_description"/>
</FrameLayout>
@@ -140,7 +126,7 @@
android:paddingRight="3dip"
android:src="?conversation_delivered_indicator"
android:visibility="gone"
android:contentDescription="Delivered Indicator"/>
android:contentDescription="@string/conversation_item_sent__delivered_description"/>
<TextView android:id="@+id/group_message_status"
android:layout_width="wrap_content"
@@ -175,7 +161,7 @@
android:visibility="gone"
android:paddingLeft="4dp"
android:paddingBottom="3dp"
android:contentDescription="Secure Message Indicator" />
android:contentDescription="@string/conversation_item__secure_message_description" />
</LinearLayout>
@@ -189,17 +175,6 @@
android:layout_alignParentRight="true"
/>
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@id/contact_photo"
android:layout_alignParentRight="true"
android:layout_width="40dp"
android:layout_height="40dp"
android:cropToPadding="true"
android:layout_marginRight="0dip"
android:padding="0dip"
android:scaleType="centerCrop"
android:visibility="gone" />
<TextView android:id="@+id/indicator_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

8
res/values/strings.xml
View File

@@ -437,9 +437,17 @@
<string name="conversation_activity__send">Send</string>
<string name="conversation_activity__remove">Remove</string>
<!-- conversation_item -->
<string name="conversation_item__mms_image_description">Media Message</string>
<string name="conversation_item__play_button_description">Play Button</string>
<string name="conversation_item__secure_message_description">Secure Message Indicator</string>
<!-- conversation_item_sent -->
<string name="conversation_item_sent__download">Download</string>
<string name="conversation_item_sent__downloading">Downloading</string>
<string name="conversation_item_sent__send_failed_indicator_description">Send Failed Indicator</string>
<string name="conversation_item_sent__pending_approval_description">Pending Approval</string>
<string name="conversation_item_sent__delivered_description">Delivered Indicator</string>
<!-- conversation_item_received -->
<string name="conversation_item_received__download">Download</string>