diff options
Diffstat (limited to 'src/main/res/layout')
-rw-r--r-- | src/main/res/layout/account_row.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 34 | ||||
-rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 15 | ||||
-rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 9 | ||||
-rw-r--r-- | src/main/res/layout/activity_publish_profile_picture.xml | 6 | ||||
-rw-r--r-- | src/main/res/layout/contact.xml | 8 | ||||
-rw-r--r-- | src/main/res/layout/conversation_list_row.xml | 4 | ||||
-rw-r--r-- | src/main/res/layout/message_received.xml | 15 | ||||
-rw-r--r-- | src/main/res/layout/message_sent.xml | 15 | ||||
-rw-r--r-- | src/main/res/layout/message_status.xml | 5 |
10 files changed, 84 insertions, 31 deletions
diff --git a/src/main/res/layout/account_row.xml b/src/main/res/layout/account_row.xml index 077170b29..fc8aae09a 100644 --- a/src/main/res/layout/account_row.xml +++ b/src/main/res/layout/account_row.xml @@ -13,7 +13,9 @@ android:layout_height="48dp" android:layout_alignParentLeft="true" android:src="@drawable/ic_profile" - android:contentDescription="@string/account_image_description"> + android:contentDescription="@string/account_image_description" + android:background="@drawable/message_border" + android:padding="1dp"> </ImageView> <LinearLayout diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 5f6a2dd09..e1a967c07 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -21,18 +21,25 @@ <QuickContactBadge android:id="@+id/details_contact_badge" - android:layout_width="72dp" - android:layout_height="72dp" + android:layout_width="300dp" + android:layout_height="300dp" + android:scaleType="centerCrop" android:layout_alignParentTop="true" - android:scaleType="centerCrop" /> + android:layout_centerHorizontal="true" + android:background="@drawable/message_border" + android:padding="1dp" /> <LinearLayout android:id="@+id/details_jidbox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_toRightOf="@+id/details_contact_badge" - android:orientation="vertical" > + android:orientation="vertical" + android:layout_below="@+id/details_contact_badge" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:layout_marginTop="16dp" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true"> <TextView android:id="@+id/details_contactjid" @@ -41,12 +48,14 @@ android:text="@string/account_settings_example_jabber_id" android:textColor="@color/black87" android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" /> + android:textStyle="bold" + android:layout_gravity="center_horizontal" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="vertical" > + android:orientation="vertical" + android:layout_gravity="center_horizontal"> <LinearLayout android:id="@+id/tags" @@ -54,7 +63,8 @@ android:layout_height="wrap_content" android:layout_marginTop="4dp" android:layout_marginBottom="4dp" - android:orientation="horizontal"> + android:orientation="horizontal" + android:layout_gravity="center_horizontal"> </LinearLayout> <TextView @@ -62,7 +72,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/black54" - android:textSize="?attr/TextSizeBody" /> + android:textSize="?attr/TextSizeBody" + android:layout_gravity="center_horizontal" /> </LinearLayout> <Button @@ -70,7 +81,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:text="@string/add_contact"/> + android:text="@string/add_contact" + android:layout_gravity="center_horizontal" /> <CheckBox android:id="@+id/details_send_presence" diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 53226b826..fb02f7bf4 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -28,16 +28,21 @@ android:orientation="vertical" android:padding="@dimen/infocard_padding"> <ImageView android:id="@+id/avater" - android:layout_width="72dp" - android:layout_height="72dp" + android:layout_width="300dp" + android:layout_height="300dp" + android:contentDescription="@string/account_image_description" + android:background="@drawable/message_border" + android:padding="1dp" android:layout_alignParentTop="true" - android:layout_marginRight="16dp" - android:contentDescription="@string/account_image_description"/> + android:layout_centerHorizontal="true" /> <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:layout_toRightOf="@+id/avater"> + android:layout_below="@+id/avater" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_marginTop="16dp"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index b89c9945b..671215eaa 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -37,10 +37,13 @@ <ImageView android:id="@+id/your_photo" - android:layout_width="48dp" - android:layout_height="48dp" + android:layout_width="72dp" + android:layout_height="72dp" android:layout_alignParentLeft="true" - android:src="@drawable/ic_profile"> + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" + android:padding="1dp" + android:layout_alignParentEnd="false"> </ImageView> <LinearLayout diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 3b249a665..a9f35daf6 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -16,8 +16,8 @@ <ImageView android:id="@+id/account_image" - android:layout_width="194dp" - android:layout_height="194dp" /> + android:layout_width="300dp" + android:layout_height="300dp" /> </LinearLayout> <TextView @@ -103,4 +103,4 @@ android:textSize="?attr/TextSizeBody" /> </LinearLayout> -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index 3c0c74876..ccc013fcc 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -7,11 +7,13 @@ <ImageView android:id="@+id/contact_photo" - android:layout_width="48dp" - android:layout_height="48dp" + android:layout_width="56dp" + android:layout_height="56dp" android:layout_alignParentLeft="true" android:scaleType="centerCrop" - android:src="@drawable/ic_profile" > + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" + android:padding="1dp"> </ImageView> <LinearLayout diff --git a/src/main/res/layout/conversation_list_row.xml b/src/main/res/layout/conversation_list_row.xml index 28e526e0b..5f1c5047d 100644 --- a/src/main/res/layout/conversation_list_row.xml +++ b/src/main/res/layout/conversation_list_row.xml @@ -26,7 +26,9 @@ android:layout_width="56dp" android:layout_height="56dp" android:layout_alignParentLeft="true" - android:scaleType="centerCrop" /> + android:scaleType="centerCrop" + android:background="@drawable/message_border" + android:padding="1dp" /> <RelativeLayout android:layout_width="fill_parent" diff --git a/src/main/res/layout/message_received.xml b/src/main/res/layout/message_received.xml index 4de9adddf..ab1a02434 100644 --- a/src/main/res/layout/message_received.xml +++ b/src/main/res/layout/message_received.xml @@ -92,5 +92,18 @@ </LinearLayout> </LinearLayout> </LinearLayout> - + <ImageView + android:id="@+id/message_photo" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginRight="-1.5dp" + android:scaleType="fitXY" + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" + android:paddingLeft="1dp" + android:paddingTop="1dp" + android:paddingBottom="1dp" + android:paddingRight="0dp" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml index 96e7808f2..b14462399 100644 --- a/src/main/res/layout/message_sent.xml +++ b/src/main/res/layout/message_sent.xml @@ -103,5 +103,18 @@ </LinearLayout> </LinearLayout> </LinearLayout> - + <ImageView + android:id="@+id/message_photo" + android:layout_width="48dp" + android:layout_height="48dp" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:layout_marginLeft="-1.5dp" + android:scaleType="fitXY" + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" + android:paddingTop="1dp" + android:paddingRight="1dp" + android:paddingBottom="1dp" + android:paddingLeft="0dp" /> </RelativeLayout>
\ No newline at end of file diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml index 222e23f5e..6a7dfcfe9 100644 --- a/src/main/res/layout/message_status.xml +++ b/src/main/res/layout/message_status.xml @@ -15,9 +15,10 @@ android:layout_alignParentLeft="true" android:layout_alignParentTop="true" android:layout_marginRight="-1.5dp" - android:padding="0dp" + android:padding="1dp" android:scaleType="fitXY" - android:src="@drawable/ic_profile" /> + android:src="@drawable/ic_profile" + android:background="@drawable/message_border" /> <TextView android:id="@+id/status_message" |