summaryrefslogtreecommitdiffhomepage
path: root/android/src
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-07-03 17:12:24 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2020-07-15 12:52:17 +0000
commit2311a646a99452c24888ce4ee1ca0ea7a0ff7e78 (patch)
tree18db8f5240d7f923f2ab2ae832e096a303695d77 /android/src
parent984b5c3b790e514e64eace25ec2f929c568645e5 (diff)
downloadmullvadvpn-2311a646a99452c24888ce4ee1ca0ea7a0ff7e78.tar.xz
mullvadvpn-2311a646a99452c24888ce4ee1ca0ea7a0ff7e78.zip
Make app list items clickable
Diffstat (limited to 'android/src')
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt6
-rw-r--r--android/src/main/res/drawable/app_list_item_background.xml13
-rw-r--r--android/src/main/res/layout/app_list_item.xml5
3 files changed, 22 insertions, 2 deletions
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
index a4df0518a5..04bdd55686 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/applist/AppListItemHolder.kt
@@ -39,6 +39,12 @@ class AppListItemHolder(
}
}
+ init {
+ view.setOnClickListener {
+ excluded.toggle()
+ }
+ }
+
private fun hideIcon() {
icon.visibility = View.GONE
loading.visibility = View.VISIBLE
diff --git a/android/src/main/res/drawable/app_list_item_background.xml b/android/src/main/res/drawable/app_list_item_background.xml
new file mode 100644
index 0000000000..9cde2e4032
--- /dev/null
+++ b/android/src/main/res/drawable/app_list_item_background.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:state_pressed="false">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/blue40" />
+ </shape>
+ </item>
+ <item android:state_pressed="true">
+ <shape android:shape="rectangle">
+ <solid android:color="@color/blue60" />
+ </shape>
+ </item>
+</selector>
diff --git a/android/src/main/res/layout/app_list_item.xml b/android/src/main/res/layout/app_list_item.xml
index 9be408e73f..741f3220de 100644
--- a/android/src/main/res/layout/app_list_item.xml
+++ b/android/src/main/res/layout/app_list_item.xml
@@ -2,9 +2,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingHorizontal="16dp"
- android:background="@color/blue40"
+ android:background="@drawable/app_list_item_background"
android:orientation="horizontal"
- android:gravity="center">
+ android:gravity="center"
+ android:clickable="true">
<ProgressBar android:id="@+id/loading"
android:layout_width="40dp"
android:layout_height="40dp"