13 files changed, 104 insertions, 41 deletions

diff --git a/app/src/main/res/layout/fragment_network_list_header.xml b/app/src/main/res/layout/start_activity.xml
index 1ce0490..97283cb 100644
--- a/app/src/main/res/layout/fragment_network_list_header.xml
+++ b/app/src/main/res/layout/start_activity.xml
@@ -18,18 +18,15 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
-<LinearLayout
+<FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-        <TextView
-                style="@style/AppTheme.SectionTitle"
-                android:text="@string/title_connect_to_network"/>
+        <fragment
+                android:id="@+id/start_activity_network_list_fragment"
+                android:name="org.pacien.tincapp.activities.start.NetworkListFragment"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"/>
 
-        <TextView
-                android:id="@+id/network_list_placeholder"
-                style="@style/AppTheme.ListBlock.Placeholder"/>
-
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/start_network_list.xml b/app/src/main/res/layout/start_network_list.xml
new file mode 100644
index 0000000..02a78d1
--- /dev/null
+++ b/app/src/main/res/layout/start_network_list.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/start_network_list_wrapper"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <ListView
+                android:id="@+id/start_network_list"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:divider="@drawable/horizontal_line"/>
+
+        <LinearLayout
+                android:id="@+id/start_network_list_placeholder"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <include
+                        layout="@layout/start_network_list_header"/>
+
+                <TextView
+                        android:id="@+id/start_network_list_placeholder_text"
+                        style="@style/AppTheme.ListBlock.Placeholder"
+                        android:text="@string/start_network_list_empty_none_found"/>
+
+        </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_list_view.xml b/app/src/main/res/layout/start_network_list_header.xml
index 32dd361..5fc213a 100644
--- a/app/src/main/res/layout/fragment_list_view.xml
+++ b/app/src/main/res/layout/start_network_list_header.xml
@@ -18,19 +18,7 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
 
-<android.support.v4.widget.SwipeRefreshLayout
+<TextView
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/list_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <ListView
-                android:id="@+id/list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:divider="@drawable/horizontal_line"
-                android:footerDividersEnabled="false"
-                android:headerDividersEnabled="false"/>
-
-</android.support.v4.widget.SwipeRefreshLayout>
+        style="@style/AppTheme.SectionTitle"
+        android:text="@string/start_network_list_title"/>
diff --git a/app/src/main/res/layout/fragment_list_item.xml b/app/src/main/res/layout/start_network_list_item.xml
index 574dff7..dd1a842 100644
--- a/app/src/main/res/layout/fragment_list_item.xml
+++ b/app/src/main/res/layout/start_network_list_item.xml
@@ -24,5 +24,4 @@
         android:paddingBottom="@dimen/activity_vertical_margin"
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
-        android:paddingTop="@dimen/activity_vertical_margin">
-</TextView>
+        android:paddingTop="@dimen/activity_vertical_margin"/>
diff --git a/app/src/main/res/layout/status_node_list.xml b/app/src/main/res/layout/status_node_list.xml
index d3c4831..923d20e 100644
--- a/app/src/main/res/layout/status_node_list.xml
+++ b/app/src/main/res/layout/status_node_list.xml
@@ -20,7 +20,7 @@
 
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/list_wrapper"
+        android:id="@+id/status_node_list_wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/status_node_list_item.xml b/app/src/main/res/layout/status_node_list_item.xml
new file mode 100644
index 0000000..dd1a842
--- /dev/null
+++ b/app/src/main/res/layout/status_node_list_item.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
+ * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * 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"/>
diff --git a/app/src/main/res/menu/menu_start.xml b/app/src/main/res/menu/menu_start.xml
index 9d2ba25..311c36a 100644
--- a/app/src/main/res/menu/menu_start.xml
+++ b/app/src/main/res/menu/menu_start.xml
@@ -21,7 +21,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
                         xmlns:app="http://schemas.android.com/apk/res-auto"
                         xmlns:tools="http://schemas.android.com/tools"
-                        tools:context="org.pacien.tincapp.activities.StartActivity">
+                        tools:context="org.pacien.tincapp.activities.start.StartActivity">
 
         <item
                 android:id="@+id/menu_about"
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 4d6cc80..b7f6f85 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -34,7 +34,7 @@
 
         <string name="configure_tools_generate_config_net_name_hint">Tinc ネットワーク名</string>
 
-        <string name="title_connect_to_network">ネットワークに接続</string>
+        <string name="start_network_list_title">ネットワークに接続</string>
         <string name="title_request_vpn_permissions">VPN 権限のリクエスト</string>
 
         <string name="action_close">閉じる</string>
diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml
index 4952beb..2af33d2 100644
--- a/app/src/main/res/values-nb-rNO/strings.xml
+++ b/app/src/main/res/values-nb-rNO/strings.xml
@@ -34,7 +34,7 @@