Fix empty list placeholder display

6 files changed, 24 insertions, 27 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
index 6bd845d..05f8904 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -10,6 +10,7 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import kotlinx.android.synthetic.main.base.*
+import kotlinx.android.synthetic.main.fragment_network_list_header.*
 import kotlinx.android.synthetic.main.page_start.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.context.AppPaths
@@ -35,7 +36,6 @@ class StartActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefr
         network_list_wrapper.setOnRefreshListener(this)
         network_list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_list_header, network_list, false), null, false)
         network_list.addFooterView(View(this), null, false)
-        network_list.emptyView = network_list_empty
         network_list.adapter = networkListAdapter
         network_list.onItemClickListener = this
     }
@@ -71,6 +71,7 @@ class StartActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefr
         val networks = AppPaths.confDir().list().toList()
         runOnUiThread {
             networkListAdapter?.setElements(networks)
+            network_list_placeholder.visibility = if (networkListAdapter?.isEmpty ?: true) View.VISIBLE else View.GONE
             network_list_wrapper.isRefreshing = false
         }
     }
diff --git a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
index a2c39dd..0d7af6e 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -43,7 +43,6 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
         node_list_wrapper.setOnRefreshListener(this)
         node_list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_status_header, node_list, false), null, false)
         node_list.addFooterView(View(this), null, false)
-        node_list.emptyView = node_list_empty
         node_list.onItemClickListener = this
         node_list.adapter = nodeListAdapter
     }
@@ -82,6 +81,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
         getNodeNames().thenAccept {
             runOnUiThread {
                 nodeListAdapter?.setElements(it)
+                node_list_placeholder.visibility = if (nodeListAdapter?.isEmpty ?: true) View.VISIBLE else View.GONE
                 node_list_wrapper.isRefreshing = false
                 if (!TincVpnService.isConnected()) openStartActivity()
             }
diff --git a/app/src/main/res/layout/fragment_network_list_header.xml b/app/src/main/res/layout/fragment_network_list_header.xml
index 3531e3e..436cfc2 100644
--- a/app/src/main/res/layout/fragment_network_list_header.xml
+++ b/app/src/main/res/layout/fragment_network_list_header.xml
@@ -1,4 +1,16 @@
-<TextView
+<LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/AppTheme.SectionTitle"
-        android:text="@string/title_connect_to_network"/>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <TextView
+                style="@style/AppTheme.SectionTitle"
+                android:text="@string/title_connect_to_network"/>
+
+        <TextView
+                android:id="@+id/network_list_placeholder"
+                style="@style/AppTheme.ListBlock.Placeholder"
+                android:text="@string/message_no_network_configuration_found"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_network_status_header.xml b/app/src/main/res/layout/fragment_network_status_header.xml
index 947183b..cde547c 100644
--- a/app/src/main/res/layout/fragment_network_status_header.xml
+++ b/app/src/main/res/layout/fragment_network_status_header.xml
@@ -119,4 +119,9 @@
                 style="@style/AppTheme.SectionTitle"
                 android:text="@string/title_nodes"/>
 
+        <TextView
+                android:id="@+id/node_list_placeholder"
+                style="@style/AppTheme.ListBlock.Placeholder"
+                android:text="@string/message_no_known_node"/>
+
 </LinearLayout>
diff --git a/app/src/main/res/layout/page_start.xml b/app/src/main/res/layout/page_start.xml
index 68bf78f..b1bf2a4 100644
--- a/app/src/main/res/layout/page_start.xml
+++ b/app/src/main/res/layout/page_start.xml
@@ -15,20 +15,4 @@
                 android:footerDividersEnabled="false"
                 android:headerDividersEnabled="false"/>
 
-        <LinearLayout
-                android:id="@+id/network_list_empty"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <TextView
-                        style="@style/AppTheme.SectionTitle"
-                        android:text="@string/title_connect_to_network"/>
-
-                <TextView
-                        style="@style/AppTheme.ListBlock.Placeholder"
-                        android:text="@string/message_no_network_configuration_found"/>
-
-        </LinearLayout>
-
 </android.support.v4.widget.SwipeRefreshLayout>
diff --git a/app/src/main/res/layout/page_status.xml b/app/src/main/res/layout/page_status.xml
index cd80d0b..bc68ea1 100644
--- a/app/src/main/res/layout/page_status.xml
+++ b/app/src/main/res/layout/page_status.xml
@@ -1,10 +1,10 @@
 <android.support.v4.widget.SwipeRefreshLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
+        android:id="@+id/node_list_wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:id="@+id/node_list_wrapper"
         tools:context="org.pacien.tincapp.activities.StatusActivity">
 
         <ListView
@@ -15,9 +15,4 @@
                 android:footerDividersEnabled="false"
                 android:headerDividersEnabled="false"/>
 
-        <TextView
-                android:id="@+id/node_list_empty"
-                style="@style/AppTheme.ListBlock.Placeholder"
-                android:text="@string/message_no_known_node"/>
-
 </android.support.v4.widget.SwipeRefreshLayout>