diff options
Diffstat (limited to 'android/src/main/res')
| -rw-r--r-- | android/src/main/res/layout/settings.xml | 28 | ||||
| -rw-r--r-- | android/src/main/res/layout/wireguard_key.xml | 153 | ||||
| -rw-r--r-- | android/src/main/res/values/strings.xml | 17 |
3 files changed, 198 insertions, 0 deletions
diff --git a/android/src/main/res/layout/settings.xml b/android/src/main/res/layout/settings.xml index d0308f163b..7b4161406a 100644 --- a/android/src/main/res/layout/settings.xml +++ b/android/src/main/res/layout/settings.xml @@ -64,6 +64,34 @@ android:src="@drawable/icon_chevron" /> </LinearLayout> + <LinearLayout android:id="@+id/wireguard_keys" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingHorizontal="16dp" + android:layout_marginTop="24dp" + 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 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 new file mode 100644 index 0000000000..b0da0776ca --- /dev/null +++ b/android/src/main/res/layout/wireguard_key.xml @@ -0,0 +1,153 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/darkBlue" + android:elevation="3dp" + android:gravity="left" + android:orientation="vertical"> + + <LinearLayout android:id="@+id/back" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="12dp" + android:orientation="horizontal" + android:gravity="center_vertical | left" + android:clickable="true" + android:background="?android:attr/selectableItemBackground" + > + <ImageView + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginRight="8dp" + android:src="@drawable/icon_back" + /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white60" + android:textSize="13sp" + android:textStyle="bold" + android:text="@string/settings" + /> + </LinearLayout> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="24dp" + android:layout_marginTop="4dp" + android:layout_marginBottom="24dp" + android:text="@string/wireguard_key" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" /> + + <LinearLayout + android:id="@+id/wireguard_public_key_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:orientation="vertical" + android:paddingHorizontal="4dp"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:paddingTop="10dp" + android:paddingBottom="5dp" + android:text="@string/wireguard_public_key" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" /> + + <TextView + android:id="@+id/wireguard_public_key" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:paddingTop="3dp" + android:textAllCaps="true" + android:textColor="@color/white60" + android:textSize="14sp" + android:textStyle="bold" /> + + <TextView + android:id="@+id/wireguard_key_status" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:paddingBottom="5dp" + android:textColor="@color/red" + android:textSize="20sp" + android:textStyle="bold" + android:visibility="gone" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/wireguard_key_visit_website" + 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_key_visit_website" + 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" + android:layout_marginTop="15dp" + android:layout_marginBottom="15dp" + android:background="@drawable/cell_button_background" + android:clickable="true" + android:gravity="center" + android:orientation="vertical"> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="50dp" + android:gravity="center" + android:orientation="vertical"> + + <Button + android:id="@+id/wg_key_button" + style="@style/Button" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:text="@string/wireguard_validate_key"/> + + <ProgressBar + android:id="@+id/wg_action_spinner" + android:layout_width="30dp" + android:layout_height="30dp" + android:indeterminate="true" + android:indeterminateDrawable="@drawable/icon_spinner" + android:indeterminateDuration="600" + android:indeterminateOnly="true" + android:visibility="gone" /> + </RelativeLayout> + </LinearLayout> + +</LinearLayout> diff --git a/android/src/main/res/values/strings.xml b/android/src/main/res/values/strings.xml index 6b605a7bc2..02f4315083 100644 --- a/android/src/main/res/values/strings.xml +++ b/android/src/main/res/values/strings.xml @@ -95,6 +95,23 @@ While connected, your real location is masked with a private and secure location in the selected region </string> + <string name="wireguard_key">WireGuard key</string> + <string name="wireguard_public_key">Public key</string> + <string name="wireguard_validate_key">Validate key</string> + <string name="wireguard_generate_key">Generate key</string> + <string name="wireguard_key_visit_website">Manage your keys on website</string> + <string name="wireguard_key_connectivity"> + Connectivity required to manage your key. + </string> + <string name="wireguard_key_valid"> + Key is valid + </string> + <string name="wireguard_key_invalid"> + Key is invalid + </string> + <string name="wireguard_key_verification_failure"> + Failed to validate key + </string> <string name="account_url">https://mullvad.net/en/account</string> <string name="download_url">https://mullvad.net/en/download</string> |