From 53d29b312f3cdf5206cdabdf340b2834f8e8e35c Mon Sep 17 00:00:00 2001
From: "Jason A. Donenfeld" <Jason@zx2c4.com>
Date: Wed, 18 Apr 2018 05:28:31 +0200
Subject: More javafication

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
---
 app/src/main/res/layout/tunnel_detail_peer.xml     | 2 +-
 app/src/main/res/layout/tunnel_editor_fragment.xml | 5 +++--
 app/src/main/res/layout/tunnel_editor_peer.xml     | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'app/src/main/res/layout')

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>
-- 
cgit v1.2.3