diff options
author | cyBerta <cyberta@riseup.net> | 2019-07-06 19:55:22 +0200 |
---|---|---|
committer | cyBerta <cyberta@riseup.net> | 2019-07-12 17:03:55 +0200 |
commit | 2b649dbc89481a18318b0c1f4974ce3f650178e7 (patch) | |
tree | b79c9ce78314f4ef733ad5d1fbc9436aff8c7786 /app/src/main/res/layout | |
parent | 65a09aa799e525d3bc60f5f4f489a3d70c6a8554 (diff) |
add blocking vpn info in corresponding alert dialog, use similar layout as for donation dialog
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/d_checkbox_confirm.xml | 65 |
1 files changed, 64 insertions, 1 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..5a7f3508 100644 --- a/app/src/main/res/layout/d_checkbox_confirm.xml +++ b/app/src/main/res/layout/d_checkbox_confirm.xml @@ -2,23 +2,86 @@ <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_margin="@dimen/activity_horizontal_margin" + 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" /> <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" + 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" /> + + </LinearLayout> + </LinearLayout>
\ No newline at end of file |