From a6517a1f35972c72a810e17ed31616bd5d4893ea Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 16 Jan 2018 13:59:33 +0100
Subject: #8788 implement VpnNotificationManager to handle notifications from
 VoidVPN and OpenVPN

---
 .../main/res/layout/custom_notification_layout.xml | 48 ++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 app/src/main/res/layout/custom_notification_layout.xml

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/layout/custom_notification_layout.xml b/app/src/main/res/layout/custom_notification_layout.xml
new file mode 100644
index 00000000..e97fcbe2
--- /dev/null
+++ b/app/src/main/res/layout/custom_notification_layout.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    style="@android:style/TextAppearance.StatusBar.EventContent"
+    >
+
+    <ImageView
+        android:id="@+id/image_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:scaleType="center"
+        android:contentDescription="@string/app_name"
+        tools:src="@drawable/ic_stat_vpn"
+        tools:visibility="visible"
+        />
+
+
+    <LinearLayout
+        android:id="@+id/content_layout"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_alignParentBottom="false"
+        android:layout_toRightOf="@+id/image_icon"
+        android:gravity="center_vertical"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textStyle="bold"
+            tools:text="Bitmask - Amsterdam"
+            />
+
+        <TextView
+            android:id="@+id/message"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="2"
+            android:ellipsize="end"
+            tools:text="Connecting to Provider... with a long message that doesn't fit into the two lines of the notification."
+            />
+    </LinearLayout>
+</RelativeLayout>
\ No newline at end of file
-- 
cgit v1.2.3


From b1499d1efb027464d5364bc8758b3529a60efdc0 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Tue, 16 Jan 2018 14:00:08 +0100
Subject: 8788 fix image resolution for blocking icon in hdpi

---
 .../main/res/drawable-hdpi/ic_stat_vpn_blocking.png    | Bin 1427 -> 644 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

(limited to 'app/src/main/res')

diff --git a/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png b/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png
index 22ea5603..2745087b 100644
Binary files a/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png and b/app/src/main/res/drawable-hdpi/ic_stat_vpn_blocking.png differ
-- 
cgit v1.2.3