diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-09-11 22:28:51 +0000 |
|---|---|---|
| committer | Linus Färnstrand <linus@mullvad.net> | 2019-09-13 11:29:04 +0200 |
| commit | 8874c987b1402f33ce1793c054c248e01e74f5a1 (patch) | |
| tree | 83195dd37f84bdc293f972041b3289e652d76be0 /android/src | |
| parent | 193fc328badaad8f5c4d6fb134ae993083db31df (diff) | |
| download | mullvadvpn-8874c987b1402f33ce1793c054c248e01e74f5a1.tar.xz mullvadvpn-8874c987b1402f33ce1793c054c248e01e74f5a1.zip | |
Set status indicator based on `RelayItem.active`
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt | 9 | ||||
| -rw-r--r-- | android/src/main/res/drawable/icon_relay_inactive.xml | 8 |
2 files changed, 16 insertions, 1 deletions
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 e753d3af5a..1c898b626c 100644 --- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt +++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt @@ -3,6 +3,7 @@ package net.mullvad.mullvadvpn.relaylist import android.support.v7.widget.RecyclerView.ViewHolder import android.view.View import android.widget.ImageButton +import android.widget.ImageView import android.widget.TextView import net.mullvad.mullvadvpn.R @@ -14,7 +15,7 @@ class RelayItemHolder( ) : ViewHolder(view) { private val name: TextView = view.findViewById(R.id.name) private val chevron: ImageButton = view.findViewById(R.id.chevron) - private val relayActive: View = view.findViewById(R.id.relay_active) + 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) @@ -55,6 +56,12 @@ class RelayItemHolder( } else { relayActive.visibility = View.VISIBLE selectedIcon.visibility = View.INVISIBLE + + if (item.active) { + relayActive.setImageResource(R.drawable.icon_relay_active) + } else { + relayActive.setImageResource(R.drawable.icon_relay_inactive) + } } when (item.type) { diff --git a/android/src/main/res/drawable/icon_relay_inactive.xml b/android/src/main/res/drawable/icon_relay_inactive.xml new file mode 100644 index 0000000000..79818e106f --- /dev/null +++ b/android/src/main/res/drawable/icon_relay_inactive.xml @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape + xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="oval" + > + <solid android:color="@color/red"/> + <size android:width="16dp" android:height="16dp"/> +</shape> |