diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/d_checkbox_confirm.xml | 136 |
1 files changed, 56 insertions, 80 deletions
diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml index 5a7f3508..a9a84c0e 100644 --- a/app/src/main/res/layout/d_checkbox_confirm.xml +++ b/app/src/main/res/layout/d_checkbox_confirm.xml @@ -1,87 +1,63 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - xmlns:app="http://schemas.android.com/apk/res-auto" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical"> - - <android.support.v7.widget.AppCompatTextView - android:id="@+id/tvTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/standard_margin" - android:layout_marginTop="@dimen/add_button_margin" - android:gravity="center" - android:text="@string/always_on_vpn" - android:textAllCaps="true" - android:textColor="@color/colorPrimary" - android:textSize="28sp" - android:textStyle="bold" /> - - <se.leap.bitmaskclient.views.IconTextView - android:id="@+id/user_message" - android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginBottom="0dp" - android:autoLink="web" - tools:text="@string/always_on_vpn_user_message" - /> - - <android.support.v7.widget.AppCompatTextView - android:id="@+id/block_vpn_user_message" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/standard_margin" - android:layout_marginBottom="@dimen/standard_margin" - android:text="@string/always_on_blocking_vpn_user_message" - android:visibility="gone" - tools:visibility="visible" - /> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <CheckBox - android:id="@+id/do_not_show_again" - android:textAppearance="@style/TextAppearance.AppCompat.Small" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/stdpadding" - android:text="@string/do_not_show_again" /> - - <LinearLayout - android:orientation="horizontal" + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:gravity="end" - android:layout_gravity="end" android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - > - <android.support.v7.widget.AppCompatButton - android:id="@+id/button_cancel" - android:layout_width="100dp" - android:layout_height="38dp" - android:layout_marginRight="@dimen/standard_margin" - android:background="@drawable/cust_button_secondary" - android:text="@android:string/cancel" - android:textColor="@android:color/tab_indicator_text" - android:textStyle="bold" /> - <android.support.v7.widget.AppCompatButton - android:id="@+id/button_ok" - android:layout_width="100dp" - android:layout_height="38dp" - android:background="@drawable/cust_button_primary" - android:text="@android:string/ok" - android:textColor="@color/white" - android:textStyle="bold" /> + xmlns:tools="http://schemas.android.com/tools" + android:orientation="vertical"> + + <android.support.v7.widget.AppCompatTextView + android:id="@+id/tvTitle" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/standard_margin" + android:layout_marginTop="@dimen/add_button_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:text="@string/always_on_vpn" + android:textAllCaps="true" + android:textAppearance="@style/TextAppearance.AppCompat.Title" + android:textStyle="bold" + /> + + <se.leap.bitmaskclient.views.IconTextView + android:id="@+id/user_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginBottom="0dp" + android:autoLink="web" + tools:text="@string/always_on_vpn_user_message" + android:textSize="17sp" + /> + + <android.support.v7.widget.AppCompatTextView + android:id="@+id/block_vpn_user_message" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/standard_margin" + android:layout_marginBottom="@dimen/standard_margin" + android:text="@string/always_on_blocking_vpn_user_message" + android:visibility="gone" + tools:visibility="visible" + android:textSize="17sp" + /> + + + <CheckBox + android:id="@+id/do_not_show_again" + android:textAppearance="@style/TextAppearance.AppCompat" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="@dimen/stdpadding" + android:text="@string/do_not_show_again" /> </LinearLayout> - -</LinearLayout>
\ No newline at end of file +</ScrollView>
\ No newline at end of file |