diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-04-18 05:28:31 +0200 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2018-04-18 05:28:31 +0200 |
commit | 53d29b312f3cdf5206cdabdf340b2834f8e8e35c (patch) | |
tree | e89533bb3a3e95f0c88c1739225c76cf07d21583 /app/src/main/res | |
parent | 69f1a35a3ff5f6e3fbf9419b7d2ebae08e2da8b3 (diff) |
More javafication
Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Diffstat (limited to 'app/src/main/res')
-rw-r--r-- | app/src/main/res/layout/tunnel_detail_peer.xml | 2 | ||||
-rw-r--r-- | app/src/main/res/layout/tunnel_editor_fragment.xml | 5 | ||||
-rw-r--r-- | app/src/main/res/layout/tunnel_editor_peer.xml | 4 | ||||
-rw-r--r-- | app/src/main/res/values/strings.xml | 2 |
4 files changed, 7 insertions, 6 deletions
diff --git a/app/src/main/res/layout/tunnel_detail_peer.xml b/app/src/main/res/layout/tunnel_detail_peer.xml index d2b0d3d8..bde89390 100644 --- a/app/src/main/res/layout/tunnel_detail_peer.xml +++ b/app/src/main/res/layout/tunnel_detail_peer.xml @@ -86,6 +86,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@+id/endpoint_label" - android:text="@{item.endpoint}" /> + android:text="@{item.endpointString}" /> </RelativeLayout> </layout> diff --git a/app/src/main/res/layout/tunnel_editor_fragment.xml b/app/src/main/res/layout/tunnel_editor_fragment.xml index 86c6082e..0d278bcb 100644 --- a/app/src/main/res/layout/tunnel_editor_fragment.xml +++ b/app/src/main/res/layout/tunnel_editor_fragment.xml @@ -122,6 +122,7 @@ android:focusable="false" android:hint="@string/hint_generated" android:maxLines="1" + android:contentDescription="@string/public_key_description" android:onClick="@{ClipboardUtils::copyTextView}" android:text="@{config.interface.publicKey}" /> @@ -164,7 +165,7 @@ android:layout_alignStart="@+id/generate_private_key_button" android:hint="@string/hint_random" android:inputType="number" - android:text="@={config.interface.listenPort}" + android:text="@={config.interface.listenPortString}" android:textAlignment="center" /> <TextView @@ -206,7 +207,7 @@ android:layout_alignStart="@+id/generate_private_key_button" android:hint="@string/hint_automatic" android:inputType="number" - android:text="@={config.interface.mtu}" + android:text="@={config.interface.mtuString}" android:textAlignment="center" /> </RelativeLayout> diff --git a/app/src/main/res/layout/tunnel_editor_peer.xml b/app/src/main/res/layout/tunnel_editor_peer.xml index aedcb18f..cc5fe933 100644 --- a/app/src/main/res/layout/tunnel_editor_peer.xml +++ b/app/src/main/res/layout/tunnel_editor_peer.xml @@ -116,7 +116,7 @@ android:layout_below="@+id/endpoint_label" android:layout_toStartOf="@+id/persistent_keepalive_text" android:inputType="textNoSuggestions|textVisiblePassword" - android:text="@={item.endpoint}" /> + android:text="@={item.endpointString}" /> <TextView android:id="@+id/persistent_keepalive_label" @@ -136,7 +136,7 @@ android:layout_alignStart="@+id/persistent_keepalive_label" android:hint="@string/hint_optional" android:inputType="number" - android:text="@={item.persistentKeepalive}" + android:text="@={item.persistentKeepaliveString}" android:textAlignment="center" /> </RelativeLayout> </layout> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 7de33f15..e295adbd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,7 +16,7 @@ <string name="addresses">Addresses</string> <string name="allowed_ips">Allowed IPs</string> <string name="app_name">WireGuard</string> - <string name="config_save_error">Unable to configuration for “%s”: %s</string> + <string name="config_save_error">Unable to save configuration for “%s”: %s</string> <string name="config_save_success">Successfully saved configuration for “%s”</string> <string name="create_activity_title">Create WireGuard Tunnel</string> <string name="create_empty">Create from scratch</string> |