Generify fragment pager adapter

2 files changed, 15 insertions, 10 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/StatusFragmentPagerAdapter.kt b/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt
index d44ac5c..e4063bf 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/StatusFragmentPagerAdapter.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/common/FragmentListPagerAdapter.kt
@@ -16,24 +16,21 @@
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package org.pacien.tincapp.activities.status
+package org.pacien.tincapp.activities.common
 
+import android.support.v4.app.Fragment
 import android.support.v4.app.FragmentManager
 import android.support.v4.app.FragmentPagerAdapter
-import org.pacien.tincapp.R
-import org.pacien.tincapp.activities.status.networkinfo.NetworkInfoFragment
-import org.pacien.tincapp.activities.status.nodes.NodeListFragment
 import org.pacien.tincapp.context.App
 
 /**
+ * @param pages ordered list of title and fragment pairs
  * @author pacien
  */
-class StatusFragmentPagerAdapter(fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
+class FragmentListPagerAdapter(private val pages: List<Pair<Int, Fragment>>,
+                               fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) {
+
   private val resources by lazy { App.getResources() }
-  private val pages = listOf(
-    R.string.status_activity_title_network_info to NetworkInfoFragment(),
-    R.string.status_activity_title_node_list to NodeListFragment()
-  )
 
   override fun getPageTitle(position: Int) = resources.getString(pages[position].first)!!
   override fun getItem(position: Int) = pages[position].second
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
index 6627b61..f47df6c 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt
@@ -26,8 +26,11 @@ import android.view.MenuItem
 import kotlinx.android.synthetic.main.status_activity.*
 import org.pacien.tincapp.R
 import org.pacien.tincapp.activities.BaseActivity
+import org.pacien.tincapp.activities.common.FragmentListPagerAdapter
 import org.pacien.tincapp.activities.common.ProgressModal
 import org.pacien.tincapp.activities.start.StartActivity
+import org.pacien.tincapp.activities.status.networkinfo.NetworkInfoFragment
+import org.pacien.tincapp.activities.status.nodes.NodeListFragment
 import org.pacien.tincapp.activities.viewlog.ViewLogActivity
 import org.pacien.tincapp.intent.Actions
 import org.pacien.tincapp.intent.BroadcastMapper
@@ -39,8 +42,13 @@ import org.pacien.tincapp.service.TincVpnService
 class StatusActivity : BaseActivity() {
   private val vpnService by lazy { TincVpnService }
   private val netName by lazy { vpnService.getCurrentNetName() }
-  private val pagerAdapter by lazy { StatusFragmentPagerAdapter(supportFragmentManager) }
+  private val pagerAdapter by lazy { FragmentListPagerAdapter(pages, supportFragmentManager) }
   private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown))
+  private val pages = listOf(
+    R.string.status_activity_title_network_info to NetworkInfoFragment(),
+    R.string.status_activity_title_node_list to NodeListFragment()
+  )
+
   private var shutdownDialog: AlertDialog? = null
   private var listNetworksAfterExit = true