diff options
Diffstat (limited to 'src/main/res/layout')
| -rw-r--r-- | src/main/res/layout/activity_change_password.xml | 5 | ||||
| -rw-r--r-- | src/main/res/layout/activity_contact_details.xml | 14 | ||||
| -rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 14 | ||||
| -rw-r--r-- | src/main/res/layout/activity_muc_details.xml | 14 | ||||
| -rw-r--r-- | src/main/res/layout/activity_verify_otr.xml | 5 | ||||
| -rw-r--r-- | src/main/res/layout/fragment_conversations_overview.xml | 2 |
6 files changed, 39 insertions, 15 deletions
diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index c33f238f..28d531c2 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -13,7 +13,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp"> + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin"> <TextView android:layout_width="wrap_content" diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index 21635208..5ecca25e 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -12,9 +12,12 @@ <RelativeLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" - android:padding="16dp" > + android:padding="@dimen/infocard_padding" > <QuickContactBadge android:id="@+id/details_contact_badge" @@ -96,11 +99,14 @@ android:id="@+id/details_contact_keys" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:padding="8dp" + android:padding="@dimen/infocard_padding" android:showDividers="middle" > </LinearLayout> </LinearLayout> diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 36987072..0093f032 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -20,10 +20,13 @@ android:id="@+id/editor" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" android:orientation="vertical" - android:padding="16dp"> + android:padding="@dimen/infocard_padding"> <ImageView android:id="@+id/avater" android:layout_width="72dp" android:layout_height="72dp" @@ -106,10 +109,13 @@ android:id="@+id/stats" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_margin="8dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" android:orientation="vertical" - android:padding="16dp" + android:padding="@dimen/infocard_padding" android:visibility="gone" > <TableLayout diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index 2032c9ea..332ac2a9 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -12,10 +12,13 @@ <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" android:orientation="vertical" - android:padding="16dp"> + android:padding="@dimen/infocard_padding"> <TextView android:id="@+id/muc_jabberid" @@ -118,10 +121,13 @@ android:id="@+id/muc_more_details" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" android:orientation="vertical" - android:padding="8dp"> + android:padding="@dimen/infocard_padding"> <LinearLayout diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml index 1a4221bc..54f9a542 100644 --- a/src/main/res/layout/activity_verify_otr.xml +++ b/src/main/res/layout/activity_verify_otr.xml @@ -13,7 +13,10 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:padding="16dp"> + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin"> <TextView android:id="@+id/verification_explanation" diff --git a/src/main/res/layout/fragment_conversations_overview.xml b/src/main/res/layout/fragment_conversations_overview.xml index d4145761..69570028 100644 --- a/src/main/res/layout/fragment_conversations_overview.xml +++ b/src/main/res/layout/fragment_conversations_overview.xml @@ -5,7 +5,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="288dp" + android:layout_width="@dimen/conversations_overview_width" android:layout_height="match_parent" android:background="@color/primarybackground" android:orientation="vertical" > |