Refactor common list views

5 files changed, 19 insertions, 40 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 05f8904..6e8ad37 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StartActivity.kt
@@ -10,8 +10,8 @@ import android.widget.AdapterView
 import android.widget.ArrayAdapter
 import android.widget.TextView
 import kotlinx.android.synthetic.main.base.*
+import kotlinx.android.synthetic.main.fragment_list_view.*
 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
 import org.pacien.tincapp.extensions.Android.setElements
@@ -32,12 +32,12 @@ class StartActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefr
         networkListAdapter = ArrayAdapter<String>(this, R.layout.fragment_list_item)
         confChangeObserver = FileObserver(AppPaths.confDir().absolutePath, FileObserver.CHANGE, { _, _ -> onRefresh() })
 
-        layoutInflater.inflate(R.layout.page_start, main_content)
-        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.adapter = networkListAdapter
-        network_list.onItemClickListener = this
+        layoutInflater.inflate(R.layout.fragment_list_view, main_content)
+        list_wrapper.setOnRefreshListener(this)
+        list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_list_header, list, false), null, false)
+        list.addFooterView(View(this), null, false)
+        list.adapter = networkListAdapter
+        list.onItemClickListener = this
     }
 
     override fun onCreateOptionsMenu(m: Menu): Boolean {
@@ -72,7 +72,7 @@ class StartActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRefr
         runOnUiThread {
             networkListAdapter?.setElements(networks)
             network_list_placeholder.visibility = if (networkListAdapter?.isEmpty ?: true) View.VISIBLE else View.GONE
-            network_list_wrapper.isRefreshing = false
+            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 0d7af6e..6d97dca 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/StatusActivity.kt
@@ -13,8 +13,8 @@ import android.widget.TextView
 import java8.util.concurrent.CompletableFuture
 import kotlinx.android.synthetic.main.base.*
 import kotlinx.android.synthetic.main.dialog_text_monopsace.view.*
+import kotlinx.android.synthetic.main.fragment_list_view.*
 import kotlinx.android.synthetic.main.fragment_network_status_header.*
-import kotlinx.android.synthetic.main.page_status.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.data.VpnInterfaceConfiguration
@@ -39,12 +39,12 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
         nodeListAdapter = ArrayAdapter<String>(this, R.layout.fragment_list_item)
         refreshTimer = Timer(true)
 
-        layoutInflater.inflate(R.layout.page_status, main_content)
-        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.onItemClickListener = this
-        node_list.adapter = nodeListAdapter
+        layoutInflater.inflate(R.layout.fragment_list_view, main_content)
+        list_wrapper.setOnRefreshListener(this)
+        list.addHeaderView(layoutInflater.inflate(R.layout.fragment_network_status_header, list, false), null, false)
+        list.addFooterView(View(this), null, false)
+        list.onItemClickListener = this
+        list.adapter = nodeListAdapter
     }
 
     override fun onCreateOptionsMenu(m: Menu): Boolean {
@@ -82,7 +82,7 @@ class StatusActivity : BaseActivity(), AdapterView.OnItemClickListener, SwipeRef
             runOnUiThread {
                 nodeListAdapter?.setElements(it)
                 node_list_placeholder.visibility = if (nodeListAdapter?.isEmpty ?: true) View.VISIBLE else View.GONE
-                node_list_wrapper.isRefreshing = false
+                list_wrapper.isRefreshing = false
                 if (!TincVpnService.isConnected()) openStartActivity()
             }
         }
diff --git a/app/src/main/res/layout/fragment_list_item.xml b/app/src/main/res/layout/fragment_list_item.xml
index c6049f5..f872573 100644
--- a/app/src/main/res/layout/fragment_list_item.xml
+++ b/app/src/main/res/layout/fragment_list_item.xml
@@ -5,5 +5,4 @@
         android:paddingLeft="@dimen/activity_horizontal_margin"
         android:paddingRight="@dimen/activity_horizontal_margin"
         android:paddingTop="@dimen/activity_vertical_margin">
-
 </TextView>
diff --git a/app/src/main/res/layout/page_status.xml b/app/src/main/res/layout/fragment_list_view.xml
index bc68ea1..32e951e 100644
--- a/app/src/main/res/layout/page_status.xml
+++ b/app/src/main/res/layout/fragment_list_view.xml
@@ -1,14 +1,12 @@
 <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:id="@+id/list_wrapper"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:orientation="vertical"
-        tools:context="org.pacien.tincapp.activities.StatusActivity">
+        android:orientation="vertical">
 
         <ListView
-                android:id="@+id/node_list"
+                android:id="@+id/list"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
                 android:divider="@drawable/horizontal_line"
diff --git a/app/src/main/res/layout/page_start.xml b/app/src/main/res/layout/page_start.xml
deleted file mode 100644
index b1bf2a4..0000000
--- a/app/src/main/res/layout/page_start.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<android.support.v4.widget.SwipeRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:id="@+id/network_list_wrapper"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical"
-        tools:context="org.pacien.tincapp.activities.StartActivity">
-
-        <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"/>
-
-</android.support.v4.widget.SwipeRefreshLayout>