diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-01 15:11:18 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-04-27 16:21:51 +0000 |
| commit | e192c75ad887e3d2edb78626bc1f3d82f4046819 (patch) | |
| tree | 30c4a1feece5cf94c3456858c67e4bea1612f530 /android/src/main/res/layout | |
| parent | 390f71ed8b3d4d5dac97f0ccac7f5e3a8782e5e5 (diff) | |
| download | mullvadvpn-e192c75ad887e3d2edb78626bc1f3d82f4046819.tar.xz mullvadvpn-e192c75ad887e3d2edb78626bc1f3d82f4046819.zip | |
Use new widgets in WireGuard key screen
Diffstat (limited to 'android/src/main/res/layout')
| -rw-r--r-- | android/src/main/res/layout/wireguard_key.xml | 83 |
1 files changed, 19 insertions, 64 deletions
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml index 2afacd8ada..59a79a4179 100644 --- a/android/src/main/res/layout/wireguard_key.xml +++ b/android/src/main/res/layout/wireguard_key.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="match_parent" android:background="@color/darkBlue" @@ -36,70 +37,24 @@ android:textColor="@color/white" android:textSize="32sp" android:textStyle="bold" /> - <LinearLayout android:id="@+id/public_key_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="0" - android:paddingHorizontal="24dp" - android:paddingVertical="12dp" - android:orientation="vertical" - android:background="?android:attr/selectableItemBackground" - android:clickable="true"> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="9dp" - android:text="@string/public_key" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" /> - <FrameLayout android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <TextView android:id="@+id/wireguard_public_key" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="16sp" - android:textStyle="bold" /> - <ProgressBar android:id="@+id/public_key_spinner" - android:layout_width="20dp" - android:layout_height="20dp" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - android:visibility="gone" /> - </FrameLayout> - </LinearLayout> - <LinearLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingHorizontal="24dp" - android:paddingVertical="12dp" - android:orientation="vertical"> - <TextView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginBottom="9dp" - android:textColor="@color/white60" - android:textSize="13sp" - android:textStyle="bold" - android:text="@string/wireguard_key_generated" /> - <FrameLayout android:layout_width="wrap_content" - android:layout_height="wrap_content"> - <TextView android:id="@+id/time_since" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="16sp" - android:textStyle="bold" /> - <ProgressBar android:id="@+id/time_since_spinner" - android:layout_width="20dp" - android:layout_height="20dp" - android:indeterminate="true" - android:indeterminateOnly="true" - android:indeterminateDuration="600" - android:indeterminateDrawable="@drawable/icon_spinner" - android:visibility="gone" /> - </FrameLayout> - </LinearLayout> + <net.mullvad.mullvadvpn.ui.CopyableInformationView android:id="@+id/public_key" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:paddingHorizontal="24dp" + android:paddingVertical="12dp" + mullvad:clipboardLabel="@string/wireguard_public_key" + mullvad:copiedToast="@string/copied_wireguard_public_key" + mullvad:description="@string/public_key" + mullvad:whenMissing="showSpinner"/> + <net.mullvad.mullvadvpn.ui.InformationView android:id="@+id/key_age" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_weight="0" + android:paddingHorizontal="24dp" + android:paddingVertical="12dp" + mullvad:description="@string/wireguard_key_generated" + mullvad:whenMissing="showSpinner"/> <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingHorizontal="24dp" |