diff options
Diffstat (limited to 'android/src')
3 files changed, 20 insertions, 4 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt index 1a5ecf51d8..fd7f9d58f1 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.content.ContextCompat import kotlinx.coroutines.delay import net.mullvad.mullvadvpn.R import net.mullvad.mullvadvpn.model.TunnelState @@ -18,7 +19,7 @@ import org.joda.time.DateTime val KEY_IS_TUNNEL_INFO_EXPANDED = "is_tunnel_info_expanded" -class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { +class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen), NavigationBarPainter { private lateinit var actionButton: ConnectActionButton private lateinit var switchLocationButton: SwitchLocationButton private lateinit var headerBar: HeaderBar @@ -57,7 +58,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { status = ConnectionStatus(view, parentActivity) - locationInfo = LocationInfo(view, context!!) + locationInfo = LocationInfo(view, requireContext()) locationInfo.isTunnelInfoExpanded = isTunnelInfoExpanded actionButton = ConnectActionButton(view) @@ -130,6 +131,11 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) { state.putBoolean(KEY_IS_TUNNEL_INFO_EXPANDED, isTunnelInfoExpanded) } + override fun onResume() { + super.onResume() + paintNavigationBar(ContextCompat.getColor(requireContext(), R.color.blue)) + } + private fun updateTunnelState(uiState: TunnelState, realState: TunnelState) { locationInfo.state = realState headerBar.tunnelState = realState diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt index 6a34491e89..43237dcd25 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SelectLocationFragment.kt @@ -27,7 +27,7 @@ import net.mullvad.mullvadvpn.ui.widget.CustomRecyclerView import net.mullvad.mullvadvpn.util.AdapterWithHeader class SelectLocationFragment : - ServiceDependentFragment(OnNoService.GoToLaunchScreen), StatusBarPainter { + ServiceDependentFragment(OnNoService.GoToLaunchScreen), StatusBarPainter, NavigationBarPainter { private enum class RelayListState { Initializing, Loading, @@ -143,6 +143,11 @@ class SelectLocationFragment : } } + override fun onResume() { + super.onResume() + paintNavigationBar(ContextCompat.getColor(requireContext(), R.color.darkBlue)) + } + fun close() { activity?.onBackPressed() } diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt index c539cdd753..5a0bb79cde 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt @@ -16,7 +16,7 @@ import net.mullvad.mullvadvpn.ui.widget.AccountCell import net.mullvad.mullvadvpn.ui.widget.AppVersionCell import net.mullvad.mullvadvpn.ui.widget.NavigateCell -class SettingsFragment : ServiceAwareFragment(), StatusBarPainter { +class SettingsFragment : ServiceAwareFragment(), StatusBarPainter, NavigationBarPainter { private lateinit var accountMenu: AccountCell private lateinit var appVersionMenu: AppVersionCell private lateinit var preferencesMenu: View @@ -85,6 +85,11 @@ class SettingsFragment : ServiceAwareFragment(), StatusBarPainter { } } + override fun onResume() { + super.onResume() + paintNavigationBar(ContextCompat.getColor(requireContext(), R.color.darkBlue)) + } + override fun onStart() { super.onStart() |