diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-14 20:51:12 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2020-08-18 13:13:31 +0000 |
| commit | 1868170bbab6e3741c4b58fecfeb176a9aa137a7 (patch) | |
| tree | f592ef2e77f5a55a87c63b03d12fa061d9a74bb7 /android/src/main | |
| parent | 484e11dde6f8fd910ce4e2d81f7b7f30b950573e (diff) | |
| download | mullvadvpn-1868170bbab6e3741c4b58fecfeb176a9aa137a7.tar.xz mullvadvpn-1868170bbab6e3741c4b58fecfeb176a9aa137a7.zip | |
Tweak Connect screen
Diffstat (limited to 'android/src/main')
| -rw-r--r-- | android/src/main/res/layout/connect.xml | 30 | ||||
| -rw-r--r-- | android/src/main/res/values/dimensions.xml | 1 |
2 files changed, 17 insertions, 14 deletions
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml index a2602dc028..3dde948259 100644 --- a/android/src/main/res/layout/connect.xml +++ b/android/src/main/res/layout/connect.xml @@ -41,7 +41,7 @@ <TextView android:id="@+id/connection_status" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" + android:layout_marginBottom="2dp" android:layout_marginHorizontal="@dimen/side_margin" android:textColor="@color/red" android:textSize="@dimen/text_medium" @@ -60,6 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginHorizontal="@dimen/side_margin" + android:layout_marginBottom="2dp" android:textColor="@color/white" android:textSize="@dimen/text_huge" android:textStyle="bold" @@ -70,22 +71,22 @@ android:layout_weight="0" android:orientation="vertical" android:paddingHorizontal="@dimen/side_margin" - android:gravity="start" + android:gravity="bottom" android:clickable="true" android:background="?android:attr/selectableItemBackground"> <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal"> + android:orientation="horizontal" + android:gravity="center"> <TextView android:id="@+id/hostname" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="@dimen/text_medium" - android:textStyle="bold" + android:textColor="@color/white40" + android:textSize="@dimen/text_hostname" android:text="" /> <ImageView android:id="@+id/chevron" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="24dp" + android:layout_height="24dp" android:layout_marginHorizontal="5dp" android:alpha="0.4" android:src="@drawable/icon_chevron_expand" /> @@ -93,19 +94,21 @@ <TextView android:id="@+id/tunnel_protocol" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="4dp" + android:layout_marginTop="1dp" android:textColor="@color/white" android:textSize="@dimen/text_small" android:text="" /> <TextView android:id="@+id/in_address" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="1dp" android:textColor="@color/white" android:textSize="@dimen/text_small" android:text="" /> <TextView android:id="@+id/out_address" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="1dp" android:textColor="@color/white" android:textSize="@dimen/text_small" android:text="" /> @@ -116,11 +119,10 @@ android:layout_weight="0" android:orientation="vertical" android:paddingHorizontal="@dimen/side_margin" - android:paddingTop="@dimen/vertical_space" + android:paddingTop="@dimen/button_separation" android:paddingBottom="@dimen/screen_vertical_margin"> <Button android:id="@+id/switch_location" - android:layout_marginTop="20dp" - android:layout_marginBottom="16dp" + android:layout_marginBottom="@dimen/button_separation" android:paddingHorizontal="8dp" android:text="@string/switch_location" android:drawableRight="@drawable/icon_chevron" @@ -133,11 +135,11 @@ android:text="@string/connect" style="@style/GreenButton" /> <ImageButton android:id="@+id/reconnect_button" - android:layout_width="wrap_content" + android:layout_width="50dp" android:layout_height="match_parent" android:layout_weight="0" android:layout_marginLeft="1dp" - android:paddingHorizontal="10dp" + android:padding="9dp" android:background="@drawable/transparent_red_right_half_button_background" android:visibility="gone" android:src="@drawable/icon_reload" /> diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml index 4dcb214407..85889a3d71 100644 --- a/android/src/main/res/values/dimensions.xml +++ b/android/src/main/res/values/dimensions.xml @@ -25,6 +25,7 @@ <dimen name="chevron_width">14dp</dimen> <dimen name="chevron_height">24dp</dimen> <dimen name="text_small">13sp</dimen> + <dimen name="text_hostname">15sp</dimen> <dimen name="text_medium">16sp</dimen> <dimen name="text_medium_plus">18sp</dimen> <dimen name="text_big">24sp</dimen> |