diff options
Diffstat (limited to 'src/main/res/layout/activity_edit_account.xml')
-rw-r--r-- | src/main/res/layout/activity_edit_account.xml | 65 |
1 files changed, 40 insertions, 25 deletions
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 275a1d894..b8c48a382 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -29,10 +29,10 @@ android:id="@+id/editor" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:orientation="vertical" android:padding="@dimen/card_padding_regular" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -51,9 +51,11 @@ android:layout_marginBottom="@dimen/avatar_item_distance" android:adjustViewBounds="true" android:contentDescription="@string/account_image_description" - android:maxHeight="384dp" android:maxWidth="384dp" + android:maxHeight="384dp" android:padding="1dp" + app:riv_border_color="?attr/color_border" + app:riv_border_width="1dp" app:riv_corner_radius="@dimen/rounded_image_border" /> <LinearLayout @@ -177,8 +179,8 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/show_privacy" android:visibility="gone" /> @@ -188,8 +190,8 @@ android:layout_height="wrap_content" android:layout_centerHorizontal="true" android:layout_gravity="center_horizontal" - android:layout_marginBottom="4dp" android:layout_marginTop="4dp" + android:layout_marginBottom="4dp" android:text="@string/show_termsofuse" android:visibility="gone" /> </LinearLayout> @@ -200,10 +202,10 @@ android:id="@+id/os_optimization" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:visibility="gone" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -258,10 +260,10 @@ android:id="@+id/stats" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:background="@drawable/infocard_border" android:orientation="vertical" android:padding="@dimen/card_padding_regular" @@ -554,9 +556,11 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_toLeftOf="@+id/action_copy_to_clipboard" + android:layout_toStartOf="@+id/key_actions" + android:layout_toLeftOf="@+id/key_actions" android:orientation="vertical"> <TextView @@ -574,17 +578,25 @@ </LinearLayout> - <ImageButton - android:id="@+id/action_copy_to_clipboard" + <LinearLayout + android:id="@+id/key_actions" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:background="?attr/selectableItemBackgroundBorderless" - android:contentDescription="@string/copy_otr_clipboard_description" - android:padding="@dimen/image_button_padding" - android:src="?attr/icon_copy" - android:visibility="visible" /> + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/action_copy_to_clipboard" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:background="?attr/selectableItemBackgroundBorderless" + android:contentDescription="@string/copy_otr_clipboard_description" + android:padding="@dimen/image_button_padding" + android:src="?attr/icon_copy" + android:visibility="visible" /> + </LinearLayout> </RelativeLayout> <RelativeLayout @@ -596,8 +608,10 @@ <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" android:layout_centerVertical="true" + android:layout_toStartOf="@+id/axolotl_actions" android:layout_toLeftOf="@+id/axolotl_actions" android:orientation="vertical"> @@ -618,9 +632,10 @@ android:id="@+id/axolotl_actions" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:orientation="vertical"> + android:orientation="horizontal"> <ImageButton android:id="@+id/action_copy_axolotl_to_clipboard" @@ -650,10 +665,10 @@ android:id="@+id/other_device_keys_card" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:visibility="gone" card_view:cardBackgroundColor="?attr/color_background_secondary"> @@ -694,11 +709,11 @@ android:id="@+id/button_bar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" + android:layout_alignParentStart="true" android:layout_alignParentLeft="true" + android:layout_alignParentEnd="true" android:layout_alignParentRight="true" - android:layout_alignParentStart="true"> + android:layout_alignParentBottom="true"> <Button android:id="@+id/cancel_button" @@ -711,8 +726,8 @@ <View android:layout_width="1dp" android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" /> + android:layout_marginTop="7dp" + android:layout_marginBottom="7dp" /> <Button android:id="@+id/save_button" |