diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-23 16:50:31 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-28 13:52:59 +0000 |
| commit | aa9ef3810a37439a01e2d3ee2b024c70022fd221 (patch) | |
| tree | 644be2ca0069e60e188d11ce093cf323d4644ff4 /android/src/main/res | |
| parent | ab771bdfb4752d2140e94071f381cdffb2160fe8 (diff) | |
| download | mullvadvpn-aa9ef3810a37439a01e2d3ee2b024c70022fd221.tar.xz mullvadvpn-aa9ef3810a37439a01e2d3ee2b024c70022fd221.zip | |
Use new `ToggleCell` widget
Diffstat (limited to 'android/src/main/res')
| -rw-r--r-- | android/src/main/res/layout/preferences.xml | 70 | ||||
| -rw-r--r-- | android/src/main/res/layout/split_tunnelling_header.xml | 28 |
2 files changed, 18 insertions, 80 deletions
diff --git a/android/src/main/res/layout/preferences.xml b/android/src/main/res/layout/preferences.xml index 658d91572c..3456c22954 100644 --- a/android/src/main/res/layout/preferences.xml +++ b/android/src/main/res/layout/preferences.xml @@ -42,64 +42,18 @@ android:layout_marginLeft="24dp" android:text="@string/settings_preferences" style="@style/SettingsExpandedHeader" /> - <LinearLayout android:id="@+id/auto_connect" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:gravity="center"> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/auto_connect" /> - <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/auto_connect_toggle" - android:layout_width="52dp" - android:layout_height="32dp" - android:layout_weight="0" /> - </LinearLayout> - <TextView android:id="@+id/auto_connect_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingHorizontal="24dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/auto_connect_footer" /> - <LinearLayout android:id="@+id/allow_lan" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:gravity="center"> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/local_network_sharing" /> - <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/allow_lan_toggle" - android:layout_width="52dp" - android:layout_height="32dp" - android:layout_weight="0" /> - </LinearLayout> - <TextView android:id="@+id/allow_lan_footer" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingHorizontal="24dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:text="@string/allow_lan_footer" /> + <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/auto_connect" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + mullvad:text="@string/auto_connect" + mullvad:footer="@string/auto_connect_footer" /> + <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/allow_lan" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + mullvad:text="@string/local_network_sharing" + mullvad:footer="@string/allow_lan_footer" /> </LinearLayout> </net.mullvad.mullvadvpn.ui.widget.ListenableScrollView> </LinearLayout> diff --git a/android/src/main/res/layout/split_tunnelling_header.xml b/android/src/main/res/layout/split_tunnelling_header.xml index 8374bdb12b..f15f573651 100644 --- a/android/src/main/res/layout/split_tunnelling_header.xml +++ b/android/src/main/res/layout/split_tunnelling_header.xml @@ -1,4 +1,5 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:mullvad="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" @@ -19,28 +20,11 @@ android:text="@string/split_tunnelling_description" android:textColor="@color/white60" android:textSize="13sp" /> - <LinearLayout android:id="@+id/enabled" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:gravity="center" - android:clickable="true"> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" - android:text="@string/enabled" /> - <net.mullvad.mullvadvpn.ui.widget.CellSwitch android:id="@+id/enabled_toggle" - android:layout_width="52dp" - android:layout_height="32dp" - android:layout_weight="0" /> - </LinearLayout> + <net.mullvad.mullvadvpn.ui.widget.ToggleCell android:id="@+id/enabled" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + mullvad:text="@string/enabled" /> <LinearLayout android:id="@+id/exclude_applications" android:layout_width="match_parent" android:layout_height="wrap_content" |