diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-06-16 19:57:59 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-07-01 19:12:29 +0000 |
| commit | cc95151cf5055f2abc49bae58e6386ecbd776dde (patch) | |
| tree | 7f35719649be7e1d3f12fbe04772140438e5fa72 /android/src/main/res/layout | |
| parent | c9dadc32a698c6058db887470e2a0cd2d050018f (diff) | |
| download | mullvadvpn-cc95151cf5055f2abc49bae58e6386ecbd776dde.tar.xz mullvadvpn-cc95151cf5055f2abc49bae58e6386ecbd776dde.zip | |
Move "Select location" title into scroll area
Diffstat (limited to 'android/src/main/res/layout')
| -rw-r--r-- | android/src/main/res/layout/select_location.xml | 17 | ||||
| -rw-r--r-- | android/src/main/res/layout/select_location_header.xml | 23 |
2 files changed, 23 insertions, 17 deletions
diff --git a/android/src/main/res/layout/select_location.xml b/android/src/main/res/layout/select_location.xml index 50c1d10643..284880c410 100644 --- a/android/src/main/res/layout/select_location.xml +++ b/android/src/main/res/layout/select_location.xml @@ -12,23 +12,6 @@ android:padding="12dp" android:background="?android:attr/selectableItemBackground" android:src="@drawable/icon_close" /> - <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" - android:textSize="32sp" - android:textStyle="bold" - android:text="@string/select_location" /> - <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" /> <ViewSwitcher android:id="@+id/relay_list_container" android:layout_width="match_parent" android:layout_height="0dp" diff --git a/android/src/main/res/layout/select_location_header.xml b/android/src/main/res/layout/select_location_header.xml new file mode 100644 index 0000000000..f7bdd1aa2d --- /dev/null +++ b/android/src/main/res/layout/select_location_header.xml @@ -0,0 +1,23 @@ +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="left"> + <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" + android:textSize="32sp" + android:textStyle="bold" + android:text="@string/select_location" /> + <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" /> +</LinearLayout> |