aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/res
diff options
context:
space:
mode:
authorEric Kuck <eric@bluelinelabs.com>2018-07-24 12:32:40 -0500
committerJason A. Donenfeld <Jason@zx2c4.com>2018-07-25 02:05:11 +0200
commit2087a10f5533e4b61811a3cb4e5019dcf2560d81 (patch)
tree570f81ddc7b189e2a736f2ba669ab8ed553586d3 /app/src/main/res
parenttools: Bump wireguard submodule (diff)
downloadwireguard-android-2087a10f5533e4b61811a3cb4e5019dcf2560d81.tar.xz
wireguard-android-2087a10f5533e4b61811a3cb4e5019dcf2560d81.zip
Added QR code scanner as tunnel import method
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/ic_action_scan_qr_code_white.xml9
-rw-r--r--app/src/main/res/layout/config_naming_dialog_fragment.xml25
-rw-r--r--app/src/main/res/layout/tunnel_list_fragment.xml52
-rw-r--r--app/src/main/res/values/strings.xml3
4 files changed, 68 insertions, 21 deletions
diff --git a/app/src/main/res/drawable/ic_action_scan_qr_code_white.xml b/app/src/main/res/drawable/ic_action_scan_qr_code_white.xml
new file mode 100644
index 0000000..cdd8336
--- /dev/null
+++ b/app/src/main/res/drawable/ic_action_scan_qr_code_white.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="24dp"
+ android:height="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24">
+ <path
+ android:fillColor="#ffffff"
+ android:pathData="M4,4H10V10H4V4M20,4V10H14V4H20M14,15H16V13H14V11H16V13H18V11H20V13H18V15H20V18H18V20H16V18H13V20H11V16H14V15M16,15V18H18V15H16M4,20V14H10V20H4M6,6V8H8V6H6M16,6V8H18V6H16M6,16V18H8V16H6M4,11H6V13H4V11M9,11H13V15H11V13H9V11M11,6H13V10H11V6M2,2V6H0V2A2,2 0 0,1 2,0H6V2H2M22,0A2,2 0 0,1 24,2V6H22V2H18V0H22M2,18V22H6V24H2A2,2 0 0,1 0,22V18H2M22,22V18H24V22A2,2 0 0,1 22,24H18V22H22Z" />
+</vector> \ No newline at end of file
diff --git a/app/src/main/res/layout/config_naming_dialog_fragment.xml b/app/src/main/res/layout/config_naming_dialog_fragment.xml
new file mode 100644
index 0000000..aae7804
--- /dev/null
+++ b/app/src/main/res/layout/config_naming_dialog_fragment.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:padding="16dp">
+
+ <android.support.design.widget.TextInputLayout
+ android:id="@+id/tunnel_name_text_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
+
+ <EditText
+ android:id="@+id/tunnel_name_text"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:hint="@string/tunnel_name" />
+
+ </android.support.design.widget.TextInputLayout>
+
+ </FrameLayout>
+
+
+</layout>
diff --git a/app/src/main/res/layout/tunnel_list_fragment.xml b/app/src/main/res/layout/tunnel_list_fragment.xml
index 4829313..2a7de39 100644
--- a/app/src/main/res/layout/tunnel_list_fragment.xml
+++ b/app/src/main/res/layout/tunnel_list_fragment.xml
@@ -38,6 +38,29 @@
app:layout="@{@layout/tunnel_list_item}"
app:configurationHandler="@{rowConfigurationHandler}" />
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:visibility="@{tunnels.size() == 0 ? android.view.View.VISIBLE : android.view.View.GONE}"
+ android:layout_gravity="center">
+ <android.support.v7.widget.AppCompatImageView
+ android:id="@+id/logo_placeholder"
+ android:layout_width="140dp"
+ android:layout_height="140dp"
+ android:layout_gravity="center"
+ android:tint="@color/transparent_background_placeholder"
+ android:layout_marginTop="-70dp"
+ android:layout_marginBottom="20dp"
+ android:src="@mipmap/ic_launcher" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:textSize="20sp"
+ android:text="@string/tunnel_list_placeholder" />
+ </LinearLayout>
+
<com.wireguard.android.widget.fab.FloatingActionsMenu
android:id="@+id/create_menu"
android:clipChildren="false"
@@ -66,29 +89,16 @@
app:srcCompat="@drawable/ic_action_open_white"
app:fabSize="mini"
app:fab_title="@string/create_from_file" />
- </com.wireguard.android.widget.fab.FloatingActionsMenu>
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="vertical"
- android:visibility="@{tunnels.size() == 0 ? android.view.View.VISIBLE : android.view.View.GONE}"
- android:layout_gravity="center">
- <android.support.v7.widget.AppCompatImageView
- android:id="@+id/logo_placeholder"
- android:layout_width="140dp"
- android:layout_height="140dp"
- android:layout_gravity="center"
- android:tint="@color/transparent_background_placeholder"
- android:layout_marginTop="-70dp"
- android:layout_marginBottom="20dp"
- android:src="@mipmap/ic_launcher" />
- <TextView
+ <com.wireguard.android.widget.fab.LabeledFloatingActionButton
+ android:id="@+id/scan_qr_code"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:textSize="20sp"
- android:text="@string/tunnel_list_placeholder" />
- </LinearLayout>
+ android:onClick="@{fragment::onRequestScanQRCode}"
+ app:srcCompat="@drawable/ic_action_scan_qr_code_white"
+ app:fabSize="mini"
+ app:fab_title="@string/scan_qr_code" />
+ </com.wireguard.android.widget.fab.FloatingActionsMenu>
+
</android.support.design.widget.CoordinatorLayout>
</layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bfaf71b..1bb43fa 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -30,6 +30,7 @@
<string name="create_activity_title">Create WireGuard Tunnel</string>
<string name="create_empty">Create from scratch</string>
<string name="create_from_file">Create from file or archive</string>
+ <string name="create_tunnel">Create Tunnel</string>
<string name="dark_theme_title">Use dark theme</string>
<string name="dark_theme_summary_on">Currently using dark night theme</string>
<string name="dark_theme_summary_off">Currently using light day theme</string>
@@ -71,6 +72,7 @@
<string name="restore_on_boot_summary">Bring up previously-enabled tunnels on boot</string>
<string name="restore_on_boot_title">Restore on boot</string>
<string name="save">Save</string>
+ <string name="scan_qr_code">Scan QR Code</string>
<plurals name="set_excluded_applications">
<item quantity="one">%d Excluded Application</item>
<item quantity="other">%d Excluded Applications</item>
@@ -90,6 +92,7 @@
<string name="tunnel_create_error">Unable to create tunnel: %s</string>
<string name="tunnel_create_success">Successfully created tunnel ā€œ%sā€</string>
<string name="tunnel_list_placeholder">Add a tunnel using the blue button</string>
+ <string name="tunnel_name">Tunnel Name</string>
<string name="tunnel_rename_error">Unable to rename tunnel: %s</string>
<string name="tunnel_rename_success">Successfully renamed tunnel to ā€œ%sā€</string>
<string name="version_title">WireGuard for Android v%s"</string>