diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-14 20:29:06 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-03-18 17:03:53 +0000 |
| commit | 5cf10e54db6ed5d02a1df657513f6dab1dd2f546 (patch) | |
| tree | b48f6a6e28cb780664ec2478f111aa70fe64a653 /android/src/main/res/layout | |
| parent | 59c0aa07d7208805fa46743e4d73b19cdd95ad1c (diff) | |
| download | mullvadvpn-5cf10e54db6ed5d02a1df657513f6dab1dd2f546.tar.xz mullvadvpn-5cf10e54db6ed5d02a1df657513f6dab1dd2f546.zip | |
Create initial empty "Select location" screen
Diffstat (limited to 'android/src/main/res/layout')
| -rw-r--r-- | android/src/main/res/layout/connect.xml | 2 | ||||
| -rw-r--r-- | android/src/main/res/layout/select_location.xml | 35 |
2 files changed, 36 insertions, 1 deletions
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml index 8163a9a297..19f9cb177e 100644 --- a/android/src/main/res/layout/connect.xml +++ b/android/src/main/res/layout/connect.xml @@ -136,7 +136,7 @@ android:orientation="vertical" android:padding="24dp" > - <Button + <Button android:id="@+id/switch_location" android:layout_marginVertical="16dp" android:text="@string/switch_location" android:drawableRight="@drawable/icon_chevron" diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml new file mode 100644 index 0000000000..551e76183b --- /dev/null +++ b/android/src/main/res/layout/select_location.xml @@ -0,0 +1,35 @@ +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/main_fragment" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/darkBlue" + android:orientation="vertical" + android:gravity="left" + > + <ImageButton + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="12dp" + android:background="?android:attr/selectableItemBackground" + android:src="@drawable/icon_close" + /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginVertical="4dp" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/select_location" + /> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" + android:textColor="@color/white60" + android:textSize="13sp" + android:text="@string/select_location_description" + /> +</LinearLayout> |