diff options
| author | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-31 13:46:34 +0000 |
|---|---|---|
| committer | Janito Vaqueiro Ferreira Filho <janito@mullvad.net> | 2019-07-31 13:46:34 +0000 |
| commit | 5af0fead3760a839c6dce6936a90fa7678b7ed10 (patch) | |
| tree | 4eeb83b51ed6041df07b7bc95a83ee8e83201fd9 | |
| parent | 1c594f2cd2eb4a61064c9779817b3ed5ba163f9a (diff) | |
| download | mullvadvpn-5af0fead3760a839c6dce6936a90fa7678b7ed10.tar.xz mullvadvpn-5af0fead3760a839c6dce6936a90fa7678b7ed10.zip | |
Make notification banner clickable
| -rw-r--r-- | android/src/main/res/layout/connect.xml | 99 |
1 files changed, 53 insertions, 46 deletions
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml index 6a4b6f0dcc..4468e838e8 100644 --- a/android/src/main/res/layout/connect.xml +++ b/android/src/main/res/layout/connect.xml @@ -49,63 +49,70 @@ /> </LinearLayout> - <RelativeLayout android:id="@+id/notification_banner" + <FrameLayout 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:visibility="invisible" + android:clickable="false" > - <RelativeLayout android:id="@+id/notification_status_container" - android:layout_width="wrap_content" + <RelativeLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_alignBottom="@id/notification_title" + android:paddingVertical="8dp" + android:paddingLeft="20dp" + android:paddingRight="10dp" + android:background="?android:attr/selectableItemBackground" > - <ImageView android:id="@+id/notification_status" + <RelativeLayout android:id="@+id/notification_status_container" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + 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="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_toLeftOf="@id/notification_icon" + 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" + /> + <TextView android:id="@+id/notification_message" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:src="@drawable/icon_notification_error" + android:layout_alignWithParentIfMissing="true" + android:layout_toLeftOf="@id/notification_icon" + android:layout_alignLeft="@id/notification_title" + android:layout_below="@id/notification_title" + android:textSize="13sp" + android:textColor="@color/white60" + android:text="" + android:visibility="gone" + /> + <ImageView android:id="@+id/notification_icon" + android:layout_width="12dp" + android:layout_height="12dp" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:alpha="0.6" + android:src="@drawable/icon_extlink" + android:visibility="gone" /> </RelativeLayout> - <TextView android:id="@+id/notification_title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_toLeftOf="@id/notification_icon" - 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" - /> - <TextView android:id="@+id/notification_message" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignWithParentIfMissing="true" - android:layout_toLeftOf="@id/notification_icon" - android:layout_alignLeft="@id/notification_title" - android:layout_below="@id/notification_title" - android:textSize="13sp" - android:textColor="@color/white60" - android:text="" - android:visibility="gone" - /> - <ImageView android:id="@+id/notification_icon" - android:layout_width="12dp" - android:layout_height="12dp" - android:layout_alignParentRight="true" - android:layout_centerVertical="true" - android:alpha="0.6" - android:src="@drawable/icon_extlink" - android:visibility="gone" - /> - </RelativeLayout> + </FrameLayout> <Space android:layout_width="match_parent" |