diff options
Diffstat (limited to 'app/src/main/res/layout/a_add_provider.xml')
-rw-r--r-- | app/src/main/res/layout/a_add_provider.xml | 65 |
1 files changed, 38 insertions, 27 deletions
diff --git a/app/src/main/res/layout/a_add_provider.xml b/app/src/main/res/layout/a_add_provider.xml index fd515bf3..7d14ea96 100644 --- a/app/src/main/res/layout/a_add_provider.xml +++ b/app/src/main/res/layout/a_add_provider.xml @@ -4,13 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" style="@style/BitmaskActivity" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:padding="@dimen/stdpadding" tools:context=".AddProviderActivity"> - <!--Contains header information!??? --> - <include layout="@layout/v_add_provider" /> - <LinearLayout android:id="@+id/content" android:layout_width="match_parent" @@ -21,7 +18,10 @@ android:orientation="vertical"> <!-- the header contains the mask--> - <include layout="@layout/v_provider_header" /> + <se.leap.bitmaskclient.views.ProviderHeaderView + android:id="@+id/header" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> <android.support.design.widget.TextInputLayout android:id="@+id/text_uri_error" @@ -40,35 +40,46 @@ </android.support.design.widget.TextInputLayout> - - <CheckBox - android:id="@+id/danger_checkbox" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:visibility="gone" - android:layout_marginBottom="@dimen/add_button_margin"/> - - <LinearLayout + <RelativeLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="right" - android:orientation="horizontal"> + android:layout_height="wrap_content"> - <Button - android:id="@+id/button_cancel" + <CheckBox + android:id="@+id/danger_checkbox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/cancel" /> + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:visibility="gone" + android:layout_marginBottom="@dimen/add_button_margin" + /> - <Button - android:id="@+id/button_save" + <LinearLayout + android:id="@+id/button_container" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginStart="@dimen/activity_horizontal_margin" - android:text="@string/save" /> + android:layout_height="match_parent" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" + android:gravity="right" + android:orientation="horizontal" + android:layout_below="@id/danger_checkbox"> + + <Button + android:id="@+id/button_cancel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/cancel" /> + + <Button + android:id="@+id/button_save" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/add_button_margin" + android:layout_marginStart="@dimen/add_button_margin" + android:text="@string/save" /> - </LinearLayout> + </LinearLayout> + </RelativeLayout> </LinearLayout> </RelativeLayout> |