diff options
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/wireguard_key.xml | 56 |
2 files changed, 30 insertions, 30 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt index bf520a157a..1b5e1a3cfe 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt @@ -110,7 +110,7 @@ class WireguardKeyFragment : Fragment() { publicKey.visibility = View.VISIBLE publicKey.setText(publicKeyString) - setValidateButton() + setVerifyButton() if (keyState.verified != null) { if (keyState.verified) { @@ -148,7 +148,7 @@ class WireguardKeyFragment : Fragment() { } } - private fun setValidateButton() { + private fun setVerifyButton() { if (validatingKey) { showActionSpinner() return diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml index da316c5f99..90d41fbebd 100644 --- a/android/src/main/res/layout/wireguard_key.xml +++ b/android/src/main/res/layout/wireguard_key.xml @@ -87,34 +87,6 @@ </LinearLayout> <LinearLayout - android:id="@+id/wireguard_manage_keys" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginTop="24dp" - android:background="@drawable/cell_button_background" - android:clickable="true" - android:gravity="center" - android:paddingHorizontal="16dp" - android:visibility="gone"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingHorizontal="8dp" - android:paddingVertical="17dp" - android:text="@string/wireguard_manage_keys" - android:textColor="@color/white" - android:textSize="20sp" - android:textStyle="bold" /> - - <ImageView - android:layout_width="16dp" - android:layout_height="16dp" - android:alpha="0.6" - android:src="@drawable/icon_extlink" /> - </LinearLayout> - - <LinearLayout android:id="@+id/wireguard_button_container" android:layout_width="match_parent" android:layout_height="wrap_content" @@ -150,4 +122,32 @@ </RelativeLayout> </LinearLayout> + <LinearLayout + android:id="@+id/wireguard_manage_keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="24dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:paddingHorizontal="16dp" + android:visibility="gone"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingHorizontal="8dp" + android:paddingVertical="17dp" + android:text="@string/wireguard_manage_keys" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" /> + + <ImageView + android:layout_width="16dp" + android:layout_height="16dp" + android:alpha="0.6" + android:src="@drawable/icon_extlink" /> + </LinearLayout> + </LinearLayout> |