diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-31 20:48:16 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-08-02 13:46:52 +0000 |
| commit | 4bb534d564648c39d35da18377917a6a72becca5 (patch) | |
| tree | 4f83b64e19f9d063466f486243625bcf262d2e66 /android/src | |
| parent | 005f5fd7029991d1265134558691ff2992bfb5d6 (diff) | |
| download | mullvadvpn-4bb534d564648c39d35da18377917a6a72becca5.tar.xz mullvadvpn-4bb534d564648c39d35da18377917a6a72becca5.zip | |
Add text views for tunnel information
Diffstat (limited to 'android/src')
| -rw-r--r-- | android/src/main/res/layout/connect.xml | 55 |
1 files changed, 40 insertions, 15 deletions
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml index 4468e838e8..f891b704f5 100644 --- a/android/src/main/res/layout/connect.xml +++ b/android/src/main/res/layout/connect.xml @@ -137,7 +137,7 @@ android:layout_height="wrap_content" android:layout_weight="0" android:orientation="vertical" - android:padding="24dp" + android:paddingHorizontal="24dp" android:gravity="start" > <TextView android:id="@+id/connection_status" @@ -166,22 +166,47 @@ 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="" - /> + android:layout_weight="0" + android:orientation="vertical" + android:gravity="start" + > + <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="" + /> + <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> - <Space - android:layout_width="match_parent" - android:layout_height="32dp" - android:layout_weight="0" - /> - <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" @@ -190,7 +215,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" |