diff options
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/activities/status')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/status/StatusActivity.kt | 10 | ||||
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/activities/status/StatusFragmentPagerAdapter.kt | 41 |
2 files changed, 9 insertions, 42 deletions
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 | |||
26 | import kotlinx.android.synthetic.main.status_activity.* | 26 | import kotlinx.android.synthetic.main.status_activity.* |
27 | import org.pacien.tincapp.R | 27 | import org.pacien.tincapp.R |
28 | import org.pacien.tincapp.activities.BaseActivity | 28 | import org.pacien.tincapp.activities.BaseActivity |
29 | import org.pacien.tincapp.activities.common.FragmentListPagerAdapter | ||
29 | import org.pacien.tincapp.activities.common.ProgressModal | 30 | import org.pacien.tincapp.activities.common.ProgressModal |
30 | import org.pacien.tincapp.activities.start.StartActivity | 31 | import org.pacien.tincapp.activities.start.StartActivity |
32 | import org.pacien.tincapp.activities.status.networkinfo.NetworkInfoFragment | ||
33 | import org.pacien.tincapp.activities.status.nodes.NodeListFragment | ||
31 | import org.pacien.tincapp.activities.viewlog.ViewLogActivity | 34 | import org.pacien.tincapp.activities.viewlog.ViewLogActivity |
32 | import org.pacien.tincapp.intent.Actions | 35 | import org.pacien.tincapp.intent.Actions |
33 | import org.pacien.tincapp.intent.BroadcastMapper | 36 | import org.pacien.tincapp.intent.BroadcastMapper |
@@ -39,8 +42,13 @@ import org.pacien.tincapp.service.TincVpnService | |||
39 | class StatusActivity : BaseActivity() { | 42 | class StatusActivity : BaseActivity() { |
40 | private val vpnService by lazy { TincVpnService } | 43 | private val vpnService by lazy { TincVpnService } |
41 | private val netName by lazy { vpnService.getCurrentNetName() } | 44 | private val netName by lazy { vpnService.getCurrentNetName() } |
42 | private val pagerAdapter by lazy { StatusFragmentPagerAdapter(supportFragmentManager) } | 45 | private val pagerAdapter by lazy { FragmentListPagerAdapter(pages, supportFragmentManager) } |
43 | private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown)) | 46 | private val broadcastMapper = BroadcastMapper(mapOf(Actions.EVENT_DISCONNECTED to this::onVpnShutdown)) |
47 | private val pages = listOf( | ||
48 | R.string.status_activity_title_network_info to NetworkInfoFragment(), | ||
49 | R.string.status_activity_title_node_list to NodeListFragment() | ||
50 | ) | ||
51 | |||
44 | private var shutdownDialog: AlertDialog? = null | 52 | private var shutdownDialog: AlertDialog? = null |
45 | private var listNetworksAfterExit = true | 53 | private var listNetworksAfterExit = true |
46 | 54 | ||
diff --git a/app/src/main/java/org/pacien/tincapp/activities/status/StatusFragmentPagerAdapter.kt b/app/src/main/java/org/pacien/tincapp/activities/status/StatusFragmentPagerAdapter.kt deleted file mode 100644 index d44ac5c..0000000 --- a/app/src/main/java/org/pacien/tincapp/activities/status/StatusFragmentPagerAdapter.kt +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | /* | ||
2 | * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon | ||
3 | * Copyright (C) 2017-2018 Pacien TRAN-GIRARD | ||
4 | * | ||
5 | * This program is free software: you can redistribute it and/or modify | ||
6 | * it under the terms of the GNU General Public License as published by | ||
7 | * the Free Software Foundation, either version 3 of the License, or | ||
8 | * (at your option) any later version. | ||
9 | * | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details. | ||
14 | * | ||
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program. If not, see <https://www.gnu.org/licenses/>. | ||
17 | */ | ||
18 | |||
19 | package org.pacien.tincapp.activities.status | ||
20 | |||
21 | import android.support.v4.app.FragmentManager | ||
22 | import android.support.v4.app.FragmentPagerAdapter | ||
23 | import org.pacien.tincapp.R | ||
24 | import org.pacien.tincapp.activities.status.networkinfo.NetworkInfoFragment | ||
25 | import org.pacien.tincapp.activities.status.nodes.NodeListFragment | ||
26 | import org.pacien.tincapp.context.App | ||
27 | |||
28 | /** | ||
29 | * @author pacien | ||
30 | */ | ||
31 | class StatusFragmentPagerAdapter(fragmentManager: FragmentManager) : FragmentPagerAdapter(fragmentManager) { | ||
32 | private val resources by lazy { App.getResources() } | ||
33 | private val pages = listOf( | ||
34 | R.string.status_activity_title_network_info to NetworkInfoFragment(), | ||
35 | R.string.status_activity_title_node_list to NodeListFragment() | ||
36 | ) | ||
37 | |||
38 | override fun getPageTitle(position: Int) = resources.getString(pages[position].first)!! | ||
39 | override fun getItem(position: Int) = pages[position].second | ||
40 | override fun getCount() = pages.size | ||
41 | } | ||