Don't use `Context.getColor`

9 files changed, 32 insertions, 29 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountInput.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountInput.kt
index 170df9a0be..9c0c79348d 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountInput.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/AccountInput.kt
@@ -1,6 +1,6 @@
 package net.mullvad.mullvadvpn
 
-import android.content.Context
+import android.content.res.Resources
 import android.text.Editable
 import android.text.TextWatcher
 import android.text.style.MetricAffectingSpan
@@ -11,14 +11,13 @@ import android.widget.ImageButton
 
 const val MIN_ACCOUNT_TOKEN_LENGTH = 10
 
-class AccountInput(val parentView: View, val context: Context) {
-    private val disabledBackgroundColor = context.getColor(R.color.white20)
-    private val disabledTextColor = context.getColor(R.color.white)
-    private val enabledBackgroundColor = context.getColor(R.color.white)
-    private val enabledTextColor = context.getColor(R.color.blue)
-    private val errorTextColor = context.getColor(R.color.red)
+class AccountInput(val parentView: View, val resources: Resources) {
+    private val disabledBackgroundColor = resources.getColor(R.color.white20)
+    private val disabledTextColor = resources.getColor(R.color.white)
+    private val enabledBackgroundColor = resources.getColor(R.color.white)
+    private val enabledTextColor = resources.getColor(R.color.blue)
+    private val errorTextColor = resources.getColor(R.color.red)
 
-    private val resources = context.resources
     private val focusedBorder = resources.getDrawable(R.drawable.account_input_border_focused, null)
     private val errorBorder = resources.getDrawable(R.drawable.account_input_border_error, null)
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
index df833df39b..a033b0fe84 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectFragment.kt
@@ -68,14 +68,15 @@ class ConnectFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View {
         val view = inflater.inflate(R.layout.connect, container, false)
+        val resources = parentActivity.resources
 
         view.findViewById<ImageButton>(R.id.settings).setOnClickListener {
             parentActivity.openSettings()
         }
 
-        headerBar = HeaderBar(view, context!!)
+        headerBar = HeaderBar(view, resources)
         notificationBanner = NotificationBanner(view, context!!, versionInfoCache)
-        status = ConnectionStatus(view, context!!)
+        status = ConnectionStatus(view, resources)
 
         locationInfo = LocationInfo(view, context!!)
         locationInfo.isTunnelInfoExpanded = isTunnelInfoExpanded
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
index 707bfde70e..a56852bc59 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ConnectionStatus.kt
@@ -1,18 +1,18 @@
 package net.mullvad.mullvadvpn
 
-import android.content.Context
+import android.content.res.Resources
 import android.view.View
 import android.widget.TextView
 import net.mullvad.mullvadvpn.model.ActionAfterDisconnect
 import net.mullvad.mullvadvpn.model.TunnelState
 
-class ConnectionStatus(val parentView: View, val context: Context) {
+class ConnectionStatus(val parentView: View, val resources: Resources) {
     private val spinner: View = parentView.findViewById(R.id.connecting_spinner)
     private val text: TextView = parentView.findViewById(R.id.connection_status)
 
-    private val unsecuredTextColor = context.getColor(R.color.red)
-    private val connectingTextColor = context.getColor(R.color.white)
-    private val securedTextColor = context.getColor(R.color.green)
+    private val unsecuredTextColor = resources.getColor(R.color.red)
+    private val connectingTextColor = resources.getColor(R.color.white)
+    private val securedTextColor = resources.getColor(R.color.green)
 
     fun setState(state: TunnelState) {
         when (state) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ForegroundNotificationManager.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ForegroundNotificationManager.kt
index 37a068c3e6..7032b301fe 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ForegroundNotificationManager.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ForegroundNotificationManager.kt
@@ -29,6 +29,8 @@ class ForegroundNotificationManager(val service: Service, val connectionProxy: C
         tunnelState = state
     }
 
+    private val badgeColor = service.resources.getColor(R.color.colorPrimary)
+
     private var reconnecting = false
     private var showingReconnecting = false
 
@@ -189,7 +191,7 @@ class ForegroundNotificationManager(val service: Service, val connectionProxy: C
 
         val builder = NotificationCompat.Builder(service, CHANNEL_ID)
             .setSmallIcon(R.drawable.notification)
-            .setColor(service.getColor(R.color.colorPrimary))
+            .setColor(badgeColor)
             .setContentTitle(service.getString(notificationText))
             .setContentIntent(pendingIntent)
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/HeaderBar.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/HeaderBar.kt
index 575c166268..b89b13e08a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/HeaderBar.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/HeaderBar.kt
@@ -1,14 +1,14 @@
 package net.mullvad.mullvadvpn
 
-import android.content.Context
+import android.content.res.Resources
 import android.view.View
 import net.mullvad.mullvadvpn.model.TunnelState
 
-class HeaderBar(val parentView: View, val context: Context) {
+class HeaderBar(val parentView: View, val resources: Resources) {
     private val headerBar: View = parentView.findViewById(R.id.header_bar)
 
-    private val securedColor = context.getColor(R.color.green)
-    private val unsecuredColor = context.getColor(R.color.red)
+    private val securedColor = resources.getColor(R.color.green)
+    private val unsecuredColor = resources.getColor(R.color.red)
 
     fun setState(state: TunnelState) {
         when (state) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt
index 702c7793b0..5561043791 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/LoginFragment.kt
@@ -54,7 +54,7 @@ class LoginFragment : Fragment() {
         loggedInStatus = view.findViewById(R.id.logged_in_status)
         loginFailStatus = view.findViewById(R.id.login_fail_status)
 
-        accountInput = AccountInput(view, parentActivity)
+        accountInput = AccountInput(view, parentActivity.resources)
         accountInput.onLogin = { accountToken -> login(accountToken) }
 
         view.findViewById<View>(R.id.create_account).setOnClickListener { createAccount() }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/RemainingTimeLabel.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/RemainingTimeLabel.kt
index 4c2b71f7b3..df996073a0 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/RemainingTimeLabel.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/RemainingTimeLabel.kt
@@ -13,11 +13,11 @@ import org.joda.time.PeriodType
 class RemainingTimeLabel(val parentActivity: MainActivity, val view: View) {
     private val accountCache = parentActivity.accountCache
 
-    private val expiredColor = parentActivity.getColor(R.color.red)
-    private val normalColor = parentActivity.getColor(R.color.white60)
-
     private val resources = parentActivity.resources
 
+    private val expiredColor = resources.getColor(R.color.red)
+    private val normalColor = resources.getColor(R.color.white60)
+
     private val label = view.findViewById<TextView>(R.id.remaining_time)
 
     private var updateJob: Job? = null
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
index 31e59f107e..14d4803717 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/WireguardKeyFragment.kt
@@ -133,7 +133,7 @@ class WireguardKeyFragment : Fragment() {
 
     private fun setStatusMessage(message: Int, color: Int) {
         statusMessage.setText(message)
-        statusMessage.setTextColor(parentActivity.getColor(color))
+        statusMessage.setTextColor(resources.getColor(color))
         statusMessage.visibility = View.VISIBLE
     }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
index ff456acef7..fc7de5b3be 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
@@ -17,10 +17,11 @@ class RelayItemHolder(
     private val relayActive: ImageView = view.findViewById(R.id.relay_active)
     private val selectedIcon: View = view.findViewById(R.id.selected)
 
-    private val countryColor = view.context.getColor(R.color.blue)
-    private val cityColor = view.context.getColor(R.color.blue40)
-    private val relayColor = view.context.getColor(R.color.blue20)
-    private val selectedColor = view.context.getColor(R.color.green)
+    private val resources = view.context.resources
+    private val countryColor = resources.getColor(R.color.blue)
+    private val cityColor = resources.getColor(R.color.blue40)
+    private val relayColor = resources.getColor(R.color.blue20)
+    private val selectedColor = resources.getColor(R.color.green)
 
     private val countryPadding = view.resources.getDimensionPixelSize(R.dimen.country_row_padding)
     private val cityPadding = view.resources.getDimensionPixelSize(R.dimen.city_row_padding)