summaryrefslogtreecommitdiffhomepage
path: root/android/src/main/res/layout
diff options
context:
space:
mode:
authorJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-30 21:35:43 +0000
committerJanito Vaqueiro Ferreira Filho <janito@mullvad.net>2019-07-31 11:55:29 +0000
commit4929a35cd5fcf4be236f453d58ea4cda28edddc0 (patch)
tree30d1e9821677d211f2e652313d9204f46e19de03 /android/src/main/res/layout
parent3378afa27e881249b76acdd67aeabe0614632299 (diff)
downloadmullvadvpn-4929a35cd5fcf4be236f453d58ea4cda28edddc0.tar.xz
mullvadvpn-4929a35cd5fcf4be236f453d58ea4cda28edddc0.zip
Add `TextView` for notification message
Diffstat (limited to 'android/src/main/res/layout')
-rw-r--r--android/src/main/res/layout/connect.xml41
1 files changed, 30 insertions, 11 deletions
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml
index 5b05e4c2f3..c876ed15e1 100644
--- a/android/src/main/res/layout/connect.xml
+++ b/android/src/main/res/layout/connect.xml
@@ -49,33 +49,52 @@
/>
</LinearLayout>
- <LinearLayout android:id="@+id/notification_banner"
+ <RelativeLayout android:id="@+id/notification_banner"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingVertical="8dp"
+ android:paddingLeft="20dp"
+ android:paddingRight="10dp"
android:background="@color/darkBlue"
- android:orientation="horizontal"
- android:gravity="center"
android:visibility="invisible"
>
- <ImageView
+ <RelativeLayout android:id="@+id/notification_status_container"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="0"
- android:layout_marginLeft="19dp"
- android:src="@drawable/icon_notification_error"
- />
+ android:layout_alignParentTop="true"
+ android:layout_alignParentLeft="true"
+ android:layout_alignBottom="@id/notification_title"
+ >
+ <ImageView android:id="@+id/notification_status"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:src="@drawable/icon_notification_error"
+ />
+ </RelativeLayout>
<TextView android:id="@+id/notification_title"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_weight="1"
+ android:layout_alignParentTop="true"
+ android:layout_toRightOf="@id/notification_status_container"
android:layout_marginLeft="7dp"
android:textSize="13sp"
android:textStyle="bold"
android:text="@string/blocking_internet"
android:textAllCaps="true"
/>
- </LinearLayout>
+ <TextView android:id="@+id/notification_message"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_alignLeft="@id/notification_title"
+ android:layout_below="@id/notification_title"
+ android:textSize="13sp"
+ android:textColor="@color/white60"
+ android:text=""
+ android:visibility="gone"
+ />
+ </RelativeLayout>
<Space
android:layout_width="match_parent"