From daf8d2fe48f1e2d5cef79b978ad73991bf1f0011 Mon Sep 17 00:00:00 2001
From: pacien
Date: Sun, 19 Aug 2018 18:14:00 +0200
Subject: Display current network name in activity action bar

---
 app/src/main/res/layout/status_network_info_fragment.xml | 16 ----------------
 app/src/main/res/values/strings.xml                      |  1 +
 2 files changed, 1 insertion(+), 16 deletions(-)

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

diff --git a/app/src/main/res/layout/status_network_info_fragment.xml b/app/src/main/res/layout/status_network_info_fragment.xml
index 8038180..2dfe1bc 100644
--- a/app/src/main/res/layout/status_network_info_fragment.xml
+++ b/app/src/main/res/layout/status_network_info_fragment.xml
@@ -24,10 +24,6 @@
 
 		<import type="android.view.View"/>
 
-		<variable
-			name="netName"
-			type="String"/>
-
 		<variable
 			name="vpnInterfaceConfiguration"
 			type="org.pacien.tincapp.data.VpnInterfaceConfiguration"/>
@@ -40,18 +36,6 @@
 
 	<LinearLayout style="@style/AppTheme.List">
 
-		<LinearLayout style="@style/AppTheme.ListBlock">
-
-			<TextView
-				style="@style/AppTheme.BlockTitle"
-				android:text="@string/status_network_info_network_name_label"/>
-
-			<TextView
-				style="@style/AppTheme.BlockContent"
-				android:text="@{netName ?? @string/status_network_info_yes_value}"/>
-
-		</LinearLayout>
-
 		<LinearLayout style="@style/AppTheme.ListBlock">
 
 			<TextView
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a9bf3ee..98a6905 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -112,6 +112,7 @@
 	<string name="configure_tools_private_keys_encryption_encrypting">Encrypting/decrypting private keys</string>
 
 	<!-- Status activity -->
+	<string name="status_activity_state_connected_to_format">Connected to %s</string>
 	<string name="status_activity_title_node_list">Nodes</string>
 	<string name="status_activity_title_network_info">Network info</string>
 
-- 
cgit v1.2.3