diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-20 23:37:10 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-24 19:00:24 +0000 |
| commit | b40020026e48776f21c3e69be78751cb93b5622d (patch) | |
| tree | d4d62812ce2ff56375a348774a6fd2da942b11a9 /android/src | |
| parent | 0159da367e2938804c9c50425c1322eb32d277cb (diff) | |
| download | mullvadvpn-b40020026e48776f21c3e69be78751cb93b5622d.tar.xz mullvadvpn-b40020026e48776f21c3e69be78751cb93b5622d.zip | |
Rename split tunneling layouts to change spelling
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt | 4 | ||||
| -rw-r--r-- | android/src/main/res/layout/split_tunneling.xml (renamed from android/src/main/res/layout/split_tunnelling.xml) | 0 | ||||
| -rw-r--r-- | android/src/main/res/layout/split_tunneling_header.xml (renamed from android/src/main/res/layout/split_tunnelling_header.xml) | 0 |
3 files changed, 2 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt index 6118cfeb5a..5d2fa1cae5 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SplitTunnelingFragment.kt @@ -62,7 +62,7 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc container: ViewGroup?, savedInstanceState: Bundle? ): View { - val view = inflater.inflate(R.layout.split_tunnelling, container, false) + val view = inflater.inflate(R.layout.split_tunneling, container, false) view.findViewById<View>(R.id.back).setOnClickListener { activity?.onBackPressed() @@ -73,7 +73,7 @@ class SplitTunnelingFragment : ServiceDependentFragment(OnNoService.GoToLaunchSc view.findViewById<CustomRecyclerView>(R.id.app_list).apply { layoutManager = LinearLayoutManager(parentActivity) - adapter = AdapterWithHeader(appListAdapter, R.layout.split_tunnelling_header).apply { + adapter = AdapterWithHeader(appListAdapter, R.layout.split_tunneling_header).apply { onHeaderAvailable = { headerView -> configureHeader(headerView) titleController.expandedTitleView = headerView.findViewById(R.id.expanded_title) diff --git a/android/src/main/res/layout/split_tunnelling.xml b/android/src/main/res/layout/split_tunneling.xml index 7d080be09c..7d080be09c 100644 --- a/android/src/main/res/layout/split_tunnelling.xml +++ b/android/src/main/res/layout/split_tunneling.xml diff --git a/android/src/main/res/layout/split_tunnelling_header.xml b/android/src/main/res/layout/split_tunneling_header.xml index 12fb12c4f3..12fb12c4f3 100644 --- a/android/src/main/res/layout/split_tunnelling_header.xml +++ b/android/src/main/res/layout/split_tunneling_header.xml |