diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-15 19:17:58 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-18 17:03:54 +0000 |
| commit | cdc6e80d840e11cc75d3daa4929b2d4dc1c42e8b (patch) | |
| tree | 67b7da2f526b85137c73592e6f5d065881c1a5f9 /android/src/main/res | |
| parent | 6b721524bb91e4078d725b4a23aaa6e9e3ac91c2 (diff) | |
| download | mullvadvpn-cdc6e80d840e11cc75d3daa4929b2d4dc1c42e8b.tar.xz mullvadvpn-cdc6e80d840e11cc75d3daa4929b2d4dc1c42e8b.zip | |
Implement initial relay list
Diffstat (limited to 'android/src/main/res')
| -rw-r--r-- | android/src/main/res/drawable/icon_relay_active.xml | 8 | ||||
| -rw-r--r-- | android/src/main/res/layout/relay_list_item.xml | 29 | ||||
| -rw-r--r-- | android/src/main/res/layout/select_location.xml | 10 | ||||
| -rw-r--r-- | android/src/main/res/values/dimensions.xml | 6 |
4 files changed, 53 insertions, 0 deletions
diff --git a/android/src/main/res/drawable/icon_relay_active.xml b/android/src/main/res/drawable/icon_relay_active.xml new file mode 100644 index 0000000000..f6e70521f8 --- /dev/null +++ b/android/src/main/res/drawable/icon_relay_active.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/green"/> + <size android:width="16dp" android:height="16dp"/> +</shape> diff --git a/android/src/main/res/layout/relay_list_item.xml b/android/src/main/res/layout/relay_list_item.xml new file mode 100644 index 0000000000..16561ca0ec --- /dev/null +++ b/android/src/main/res/layout/relay_list_item.xml @@ -0,0 +1,29 @@ +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_fragment" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingLeft="@dimen/country_row_padding" + android:paddingRight="24dp" + android:paddingVertical="16dp" + android:background="@color/blue" + android:orientation="horizontal" + android:gravity="center" + > + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="0" + android:src="@drawable/icon_relay_active" + /> + <TextView android:id="@+id/name" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_marginHorizontal="8dp" + android:textColor="@color/white" + android:textSize="20sp" + android:textStyle="bold" + android:text="" + /> +</LinearLayout> diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml index 0835c36dc3..a372b32a9f 100644 --- a/android/src/main/res/layout/select_location.xml +++ b/android/src/main/res/layout/select_location.xml @@ -11,6 +11,7 @@ <ImageButton android:id="@+id/close" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="0" android:layout_margin="12dp" android:background="?android:attr/selectableItemBackground" android:src="@drawable/icon_close" @@ -18,6 +19,7 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="0" android:layout_marginVertical="4dp" android:layout_marginHorizontal="24dp" android:textColor="@color/white" @@ -28,9 +30,17 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_weight="0" android:layout_marginHorizontal="24dp" + android:layout_marginBottom="24dp" android:textColor="@color/white60" android:textSize="13sp" android:text="@string/select_location_description" /> + <android.support.v7.widget.RecyclerView android:id="@+id/relay_list" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:scrollbars="vertical" + /> </LinearLayout> diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml new file mode 100644 index 0000000000..379843b2bf --- /dev/null +++ b/android/src/main/res/values/dimensions.xml @@ -0,0 +1,6 @@ +<resources> + <dimen name="country_row_padding">20dp</dimen> + <dimen name="city_row_padding">40dp</dimen> + <dimen name="relay_row_padding">60dp</dimen> + <dimen name="relay_list_divider">1dp</dimen> +</resources> |