From b005d18f1345f3284c66536e21aeb3fbfdfeee3e Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Thu, 3 May 2018 20:34:18 -0700
Subject: [PATCH] Fix UI

---
 .../main/java/be/mygod/vpnhotspot/TetheringService.kt  |  2 +-
 mobile/src/main/res/layout/fragment_repeater.xml       | 10 +++++++---
 mobile/src/main/res/layout/listitem_client.xml         |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt
index f002babc..8ea5413e 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt
@@ -44,7 +44,7 @@ class TetheringService : IpNeighbourMonitoringService(), VpnMonitor.Callback {
     }
     override val activeIfaces get() = synchronized(routings) { routings.keys.toList() }
 
-    fun updateRoutingsLocked() {
+    private fun updateRoutingsLocked() {
         if (routings.isNotEmpty()) {
             val upstream = upstream
             if (upstream != null) {
diff --git a/mobile/src/main/res/layout/fragment_repeater.xml b/mobile/src/main/res/layout/fragment_repeater.xml
index a1df716f..b81af719 100644
--- a/mobile/src/main/res/layout/fragment_repeater.xml
+++ b/mobile/src/main/res/layout/fragment_repeater.xml
@@ -50,11 +50,13 @@
                 android:layout_row="0"/>
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_column="2"
                 android:layout_row="0"
                 android:focusable="false"
+                android:layout_gravity="fill_horizontal"
+                android:layout_columnWeight="1"
                 android:text="@{data.ssid}"
                 tools:text="DIRECT-rA-nd0m"/>
 
@@ -67,13 +69,15 @@
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"/>
 
             <TextView
-                android:layout_width="wrap_content"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_column="2"
                 android:layout_row="1"
+                android:layout_gravity="fill_horizontal"
+                android:layout_columnWeight="1"
                 android:text="@{data.addresses}"
                 android:textIsSelectable="true"
-                tools:text="192.168.49.1/24\n01:23:45:ab:cd:ef"/>
+                tools:text="192.168.49.1/24\nfe80::abcd:efff:1234:5678%p2p-p2p0-0/64\n01:23:45:ab:cd:ef"/>
         </GridLayout>
 
         <TextView
diff --git a/mobile/src/main/res/layout/listitem_client.xml b/mobile/src/main/res/layout/listitem_client.xml
index 2b2006b3..ab75e5d9 100644
--- a/mobile/src/main/res/layout/listitem_client.xml
+++ b/mobile/src/main/res/layout/listitem_client.xml
@@ -40,14 +40,14 @@
                 android:text="@{client.title}"
                 android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
                 android:textIsSelectable="true"
-                tools:text="192.168.49.123\t\t01:23:45:ab:cd:ef"/>
+                tools:text="01:23:45:ab:cd:ef%p2p-p2p0-0"/>
 
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:text="@{client.description}"
                 android:textIsSelectable="true"
-                tools:text="Connected to p2p0"/>
+                tools:text="192.168.49.123 (reachable)\nfe80::abcd:efff:1234:5678%p2p-p2p0-0 (reachable)"/>
         </LinearLayout>
     </LinearLayout>
 </layout>