diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-17 20:43:36 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-18 17:03:54 +0000 |
| commit | 1a3cc1be01414bd2ab65e0482cadc70017a3f657 (patch) | |
| tree | 942fac8ac5cb9ef6a3f1bf51e12b931017af6e27 /android/src/main/res | |
| parent | 88212cb101afbd45ad8e78d53781c620e2a5e463 (diff) | |
| download | mullvadvpn-1a3cc1be01414bd2ab65e0482cadc70017a3f657.tar.xz mullvadvpn-1a3cc1be01414bd2ab65e0482cadc70017a3f657.zip | |
Implement selection of relay items in relay list
Diffstat (limited to 'android/src/main/res')
| -rw-r--r-- | android/src/main/res/drawable/icon_tick.xml | 14 | ||||
| -rw-r--r-- | android/src/main/res/layout/relay_list_item.xml | 20 |
2 files changed, 31 insertions, 3 deletions
diff --git a/android/src/main/res/drawable/icon_tick.xml b/android/src/main/res/drawable/icon_tick.xml new file mode 100644 index 0000000000..5a4831dd94 --- /dev/null +++ b/android/src/main/res/drawable/icon_tick.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="UTF-8"?> +<vector + xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0" + > + <group> + <path android:fillColor="#FFFFFF" + android:pathData="M2.92646877,10.7979185 C2.25699855,10.1340272 1.17157288,10.1340272 0.502102661,10.7979185 C-0.167367554,11.4618098 -0.167367554,12.5381902 0.502102661,13.2020815 L7.35924552,20.0020815 C8.02871573,20.6659728 9.11414141,20.6659728 9.78361162,20.0020815 L23.4978973,6.40208153 C24.1673676,5.73819023 24.1673676,4.66180977 23.4978973,3.99791847 C22.8284271,3.33402718 21.7430014,3.33402718 21.0735312,3.99791847 L8.57142857,16.3958369 L2.92646877,10.7979185 Z" + /> + </group> +</vector> diff --git a/android/src/main/res/layout/relay_list_item.xml b/android/src/main/res/layout/relay_list_item.xml index 82b9b4ea41..29ebf56762 100644 --- a/android/src/main/res/layout/relay_list_item.xml +++ b/android/src/main/res/layout/relay_list_item.xml @@ -10,12 +10,26 @@ android:orientation="horizontal" android:gravity="center" > - <ImageView + <FrameLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="0" - android:src="@drawable/icon_relay_active" - /> + android:gravity="center" + > + <ImageView android:id="@+id/relay_active" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:src="@drawable/icon_relay_active" + /> + <ImageView android:id="@+id/selected" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:src="@drawable/icon_tick" + android:visibility="invisible" + /> + </FrameLayout> <TextView android:id="@+id/name" android:layout_width="wrap_content" android:layout_height="wrap_content" |