From 0d63615d0da5c8208f7d4fa5ba5a2e264d1c13eb Mon Sep 17 00:00:00 2001
From: NeoTheFox <soniczerops@gmail.com>
Date: Thu, 12 Jul 2018 10:17:54 +0300
Subject: [PATCH] Notification Channel support for Oreo (KEY2) Added Icon
 builder foundation

---
 .../space/neothefox/laytray/IconService.java  | 35 ++++++++++--
 .../main/res/layout/fragment_icon_builder.xml | 57 +++++++++++++++++++
 app/src/main/res/values/strings.xml           |  4 +-
 app/src/main/res/xml/pref_notification.xml    |  4 ++
 4 files changed, 93 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/layout/fragment_icon_builder.xml

diff --git a/app/src/main/java/space/neothefox/laytray/IconService.java b/app/src/main/java/space/neothefox/laytray/IconService.java
index c9ad14b..ae6b8c9 100644
--- a/app/src/main/java/space/neothefox/laytray/IconService.java
+++ b/app/src/main/java/space/neothefox/laytray/IconService.java
@@ -3,6 +3,7 @@ package space.neothefox.laytray;
 import android.accessibilityservice.AccessibilityService;
 import android.accessibilityservice.AccessibilityServiceInfo;
 import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.content.Context;
 import android.content.SharedPreferences;
@@ -14,6 +15,7 @@ import android.graphics.PorterDuff;
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
 import android.graphics.drawable.Icon;
+import android.os.Build;
 import android.preference.PreferenceManager;
 import android.util.Log;
 import android.view.accessibility.AccessibilityEvent;
@@ -32,6 +34,7 @@ implements SharedPreferences.OnSharedPreferenceChangeListener{
     String lastToast;
 
     NotificationManager iconManager;
+    NotificationChannel iconChannel;
 
     @Override
     protected void onServiceConnected() {
@@ -48,6 +51,14 @@ implements SharedPreferences.OnSharedPreferenceChangeListener{
         //options.registerOnSharedPreferenceChangeListener(this);
 
         iconManager = (NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            iconChannel = new NotificationChannel(
+                    "laytray",
+                    "LayTray",
+                    Integer.parseInt(options.getString("notificationImportance", "0")));
+            iconChannel.setShowBadge(false);
+            iconChannel.setLockscreenVisibility(Notification.VISIBILITY_SECRET);
+        }
     }
 
     protected void updateNotification(String toast)
@@ -67,12 +78,24 @@ implements SharedPreferences.OnSharedPreferenceChangeListener{
                                                             Integer.parseInt(options.getString("textMode", "0")),
                                                             Color.WHITE));
 
-        indicator = new Notification.Builder(this)
-                .setSmallIcon(smallIcon)
-                .setContentTitle(toast)
-                .setOngoing(true)
-                .setPriority(Integer.parseInt(options.getString("notificationImportance", "0")))
-                .build();
+        if(Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
+        {
+            iconChannel.setImportance(
+                    Integer.parseInt(options.getString("notificationImportance", "0")));
+            indicator = new Notification.Builder(this, "laytray")
+                    .setSmallIcon(smallIcon)
+                    .setContentTitle(toast)
+                    .setOngoing(true)
+                    .build();
+        }
+        else {
+            indicator = new Notification.Builder(this)
+                    .setSmallIcon(smallIcon)
+                    .setContentTitle(toast)
+                    .setOngoing(true)
+                    .setPriority(Integer.parseInt(options.getString("notificationImportance", "0")))
+                    .build();
+        }
         iconManager.notify(0, indicator);
         return;
     }
diff --git a/app/src/main/res/layout/fragment_icon_builder.xml b/app/src/main/res/layout/fragment_icon_builder.xml
new file mode 100644
index 0000000..f90543f
--- /dev/null
+++ b/app/src/main/res/layout/fragment_icon_builder.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="2"
+        android:gravity="center"
+        android:orientation="horizontal">
+
+        <space.neothefox.laytray.IconBuilderPreview
+            android:id="@+id/textureView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1" />
+
+        <space.neothefox.laytray.VerticalSeekBar
+            android:id="@+id/verSeekBar"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_weight="1" />
+
+    </LinearLayout>
+
+    <SeekBar
+        android:id="@+id/horSeekBar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="2" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1"
+        android:gravity="fill_horizontal"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/saveButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Save" />
+
+        <Button
+            android:id="@+id/closeButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="Close" />
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9d99f80..54c6113 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -32,14 +32,16 @@
         <item>Plain Text</item>
         <item>Text in circle</item>
         <item>Text in a square</item>
+        <item>Text in a square outline</item>
     </string-array>
     <string-array name="pref_notification_mode_list_values">
         <item>0</item>
         <item>1</item>
         <item>2</item>
+        <item>3</item>
     </string-array>
 
-
+    <string name="pref_title_icon_builder">Icon builder</string>
 
     <!-- Example settings for Notifications -->
     <string name="pref_header_notifications">Notifications</string>
diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml
index 7d676ae..79286cd 100644
--- a/app/src/main/res/xml/pref_notification.xml
+++ b/app/src/main/res/xml/pref_notification.xml
@@ -31,4 +31,8 @@
         android:inputType="number"
         android:title="@string/pref_title_text_size" />
 
+    <Preference
+        android:key="iconBuilderPreference"
+        android:title="@string/pref_title_icon_builder" />
+
 </PreferenceScreen>