From 4702b7441b65173a1e0c7f0b560e672d06ee4e4d Mon Sep 17 00:00:00 2001
From: pacien
Date: Tue, 21 Aug 2018 01:35:06 +0200
Subject: Show node reachability in node list

---
 .../main/res/layout/status_node_info_dialog.xml    |  2 +-
 app/src/main/res/layout/status_node_list_item.xml  | 42 ++++++++++++++++++----
 app/src/main/res/values/strings.xml                |  7 +++-
 3 files changed, 42 insertions(+), 9 deletions(-)

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

diff --git a/app/src/main/res/layout/status_node_info_dialog.xml b/app/src/main/res/layout/status_node_info_dialog.xml
index 36f3e86..5216875 100644
--- a/app/src/main/res/layout/status_node_info_dialog.xml
+++ b/app/src/main/res/layout/status_node_info_dialog.xml
@@ -31,7 +31,7 @@
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:fontFamily="monospace"
-		android:text="@string/status_node_list_modal_placeholder_text"
+		android:text="@string/status_node_info_modal_placeholder_text"
 		android:textColor="@color/textSecondary"/>
 
 </ScrollView>
diff --git a/app/src/main/res/layout/status_node_list_item.xml b/app/src/main/res/layout/status_node_list_item.xml
index dd1a842..96dad8c 100644
--- a/app/src/main/res/layout/status_node_list_item.xml
+++ b/app/src/main/res/layout/status_node_list_item.xml
@@ -18,10 +18,38 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
-<TextView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	style="@style/AppTheme.BlockTitle"
-	android:paddingBottom="@dimen/activity_vertical_margin"
-	android:paddingLeft="@dimen/activity_horizontal_margin"
-	android:paddingRight="@dimen/activity_horizontal_margin"
-	android:paddingTop="@dimen/activity_vertical_margin"/>
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<data>
+
+		<variable
+			name="nodeInfo"
+			type="org.pacien.tincapp.activities.status.nodes.NodeInfo"/>
+
+		<variable
+			name="onClick"
+			type="kotlin.jvm.functions.Function1&lt;org.pacien.tincapp.activities.status.nodes.NodeInfo, kotlin.Unit>"/> <!-- https://stackoverflow.com/a/38777594 -->
+
+	</data>
+
+	<LinearLayout
+		style="@style/AppTheme.ListBlock.Clickable"
+		android:layout_width="match_parent"
+		android:layout_height="wrap_content"
+		android:onClick="@{() -> onClick.invoke(nodeInfo)}"
+		android:orientation="horizontal">
+
+		<TextView
+			style="@style/AppTheme.BlockTitle"
+			android:layout_weight="1"
+			android:text="@{nodeInfo.name}"/>
+
+		<TextView
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:layout_weight="0"
+			android:text="@{nodeInfo.reachabilityText()}"/>
+
+	</LinearLayout>
+
+</layout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e5dc2f5..3f2e800 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -132,7 +132,12 @@
 	<string name="status_network_info_none_value">none</string>
 
 	<string name="status_node_list_empty_placeholder_text">Loading…</string>
-	<string name="status_node_list_modal_placeholder_text">Loading…</string>
+	<string name="status_node_reachability_unreachable">unreachable</string>
+	<string name="status_node_reachability_this_node">this node</string>
+	<string name="status_node_reachability_direct_connection">direct</string>
+	<string name="status_node_reachability_via_format">via %s</string>
+	<string name="status_node_reachability_unknown">…</string>
+	<string name="status_node_info_modal_placeholder_text">Loading…</string>
 	<string name="status_node_info_dialog_title">Node info</string>
 	<string name="status_node_info_dialog_close_action">Close</string>
 
-- 
cgit v1.2.3