diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-03-21 12:59:32 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-27 16:21:50 +0000 |
| commit | b6d36388d953b6dfefdd20ad29d849efd44fcc82 (patch) | |
| tree | 9db8930d303d2d2ab569f3bbcf96b67b38eafc74 /android/src/main/res/layout | |
| parent | 5edf498080fd195d78be351816b367b2b1623ad8 (diff) | |
| download | mullvadvpn-b6d36388d953b6dfefdd20ad29d849efd44fcc82.tar.xz mullvadvpn-b6d36388d953b6dfefdd20ad29d849efd44fcc82.zip | |
Move `WireGuard key` option into `Advanced` screen
Diffstat (limited to 'android/src/main/res/layout')
| -rw-r--r-- | android/src/main/res/layout/advanced.xml | 23 | ||||
| -rw-r--r-- | android/src/main/res/layout/settings.xml | 24 | ||||
| -rw-r--r-- | android/src/main/res/layout/wireguard_key.xml | 2 |
3 files changed, 24 insertions, 25 deletions
diff --git a/android/src/main/res/layout/advanced.xml b/android/src/main/res/layout/advanced.xml index 966200fee1..e6a029ae74 100644 --- a/android/src/main/res/layout/advanced.xml +++ b/android/src/main/res/layout/advanced.xml @@ -73,4 +73,27 @@ android:paddingHorizontal="24dp" android:textColor="@color/white60" android:textSize="13sp" /> + <LinearLayout android:id="@+id/wireguard_keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:paddingHorizontal="16dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + 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/wireguard_key" /> + <ImageView android:layout_width="14dp" + android:layout_height="24dp" + android:layout_weight="0" + android:alpha="0.6" + android:src="@drawable/icon_chevron" /> + </LinearLayout> </LinearLayout> diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml index 5909f54faa..a516111dc5 100644 --- a/android/src/main/res/layout/settings.xml +++ b/android/src/main/res/layout/settings.xml @@ -108,30 +108,6 @@ android:alpha="0.6" android:src="@drawable/icon_chevron" /> </LinearLayout> - <LinearLayout android:id="@+id/wireguard_keys" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:paddingHorizontal="16dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:visibility="gone"> - <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/wireguard_key" /> - <ImageView android:layout_width="14dp" - android:layout_height="24dp" - android:layout_weight="0" - android:alpha="0.6" - android:src="@drawable/icon_chevron" /> - </LinearLayout> <LinearLayout android:id="@+id/app_version" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml index a16cee6231..297e9f9f36 100644 --- a/android/src/main/res/layout/wireguard_key.xml +++ b/android/src/main/res/layout/wireguard_key.xml @@ -23,7 +23,7 @@ android:textColor="@color/white60" android:textSize="13sp" android:textStyle="bold" - android:text="@string/settings" /> + android:text="@string/settings_advanced" /> </LinearLayout> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" |