diff options
| author | cyberta <cyberta@riseup.net> | 2019-07-12 10:38:00 -0700 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2019-07-12 10:38:00 -0700 |
| commit | 6c9a29082a8543991b8485c8613e7c586fed636f (patch) | |
| tree | 3e6730b27eff129a54f6104c2dd2f487ffea2887 /app/src/main/res/layout | |
| parent | 144244cab15014d495985f396c618729209a8f8a (diff) | |
| parent | 50667074dd6729eb47400273f4275ceba2457575 (diff) | |
Merge branch 'improve_blocking_vpn' into 'master'
Improve blocking vpn
See merge request leap/bitmask_android!91
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/d_checkbox_confirm.xml | 73 |
1 files changed, 56 insertions, 17 deletions
diff --git a/app/src/main/res/layout/d_checkbox_confirm.xml b/app/src/main/res/layout/d_checkbox_confirm.xml index 6dd22417..a9a84c0e 100644 --- a/app/src/main/res/layout/d_checkbox_confirm.xml +++ b/app/src/main/res/layout/d_checkbox_confirm.xml @@ -1,24 +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" - android:orientation="vertical"> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content"> - <se.leap.bitmaskclient.views.IconTextView - android:id="@+id/user_message" + + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/activity_horizontal_margin" - android:layout_marginBottom="0dp" - android:autoLink="web" - /> + 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" + /> - <CheckBox - android:id="@+id/do_not_show_again" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="@dimen/stdpadding" - android:text="@string/do_not_show_again" /> + <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>
\ No newline at end of file + </LinearLayout> +</ScrollView>
\ No newline at end of file |