diff options
| author | Emīls <pinkisemils@mullvad.net> | 2020-02-11 17:25:27 +0000 |
|---|---|---|
| committer | Emīls <pinkisemils@mullvad.net> | 2020-02-11 17:25:27 +0000 |
| commit | 998932a4331310137d01991d6271b09c7c9c35e4 (patch) | |
| tree | 167d6d815af768eeb911245d23a121958c602ec5 /android/src/main/res | |
| parent | dc9f4c0c3178d61ef46d2ba784d1cefdd09626ed (diff) | |
| parent | 3b903818864a75971255b408baa01d6ee9686484 (diff) | |
| download | mullvadvpn-998932a4331310137d01991d6271b09c7c9c35e4.tar.xz mullvadvpn-998932a4331310137d01991d6271b09c7c9c35e4.zip | |
Merge branch 'android-add-account-history'
Diffstat (limited to 'android/src/main/res')
4 files changed, 43 insertions, 0 deletions
diff --git a/android/src/main/res/drawable/account_history_background.xml b/android/src/main/res/drawable/account_history_background.xml new file mode 100644 index 0000000000..b71d15464f --- /dev/null +++ b/android/src/main/res/drawable/account_history_background.xml @@ -0,0 +1,16 @@ +<?xml version="1.0" encoding="utf-8"?> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape xmlns:android="http://schemas.android.com/apk/res/android"> + <corners android:radius="@dimen/account_input_corner_radius" /> + <solid android:color="@color/darkBlue" /> + </shape> + </item> + <item android:top="0dp" android:right="1dp" android:bottom="1dp" + android:left="1dp"> + <shape xmlns:android="http://schemas.android.com/apk/res/android"> + <corners android:radius="@dimen/account_input_corner_radius" /> + <solid android:color="@color/white" /> + </shape> + </item> +</layer-list> diff --git a/android/src/main/res/drawable/account_history_list_divider.xml b/android/src/main/res/drawable/account_history_list_divider.xml new file mode 100644 index 0000000000..d3b31cc0c3 --- /dev/null +++ b/android/src/main/res/drawable/account_history_list_divider.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="utf-8"?> +<shape xmlns:android="http://schemas.android.com/apk/res/android" + android:shape="rectangle"> +<solid android:color="@color/darkBlue" /> +</shape> diff --git a/android/src/main/res/layout/account_history_entry.xml b/android/src/main/res/layout/account_history_entry.xml new file mode 100644 index 0000000000..f1d0b67bde --- /dev/null +++ b/android/src/main/res/layout/account_history_entry.xml @@ -0,0 +1,13 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical"> + + <TextView android:id="@+id/account_history_entry_text_view" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:textColor="@color/blue" + android:padding="10dip" + android:textSize="16dip" + android:textStyle="bold"/> +</LinearLayout> diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml index b0a53d87d6..46e844d5c6 100644 --- a/android/src/main/res/layout/login.xml +++ b/android/src/main/res/layout/login.xml @@ -138,6 +138,15 @@ android:src="@drawable/login_button_arrow" /> </net.mullvad.mullvadvpn.ui.AccountInputContainer> + + <ListView android:id="@+id/account_history_list" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:divider="@drawable/account_history_list_divider" + android:dividerHeight="1dp" + android:visibility="invisible" + android:background="@drawable/account_history_background" + /> <Space android:layout_width="match_parent" android:layout_height="0dp" |