From 0b3eef56d244bf40598cba66b1e48479ecbdfaef Mon Sep 17 00:00:00 2001
From: Pacien TRAN-GIRARD
Date: Mon, 3 Jul 2017 23:59:40 +0200
Subject: Fix empty list placeholder

---
 .../org/pacien/tincapp/activities/StartActivity.kt |  2 +-
 .../fragment_network_list_empty_placeholder.xml    |  5 ----
 app/src/main/res/layout/page_start.xml             | 32 ++++++++++++++++++----
 3 files changed, 27 insertions(+), 12 deletions(-)
 delete mode 100644 app/src/main/res/layout/fragment_network_list_empty_placeholder.xml

(limited to 'app/src/main')

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 21f5199..c438be0 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -40,7 +40,7 @@ class StartActivity : BaseActivity(), AdapterView.OnItemClickListener {
     private fun writeContent() {
         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 = layoutInflater.inflate(R.layout.fragment_network_list_empty_placeholder, network_list, false)
+        network_list.emptyView = network_list_empty
         network_list.adapter = ArrayAdapter<String>(this, R.layout.fragment_list_item, AppPaths.confDir().list())
         network_list.onItemClickListener = this
     }
diff --git a/app/src/main/res/layout/fragment_network_list_empty_placeholder.xml b/app/src/main/res/layout/fragment_network_list_empty_placeholder.xml
deleted file mode 100644
index 169942f..0000000
--- a/app/src/main/res/layout/fragment_network_list_empty_placeholder.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<TextView
-	xmlns:android="http://schemas.android.com/apk/res/android"
-	android:id="@+id/network_list_empty"
-	style="@style/AppTheme.ListBlock.Placeholder"
-	android:text="@string/message_no_network_configuration_found"/>
diff --git a/app/src/main/res/layout/page_start.xml b/app/src/main/res/layout/page_start.xml
index fec55de..0eaf7b0 100644
--- a/app/src/main/res/layout/page_start.xml
+++ b/app/src/main/res/layout/page_start.xml
@@ -1,13 +1,33 @@
-<ListView
+<LinearLayout
 	xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:id="@+id/network_list"
 	android:layout_width="match_parent"
 	android:layout_height="match_parent"
-	android:divider="@drawable/horizontal_line"
-	android:footerDividersEnabled="false"
-	android:headerDividersEnabled="false"
 	android:orientation="vertical"
 	tools:context="org.pacien.tincapp.activities.StartActivity">
 
-</ListView>
+	<ListView
+		android:id="@+id/network_list"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:divider="@drawable/horizontal_line"
+		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>
+
+</LinearLayout>
-- 
cgit v1.2.3