diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-03 12:15:14 -0300 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-03 12:15:14 -0300 |
| commit | 2b5dc52e657786f2d4ecaa362da267f0408d9a64 (patch) | |
| tree | dc1203de56f3bc562d8ee80dac63b654d62303fc /android/src/main/res/layout | |
| parent | fc28a749fba82bf2fed844a7ffab33f3619f7233 (diff) | |
| parent | d20d24bdbce33e4cacebeecec0d518ffbea6a2e9 (diff) | |
| download | mullvadvpn-2b5dc52e657786f2d4ecaa362da267f0408d9a64.tar.xz mullvadvpn-2b5dc52e657786f2d4ecaa362da267f0408d9a64.zip | |
Merge branch 'show-in-out-ip-address'
Diffstat (limited to 'android/src/main/res/layout')
| -rw-r--r-- | android/src/main/res/layout/connect.xml | 74 |
1 files changed, 59 insertions, 15 deletions
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml index 4468e838e8..579e3c6a4e 100644 --- a/android/src/main/res/layout/connect.xml +++ b/android/src/main/res/layout/connect.xml @@ -137,13 +137,13 @@ android:layout_height="wrap_content" android:layout_weight="0" android:orientation="vertical" - android:padding="24dp" android:gravity="start" > <TextView android:id="@+id/connection_status" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="4dp" + android:layout_marginHorizontal="24dp" android:textColor="@color/red" android:textSize="16sp" android:textStyle="bold" @@ -153,6 +153,7 @@ <TextView android:id="@+id/country" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" android:textColor="@color/white" android:textSize="34sp" android:textStyle="bold" @@ -161,26 +162,69 @@ <TextView android:id="@+id/city" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginHorizontal="24dp" android:textColor="@color/white" android:textSize="34sp" android:textStyle="bold" android:text="" /> - <TextView android:id="@+id/hostname" - android:layout_width="wrap_content" + + <LinearLayout android:id="@+id/tunnel_info" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:textColor="@color/white" - android:textSize="16sp" - android:textStyle="bold" - android:text="" - /> - </LinearLayout> + android:layout_weight="0" + android:orientation="vertical" + android:paddingHorizontal="24dp" + android:gravity="start" + android:clickable="true" + android:background="?android:attr/selectableItemBackground" + > + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + > + <TextView android:id="@+id/hostname" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="16sp" + android:textStyle="bold" + android:text="" + /> + <ImageView android:id="@+id/chevron" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginHorizontal="5dp" + android:alpha="0.4" + android:src="@drawable/icon_chevron_expand" + /> + </LinearLayout> - <Space - android:layout_width="match_parent" - android:layout_height="32dp" - android:layout_weight="0" - /> + <TextView android:id="@+id/tunnel_protocol" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="4dp" + android:textColor="@color/white" + android:textSize="13sp" + android:text="" + /> + <TextView android:id="@+id/in_address" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="13sp" + android:text="" + /> + <TextView android:id="@+id/out_address" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" + android:textSize="13sp" + android:text="" + /> + </LinearLayout> + </LinearLayout> <LinearLayout android:layout_width="match_parent" @@ -190,7 +234,7 @@ android:padding="24dp" > <Button android:id="@+id/switch_location" - android:layout_marginVertical="16dp" + android:layout_marginBottom="16dp" android:text="@string/switch_location" android:drawableRight="@drawable/icon_chevron" android:paddingRight="8dp" |