diff options
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/message_received.xml (renamed from res/layout/message_recieved.xml) | 40 | ||||
| -rw-r--r-- | res/layout/message_sent.xml | 42 |
2 files changed, 39 insertions, 43 deletions
diff --git a/res/layout/message_recieved.xml b/res/layout/message_received.xml index ec003920..f7ff44d5 100644 --- a/res/layout/message_recieved.xml +++ b/res/layout/message_received.xml @@ -3,10 +3,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:paddingBottom="4dp" android:paddingLeft="8dp" android:paddingRight="8dp" - android:paddingBottom="4dp" - android:paddingTop="4dp"> + android:paddingTop="4dp" > <LinearLayout android:id="@+id/message_box" @@ -21,31 +21,30 @@ android:layout_width="wrap_content" android:layout_height="fill_parent" android:background="@color/primarybackground" - android:orientation="vertical" android:gravity="center_vertical" - android:paddingTop="4dp" + android:orientation="vertical" android:paddingBottom="4dp" + android:paddingLeft="5dp" android:paddingRight="5dp" - android:paddingLeft="5dp"> + android:paddingTop="4dp" > - <ImageView + <ImageView android:id="@+id/message_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:adjustViewBounds="true" - android:paddingBottom="2dp" - android:scaleType="centerCrop" android:background="@color/primarytext" - /> - + android:paddingBottom="2dp" + android:scaleType="centerCrop" /> + <TextView android:id="@+id/message_body" android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web" + android:textColor="@color/primarytext" android:textIsSelectable="true" - android:textSize="14sp" - android:textColor="@color/primarytext"/> + android:textSize="14sp" /> <Button android:id="@+id/download_button" @@ -53,24 +52,23 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/download_image" - android:visibility="gone"/> + android:visibility="gone" /> - <LinearLayout + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - android:paddingTop="1dp"> + android:paddingTop="1dp" > <ImageView android:id="@+id/security_indicator" android:layout_width="12sp" android:layout_height="12sp" android:layout_gravity="center_vertical" - android:gravity="center_vertical" + android:layout_marginRight="6sp" android:layout_marginTop="2sp" - android:src="@drawable/ic_indicator" - android:layout_marginRight="6sp"/> - + android:gravity="center_vertical" + android:src="@drawable/ic_indicator" /> <TextView android:id="@+id/message_time" @@ -79,8 +77,8 @@ android:layout_gravity="center_vertical" android:gravity="center_vertical" android:text="@string/sending" - android:textSize="12sp" - android:textColor="@color/secondarytext"/> + android:textColor="@color/secondarytext" + android:textSize="12sp" /> </LinearLayout> </LinearLayout> </LinearLayout> diff --git a/res/layout/message_sent.xml b/res/layout/message_sent.xml index 21563eb4..11514019 100644 --- a/res/layout/message_sent.xml +++ b/res/layout/message_sent.xml @@ -3,10 +3,10 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:paddingBottom="4dp" android:paddingLeft="8dp" android:paddingRight="8dp" - android:paddingBottom="4dp" - android:paddingTop="4dp"> + android:paddingTop="4dp" > <LinearLayout android:id="@+id/message_box" @@ -21,38 +21,37 @@ android:layout_width="wrap_content" android:layout_height="fill_parent" android:background="@color/primarybackground" - android:orientation="vertical" android:gravity="center_vertical" - android:paddingTop="4dp" + android:orientation="vertical" android:paddingBottom="4dp" + android:paddingLeft="5dp" android:paddingRight="5dp" - android:paddingLeft="5dp"> - - <ImageView + android:paddingTop="4dp" > + + <ImageView android:id="@+id/message_image" android:layout_width="wrap_content" android:layout_height="wrap_content" android:adjustViewBounds="true" - android:paddingBottom="2dp" - android:scaleType="centerCrop" android:background="@color/primarytext" - /> + android:paddingBottom="2dp" + android:scaleType="centerCrop" /> <TextView android:id="@+id/message_body" android:layout_width="wrap_content" android:layout_height="wrap_content" android:autoLink="web" + android:textColor="@color/primarytext" android:textIsSelectable="true" - android:textSize="14sp" - android:textColor="@color/primarytext"/> + android:textSize="14sp" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" android:layout_gravity="right" - android:paddingTop="1dp"> + android:orientation="horizontal" + android:paddingTop="1dp" > <TextView android:id="@+id/message_time" @@ -61,19 +60,18 @@ android:layout_gravity="center_vertical" android:gravity="center_vertical" android:text="@string/sending" - android:textSize="12sp" - android:textColor="@color/secondarytext"/> - - <ImageView + android:textColor="@color/secondarytext" + android:textSize="12sp" /> + + <ImageView android:id="@+id/security_indicator" android:layout_width="12sp" android:layout_height="12sp" android:layout_gravity="center_vertical" - android:gravity="center_vertical" + android:layout_marginLeft="6sp" android:layout_marginTop="2sp" - android:src="@drawable/ic_indicator" - android:layout_marginLeft="6sp"/> - + android:gravity="center_vertical" + android:src="@drawable/ic_indicator" /> </LinearLayout> </LinearLayout> </LinearLayout> |