From 36829428f6a8bdaf9973187b82880e79915efa8c Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Sat, 14 Oct 2017 19:36:09 +0200
Subject: [PATCH 1/9] added notification with nougat style and optimized
 layouts with relativelayout

---
 .../GoIVNotificationManager.java              | 102 ++++++++++++-----
 .../layout/notification_pokefly_paused.xml    |  76 +++++++------
 .../notification_pokefly_paused_expanded.xml  | 102 ++++++++---------
 .../layout/notification_pokefly_started.xml   |  77 +++++++------
 .../notification_pokefly_started_expanded.xml | 103 ++++++++----------
 app/src/main/res/values-v24/dimens.xml        |   3 +-
 app/src/main/res/values/dimens.xml            |   1 +
 7 files changed, 251 insertions(+), 213 deletions(-)

diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
index 0c32be786..ec242baa8 100644
--- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
+++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
@@ -6,6 +6,7 @@
 import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.support.v7.app.NotificationCompat;
@@ -73,22 +74,44 @@ public void showPausedNotification() {
         contentBigView.setOnClickPendingIntent(R.id.start, startServicePendingIntent);
 
         // Build notification
-        Notification notification = new NotificationCompat.Builder(pokefly)
-                .setSmallIcon(R.drawable.notification_icon)
-                .setContentTitle(pokefly.getString(R.string.notification_title_goiv_stopped))
-                .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
-                .setColor(pokefly.getColorC(R.color.colorAccent))
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setPriority(NotificationCompat.PRIORITY_MAX)
-                .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                .setContent(contentView)
-                .setCustomBigContentView(contentBigView)
-                .setOngoing(false)
-                .build();
-
-        NotificationManager notificationManager =
-                (NotificationManager) pokefly.getSystemService(Context.NOTIFICATION_SERVICE);
-        notificationManager.notify(NOTIFICATION_REQ_CODE, notification);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            // N style notification
+            Notification.Builder builder = new Notification.Builder(pokefly)
+                    .setCustomContentView(contentView)
+                    .setStyle(new Notification.DecoratedCustomViewStyle())
+                    .setCustomBigContentView(contentBigView)
+                    .setGroupSummary(false)
+                    .setSmallIcon(R.drawable.notification_icon)
+                    .setContentTitle(pokefly.getString(R.string.notification_title_goiv_stopped))
+                    .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
+                    .setColor(pokefly.getColorC(R.color.colorAccent))
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setPriority(Notification.PRIORITY_MAX)
+                    .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                    .setOngoing(false);
+
+            NotificationManager notificationManager =
+                    (NotificationManager) pokefly.getSystemService(Context.NOTIFICATION_SERVICE);
+            notificationManager.notify(NOTIFICATION_REQ_CODE, builder.build());
+        } else {
+            // classic style notification
+            Notification notification = new NotificationCompat.Builder(pokefly)
+                    .setSmallIcon(R.drawable.notification_icon)
+                    .setContentTitle(pokefly.getString(R.string.notification_title_goiv_stopped))
+                    .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
+                    .setColor(pokefly.getColorC(R.color.colorAccent))
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setPriority(NotificationCompat.PRIORITY_MAX)
+                    .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                    .setContent(contentView)
+                    .setCustomBigContentView(contentBigView)
+                    .setOngoing(false)
+                    .build();
+
+            NotificationManager notificationManager =
+                    (NotificationManager) pokefly.getSystemService(Context.NOTIFICATION_SERVICE);
+            notificationManager.notify(NOTIFICATION_REQ_CODE, notification);
+        }
     }
 
     /**
@@ -129,20 +152,39 @@ public void showRunningNotification() {
         contentBigView.setOnClickPendingIntent(R.id.pause, stopServicePendingIntent);
 
         // Build notification
-        Notification notification = new NotificationCompat.Builder(pokefly)
-                .setSmallIcon(R.drawable.notification_icon_play)
-                .setContentTitle(pokefly.getString(R.string.notification_title, pokefly.getTrainerLevel()))
-                .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
-                .setColor(pokefly.getColorC(R.color.colorPrimary))
-                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                .setPriority(NotificationCompat.PRIORITY_MAX)
-                .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                .setContent(contentView)
-                .setCustomBigContentView(contentBigView)
-                .setOngoing(true)
-                .build();
-
-        pokefly.startForeground(NOTIFICATION_REQ_CODE, notification);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            // N style notification
+            Notification.Builder builder = new Notification.Builder(pokefly)
+                    .setCustomContentView(contentView)
+                    .setStyle(new Notification.DecoratedCustomViewStyle())
+                    .setCustomBigContentView(contentBigView)
+                    .setSmallIcon(R.drawable.notification_icon_play)
+                    .setContentTitle(pokefly.getString(R.string.notification_title, pokefly.getTrainerLevel()))
+                    .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
+                    .setColor(pokefly.getColorC(R.color.colorPrimary))
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setPriority(Notification.PRIORITY_MAX)
+                    .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                    .setOngoing(false);
+
+            pokefly.startForeground(NOTIFICATION_REQ_CODE, builder.build());
+        } else {
+            // classic style notification
+            Notification notification = new NotificationCompat.Builder(pokefly)
+                    .setSmallIcon(R.drawable.notification_icon_play)
+                    .setContentTitle(pokefly.getString(R.string.notification_title, pokefly.getTrainerLevel()))
+                    .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
+                    .setColor(pokefly.getColorC(R.color.colorPrimary))
+                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                    .setPriority(NotificationCompat.PRIORITY_MAX)
+                    .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                    .setContent(contentView)
+                    .setCustomBigContentView(contentBigView)
+                    .setOngoing(false)
+                    .build();
+
+            pokefly.startForeground(NOTIFICATION_REQ_CODE, notification);
+        }
     }
 
     /**
diff --git a/app/src/main/res/layout/notification_pokefly_paused.xml b/app/src/main/res/layout/notification_pokefly_paused.xml
index 4d5d93244..637e95fad 100644
--- a/app/src/main/res/layout/notification_pokefly_paused.xml
+++ b/app/src/main/res/layout/notification_pokefly_paused.xml
@@ -1,60 +1,66 @@
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="64dp"
     android:paddingLeft="@dimen/notification_horizontal_padding"
-    android:paddingTop="8dp"
     android:paddingRight="@dimen/notification_horizontal_padding"
-    android:paddingBottom="8dp">
+    android:paddingTop="@dimen/notification_vertical_padding"
+    android:paddingBottom="@dimen/notification_vertical_padding">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginEnd="8dp"
-        android:layout_gravity="center_vertical"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
         android:src="@mipmap/ic_launcher" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="0dp"
+    <TextView
+        style="@style/NotificationTitle"
+        android:id="@+id/notification_title"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center_vertical">
+        android:layout_toEndOf="@id/icon"
+        android:layout_toStartOf="@+id/settings"
+        android:text="@string/notification_title_goiv_stopped" />
 
-        <TextView
-            style="@style/NotificationTitle"
-            android:id="@+id/notification_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/notification_title_goiv_stopped" />
-
-        <TextView
-            style="@style/NotificationMessage"
-            android:id="@+id/notification_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/notification_title_tap_to_open" />
-
-    </LinearLayout>
+    <TextView
+        style="@style/NotificationMessage"
+        android:id="@+id/notification_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/icon"
+        android:layout_below="@id/notification_title"
+        android:text="@string/notification_title_tap_to_open" />
 
     <ImageButton
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
         android:id="@+id/settings"
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="4dp"
-        android:src="@drawable/ic_settings_24px"
-        android:contentDescription="@string/settings_page_title" />
+        android:layout_marginEnd="8dp"
+        android:layout_alignParentTop="true"
+        android:layout_toStartOf="@+id/start"
+        android:contentDescription="@string/settings_page_title"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:layout_centerInParent="true"
+        android:src="@drawable/ic_settings_24px"/>
 
     <ImageButton
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
         android:id="@+id/start"
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="-12dp"
-        android:src="@drawable/ic_play_circle_outline_24px"
-        android:contentDescription="@string/main_start" />
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:contentDescription="@string/main_start"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:layout_centerInParent="true"
+        android:src="@drawable/ic_play_circle_outline_24px"/>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_pokefly_paused_expanded.xml b/app/src/main/res/layout/notification_pokefly_paused_expanded.xml
index 6d40cc782..4380d13c6 100644
--- a/app/src/main/res/layout/notification_pokefly_paused_expanded.xml
+++ b/app/src/main/res/layout/notification_pokefly_paused_expanded.xml
@@ -1,73 +1,65 @@
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"
     android:paddingLeft="@dimen/notification_horizontal_padding"
-    android:paddingTop="8dp"
     android:paddingRight="@dimen/notification_horizontal_padding"
-    android:paddingBottom="8dp">
+    android:paddingTop="@dimen/notification_vertical_padding"
+    android:paddingBottom="@dimen/notification_vertical_padding">
 
     <ImageView
+        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_gravity="center_vertical"
+        android:layout_alignParentStart="true"
+        android:scaleType="centerInside"
+        android:layout_centerInParent="true"
         android:src="@mipmap/ic_launcher" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            style="@style/NotificationTitle"
-            android:id="@+id/notification_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:text="@string/notification_title_goiv_stopped" />
-
-        <TextView
-            style="@style/NotificationMessage"
-            android:id="@+id/notification_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/notification_title_tap_to_open" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:gravity="end">
-
-            <Button
-                style="@style/Base.Widget.AppCompat.Button.Borderless"
-                android:id="@+id/settings"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="4dp"
-                android:text="@string/settings_page_title"
-                android:textColor="@color/colorPrimary"
-                android:drawableEnd="@drawable/ic_settings_24px"
-                android:drawablePadding="4dp" />
+    <TextView
+        style="@style/NotificationTitle"
+        android:id="@+id/notification_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/icon"
+        android:text="@string/notification_title_goiv_stopped" />
 
-            <Button
-                style="@style/Base.Widget.AppCompat.Button.Borderless"
-                android:id="@+id/start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="-12dp"
-                android:text="@string/main_start"
-                android:textColor="@color/colorPrimary"
-                android:drawableEnd="@drawable/ic_play_circle_outline_24px"
-                android:drawablePadding="4dp" />
+    <TextView
+        style="@style/NotificationMessage"
+        android:id="@+id/notification_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/icon"
+        android:layout_below="@id/notification_title"
+        android:text="@string/notification_title_tap_to_open" />
 
-        </LinearLayout>
+    <Button
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
+        android:id="@+id/settings"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toStartOf="@+id/start"
+        android:layout_below="@id/notification_description"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:text="@string/settings_page_title"
+        android:textColor="@color/colorPrimary"
+        android:drawableEnd="@drawable/ic_settings_24px" />
 
-    </LinearLayout>
+    <Button
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
+        android:id="@+id/start"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/notification_description"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:text="@string/main_start"
+        android:textColor="@color/colorPrimary"
+        android:drawableEnd="@drawable/ic_play_circle_outline_24px" />
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_pokefly_started.xml b/app/src/main/res/layout/notification_pokefly_started.xml
index ca62cb112..7d095c870 100644
--- a/app/src/main/res/layout/notification_pokefly_started.xml
+++ b/app/src/main/res/layout/notification_pokefly_started.xml
@@ -1,61 +1,66 @@
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="64dp"
     android:paddingLeft="@dimen/notification_horizontal_padding"
-    android:paddingTop="8dp"
     android:paddingRight="@dimen/notification_horizontal_padding"
-    android:paddingBottom="8dp">
+    android:paddingTop="@dimen/notification_vertical_padding"
+    android:paddingBottom="@dimen/notification_vertical_padding">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:id="@+id/icon"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
         android:layout_marginEnd="8dp"
-        android:layout_gravity="center_vertical"
+        android:layout_alignParentTop="true"
+        android:layout_alignParentStart="true"
         android:src="@mipmap/ic_launcher" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="0dp"
+    <TextView
+        style="@style/NotificationTitle"
+        android:id="@+id/notification_title"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:layout_gravity="center_vertical">
+        android:layout_toEndOf="@id/icon"
+        android:layout_toStartOf="@+id/recalibrate"
+        android:text="@string/notification_title_short" />
 
-        <TextView
-            style="@style/NotificationTitle"
-            android:id="@+id/notification_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="@string/notification_title_short" />
-
-        <TextView
-            style="@style/NotificationMessage"
-            android:id="@+id/notification_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/notification_title_tap_to_open" />
-
-    </LinearLayout>
+    <TextView
+        style="@style/NotificationMessage"
+        android:id="@+id/notification_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/icon"
+        android:layout_below="@id/notification_title"
+        android:text="@string/notification_title_tap_to_open" />
 
     <ImageButton
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
         android:id="@+id/recalibrate"
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="4dp"
-        android:src="@drawable/ic_recalibrate_24px"
-        android:contentDescription="@string/recalibrate_goiv_notification"/>
+        android:layout_marginEnd="8dp"
+        android:layout_alignParentTop="true"
+        android:layout_toStartOf="@+id/pause"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:layout_centerInParent="true"
+        android:contentDescription="@string/recalibrate_goiv_notification"
+        android:src="@drawable/ic_recalibrate_24px"/>
 
     <ImageButton
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
         android:id="@+id/pause"
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
-        android:layout_marginEnd="-12dp"
-        android:src="@drawable/ic_pause_circle_outline_24px"
-        android:contentDescription="@string/pause_goiv_notification" />
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentTop="true"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:layout_centerInParent="true"
+        android:contentDescription="@string/pause_goiv_notification"
+        android:src="@drawable/ic_pause_circle_outline_24px"/>
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_pokefly_started_expanded.xml b/app/src/main/res/layout/notification_pokefly_started_expanded.xml
index 9b893ecff..96b0f214c 100644
--- a/app/src/main/res/layout/notification_pokefly_started_expanded.xml
+++ b/app/src/main/res/layout/notification_pokefly_started_expanded.xml
@@ -1,74 +1,65 @@
-<LinearLayout
+<RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_gravity="center_vertical"
     android:paddingLeft="@dimen/notification_horizontal_padding"
-    android:paddingTop="8dp"
     android:paddingRight="@dimen/notification_horizontal_padding"
-    android:paddingBottom="8dp">
+    android:paddingTop="@dimen/notification_vertical_padding"
+    android:paddingBottom="@dimen/notification_vertical_padding">
 
     <ImageView
+        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_gravity="center_vertical"
+        android:layout_alignParentStart="true"
+        android:scaleType="centerInside"
+        android:layout_centerInParent="true"
         android:src="@mipmap/ic_launcher" />
 
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <TextView
-            style="@style/NotificationTitle"
-            android:id="@+id/notification_title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            tools:text="@string/notification_title" />
-
-        <TextView
-            style="@style/NotificationMessage"
-            android:id="@+id/notification_description"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/notification_title_tap_to_open" />
-
-        <LinearLayout
-            android:orientation="horizontal"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:gravity="end">
-
-            <Button
-                style="@style/Base.Widget.AppCompat.Button.Borderless"
-                android:id="@+id/recalibrate"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="4dp"
-                android:text="@string/recalibrate_goiv_notification"
-                android:textColor="@color/colorPrimary"
-                android:drawableEnd="@drawable/ic_recalibrate_24px"
-                android:drawablePadding="4dp" />
+    <TextView
+        style="@style/NotificationTitle"
+        android:id="@+id/notification_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/icon"
+        android:text="@string/notification_title" />
 
-            <Button
-                style="@style/Base.Widget.AppCompat.Button.Borderless"
-                android:id="@+id/pause"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_marginEnd="-12dp"
-                android:text="@string/pause_goiv_notification"
-                android:textColor="@color/colorPrimary"
-                android:drawableEnd="@drawable/ic_pause_circle_outline_24px"
-                android:drawablePadding="4dp" />
+    <TextView
+        style="@style/NotificationMessage"
+        android:id="@+id/notification_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toEndOf="@id/icon"
+        android:layout_below="@id/notification_title"
+        android:text="@string/notification_title_tap_to_open" />
 
-        </LinearLayout>
+    <Button
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
+        android:id="@+id/recalibrate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_toStartOf="@+id/pause"
+        android:layout_below="@id/notification_description"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:text="@string/recalibrate_goiv_notification"
+        android:textColor="@color/colorPrimary"
+        android:drawableEnd="@drawable/ic_recalibrate_24px" />
 
-    </LinearLayout>
+    <Button
+        style="@style/Base.Widget.AppCompat.Button.Borderless"
+        android:id="@+id/pause"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_below="@id/notification_description"
+        android:adjustViewBounds="true"
+        android:scaleType="centerInside"
+        android:text="@string/pause_goiv_notification"
+        android:textColor="@color/colorPrimary"
+        android:drawableEnd="@drawable/ic_pause_circle_outline_24px" />
 
-</LinearLayout>
\ No newline at end of file
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v24/dimens.xml b/app/src/main/res/values-v24/dimens.xml
index 42cd2326e..9f92ceef8 100644
--- a/app/src/main/res/values-v24/dimens.xml
+++ b/app/src/main/res/values-v24/dimens.xml
@@ -1,4 +1,5 @@
 <resources>
     <!-- Notification margins -->
-    <dimen name="notification_horizontal_padding">16dp</dimen>
+    <dimen name="notification_horizontal_padding">0dp</dimen>
+    <dimen name="notification_vertical_padding">0dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index f7604e661..b526fe08c 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -7,4 +7,5 @@
 
     <!-- Notification margins -->
     <dimen name="notification_horizontal_padding">8dp</dimen>
+    <dimen name="notification_vertical_padding">8dp</dimen>
 </resources>

From 405002e5ddcc81c39012b72f6529dffa147d9b69 Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Sat, 14 Oct 2017 19:45:23 +0200
Subject: [PATCH 2/9] missed changes

---
 .../pogoiv/pokeflycomponents/GoIVNotificationManager.java   | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
index ec242baa8..8c34205ff 100644
--- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
+++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
@@ -33,11 +33,9 @@ public class GoIVNotificationManager {
 
     private static Pokefly pokefly;
 
-    public static final String ACTION_RECALIBRATE_SCANAREA = "com.kamron.pogoiv.ACTION_RECALIBRATE_SCANAREA";
+    private static final String ACTION_RECALIBRATE_SCANAREA = "com.kamron.pogoiv.ACTION_RECALIBRATE_SCANAREA";
 
-    public GoIVNotificationManager(Pokefly pokefly) {
-        this.pokefly = pokefly;
-    }
+    public GoIVNotificationManager(Pokefly pokefly) { GoIVNotificationManager.pokefly = pokefly; }
 
 
     /**

From 4b3b32ed8eaccaae790a6897e47e120e0eadb771 Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Sat, 14 Oct 2017 19:58:24 +0200
Subject: [PATCH 3/9] checkstyle fix

---
 .../pogoiv/pokeflycomponents/GoIVNotificationManager.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
index 8c34205ff..9bd315e27 100644
--- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
+++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
@@ -35,7 +35,9 @@ public class GoIVNotificationManager {
 
     private static final String ACTION_RECALIBRATE_SCANAREA = "com.kamron.pogoiv.ACTION_RECALIBRATE_SCANAREA";
 
-    public GoIVNotificationManager(Pokefly pokefly) { GoIVNotificationManager.pokefly = pokefly; }
+    public GoIVNotificationManager(Pokefly pokefly) {
+        GoIVNotificationManager.pokefly = pokefly;
+    }
 
 
     /**

From 5f2fc09f89a7bb187295d99238d76ba15efc1707 Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Tue, 17 Oct 2017 13:40:40 +0200
Subject: [PATCH 4/9] update notification

---
 .../GoIVNotificationManager.java              | 131 ++++++++----------
 .../layout/notification_pokefly_paused.xml    |   9 +-
 .../notification_pokefly_paused_expanded.xml  | 100 +++++++------
 .../layout/notification_pokefly_started.xml   |  20 +--
 .../notification_pokefly_started_expanded.xml | 101 ++++++++------
 app/src/main/res/values-v24/dimens.xml        |   3 +
 app/src/main/res/values/dimens.xml            |   5 +
 7 files changed, 193 insertions(+), 176 deletions(-)

diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
index 9bd315e27..e23a7b2e0 100644
--- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
+++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
@@ -1,7 +1,7 @@
 package com.kamron.pogoiv.pokeflycomponents;
 
 import android.app.IntentService;
-import android.app.Notification;
+import android.app.NotificationChannel;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -9,7 +9,7 @@
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
-import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.NotificationCompat;
 import android.widget.RemoteViews;
 import android.widget.Toast;
 
@@ -31,13 +31,13 @@ public class GoIVNotificationManager {
 
     private static final int NOTIFICATION_REQ_CODE = 8959;
 
+    private static final String NOTIFICATION_CHANNEL_ID = "8959";
+
     private static Pokefly pokefly;
 
     private static final String ACTION_RECALIBRATE_SCANAREA = "com.kamron.pogoiv.ACTION_RECALIBRATE_SCANAREA";
 
-    public GoIVNotificationManager(Pokefly pokefly) {
-        GoIVNotificationManager.pokefly = pokefly;
-    }
+    public GoIVNotificationManager(Pokefly pokefly) { GoIVNotificationManager.pokefly = pokefly; }
 
 
     /**
@@ -74,44 +74,30 @@ public void showPausedNotification() {
         contentBigView.setOnClickPendingIntent(R.id.start, startServicePendingIntent);
 
         // Build notification
+        NotificationCompat.Builder notification = new NotificationCompat.Builder(pokefly, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(R.drawable.notification_icon)
+                .setContentTitle(pokefly.getString(R.string.notification_title_goiv_stopped))
+                .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
+                .setColor(pokefly.getColorC(R.color.colorAccent))
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setPriority(NotificationCompat.PRIORITY_MAX)
+                .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                .setContent(contentView)
+                .setCustomBigContentView(contentBigView)
+                .setOngoing(false);
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            // N style notification
-            Notification.Builder builder = new Notification.Builder(pokefly)
+            notification
                     .setCustomContentView(contentView)
-                    .setStyle(new Notification.DecoratedCustomViewStyle())
-                    .setCustomBigContentView(contentBigView)
-                    .setGroupSummary(false)
-                    .setSmallIcon(R.drawable.notification_icon)
-                    .setContentTitle(pokefly.getString(R.string.notification_title_goiv_stopped))
-                    .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
-                    .setColor(pokefly.getColorC(R.color.colorAccent))
-                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    .setPriority(Notification.PRIORITY_MAX)
-                    .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                    .setOngoing(false);
-
-            NotificationManager notificationManager =
-                    (NotificationManager) pokefly.getSystemService(Context.NOTIFICATION_SERVICE);
-            notificationManager.notify(NOTIFICATION_REQ_CODE, builder.build());
-        } else {
-            // classic style notification
-            Notification notification = new NotificationCompat.Builder(pokefly)
-                    .setSmallIcon(R.drawable.notification_icon)
-                    .setContentTitle(pokefly.getString(R.string.notification_title_goiv_stopped))
-                    .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
-                    .setColor(pokefly.getColorC(R.color.colorAccent))
-                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    .setPriority(NotificationCompat.PRIORITY_MAX)
-                    .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                    .setContent(contentView)
-                    .setCustomBigContentView(contentBigView)
-                    .setOngoing(false)
-                    .build();
-
-            NotificationManager notificationManager =
-                    (NotificationManager) pokefly.getSystemService(Context.NOTIFICATION_SERVICE);
-            notificationManager.notify(NOTIFICATION_REQ_CODE, notification);
+                    .setStyle(new NotificationCompat.DecoratedCustomViewStyle());
         }
+
+        NotificationManager notificationManager =
+                (NotificationManager) pokefly.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        initNotificationChannel(notificationManager);
+
+        notificationManager.notify(NOTIFICATION_REQ_CODE, notification.build());
     }
 
     /**
@@ -152,38 +138,41 @@ public void showRunningNotification() {
         contentBigView.setOnClickPendingIntent(R.id.pause, stopServicePendingIntent);
 
         // Build notification
+        NotificationCompat.Builder notification = new NotificationCompat.Builder(pokefly, NOTIFICATION_CHANNEL_ID)
+                .setSmallIcon(R.drawable.notification_icon_play)
+                .setContentTitle(pokefly.getString(R.string.notification_title, pokefly.getTrainerLevel()))
+                .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
+                .setColor(pokefly.getColorC(R.color.colorPrimary))
+                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                .setPriority(NotificationCompat.PRIORITY_MAX)
+                .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                .setContent(contentView)
+                .setCustomBigContentView(contentBigView)
+                .setOngoing(true);
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-            // N style notification
-            Notification.Builder builder = new Notification.Builder(pokefly)
+            notification
                     .setCustomContentView(contentView)
-                    .setStyle(new Notification.DecoratedCustomViewStyle())
-                    .setCustomBigContentView(contentBigView)
-                    .setSmallIcon(R.drawable.notification_icon_play)
-                    .setContentTitle(pokefly.getString(R.string.notification_title, pokefly.getTrainerLevel()))
-                    .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
-                    .setColor(pokefly.getColorC(R.color.colorPrimary))
-                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    .setPriority(Notification.PRIORITY_MAX)
-                    .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                    .setOngoing(false);
-
-            pokefly.startForeground(NOTIFICATION_REQ_CODE, builder.build());
-        } else {
-            // classic style notification
-            Notification notification = new NotificationCompat.Builder(pokefly)
-                    .setSmallIcon(R.drawable.notification_icon_play)
-                    .setContentTitle(pokefly.getString(R.string.notification_title, pokefly.getTrainerLevel()))
-                    .setContentText(pokefly.getString(R.string.notification_title_tap_to_open))
-                    .setColor(pokefly.getColorC(R.color.colorPrimary))
-                    .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
-                    .setPriority(NotificationCompat.PRIORITY_MAX)
-                    .setCategory(NotificationCompat.CATEGORY_PROGRESS)
-                    .setContent(contentView)
-                    .setCustomBigContentView(contentBigView)
-                    .setOngoing(false)
-                    .build();
-
-            pokefly.startForeground(NOTIFICATION_REQ_CODE, notification);
+                    .setStyle(new NotificationCompat.DecoratedCustomViewStyle());
+        }
+
+        NotificationManager notificationManager =
+                (NotificationManager) pokefly.getSystemService(Context.NOTIFICATION_SERVICE);
+
+        initNotificationChannel(notificationManager);
+
+        pokefly.startForeground(NOTIFICATION_REQ_CODE, notification.build());
+    }
+
+    private void initNotificationChannel(NotificationManager notificationManager) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationManager.getNotificationChannel
+                (NOTIFICATION_CHANNEL_ID) == null) {
+
+            // Create notification channel
+            NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID,
+                    "GoIV", NotificationManager.IMPORTANCE_DEFAULT);
+
+            notificationManager.createNotificationChannel(channel);
         }
     }
 
@@ -238,4 +227,4 @@ public void run() {
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_pokefly_paused.xml b/app/src/main/res/layout/notification_pokefly_paused.xml
index 637e95fad..cec31e029 100644
--- a/app/src/main/res/layout/notification_pokefly_paused.xml
+++ b/app/src/main/res/layout/notification_pokefly_paused.xml
@@ -11,8 +11,8 @@
 
     <ImageView
         android:id="@+id/icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="@dimen/icon_size"
+        android:layout_height="@dimen/icon_size"
         android:layout_marginEnd="8dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
@@ -44,10 +44,10 @@
         android:layout_marginEnd="8dp"
         android:layout_alignParentTop="true"
         android:layout_toStartOf="@+id/start"
-        android:contentDescription="@string/settings_page_title"
         android:adjustViewBounds="true"
         android:scaleType="centerInside"
         android:layout_centerInParent="true"
+        android:contentDescription="@string/settings_page_title"
         android:src="@drawable/ic_settings_24px"/>
 
     <ImageButton
@@ -57,10 +57,11 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentTop="true"
-        android:contentDescription="@string/main_start"
         android:adjustViewBounds="true"
         android:scaleType="centerInside"
         android:layout_centerInParent="true"
+        android:layout_marginEnd="-12dp"
+        android:contentDescription="@string/main_start"
         android:src="@drawable/ic_play_circle_outline_24px"/>
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_pokefly_paused_expanded.xml b/app/src/main/res/layout/notification_pokefly_paused_expanded.xml
index 4380d13c6..ea8ae63f4 100644
--- a/app/src/main/res/layout/notification_pokefly_paused_expanded.xml
+++ b/app/src/main/res/layout/notification_pokefly_paused_expanded.xml
@@ -1,65 +1,73 @@
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="horizontal"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
     android:paddingLeft="@dimen/notification_horizontal_padding"
-    android:paddingRight="@dimen/notification_horizontal_padding"
     android:paddingTop="@dimen/notification_vertical_padding"
+    android:paddingRight="@dimen/notification_horizontal_padding"
     android:paddingBottom="@dimen/notification_vertical_padding">
 
     <ImageView
-        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_alignParentStart="true"
-        android:scaleType="centerInside"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center_vertical"
         android:src="@mipmap/ic_launcher" />
 
-    <TextView
-        style="@style/NotificationTitle"
-        android:id="@+id/notification_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/icon"
-        android:text="@string/notification_title_goiv_stopped" />
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <TextView
-        style="@style/NotificationMessage"
-        android:id="@+id/notification_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/icon"
-        android:layout_below="@id/notification_title"
-        android:text="@string/notification_title_tap_to_open" />
+        <TextView
+            style="@style/NotificationTitle"
+            android:id="@+id/notification_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:text="@string/notification_title_goiv_stopped" />
 
-    <Button
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
-        android:id="@+id/settings"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/start"
-        android:layout_below="@id/notification_description"
-        android:adjustViewBounds="true"
-        android:scaleType="centerInside"
-        android:text="@string/settings_page_title"
-        android:textColor="@color/colorPrimary"
-        android:drawableEnd="@drawable/ic_settings_24px" />
+        <TextView
+            style="@style/NotificationMessage"
+            android:id="@+id/notification_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/notification_title_tap_to_open" />
 
-    <Button
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
-        android:id="@+id/start"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@id/notification_description"
-        android:adjustViewBounds="true"
-        android:scaleType="centerInside"
-        android:text="@string/main_start"
-        android:textColor="@color/colorPrimary"
-        android:drawableEnd="@drawable/ic_play_circle_outline_24px" />
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="end">
+
+            <Button
+                style="@style/Base.Widget.AppCompat.Button.Borderless"
+                android:id="@+id/settings"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="4dp"
+                android:text="@string/settings_page_title"
+                android:textColor="@color/colorPrimary"
+                android:drawableEnd="@drawable/ic_settings_24px"
+                android:drawablePadding="4dp" />
+
+            <Button
+                style="@style/Base.Widget.AppCompat.Button.Borderless"
+                android:id="@+id/start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="-12dp"
+                android:text="@string/main_start"
+                android:textColor="@color/colorPrimary"
+                android:drawableEnd="@drawable/ic_play_circle_outline_24px"
+                android:drawablePadding="4dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_pokefly_started.xml b/app/src/main/res/layout/notification_pokefly_started.xml
index 7d095c870..149d0515e 100644
--- a/app/src/main/res/layout/notification_pokefly_started.xml
+++ b/app/src/main/res/layout/notification_pokefly_started.xml
@@ -1,5 +1,6 @@
 <RelativeLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:id="@+id/root"
     android:layout_width="match_parent"
@@ -11,8 +12,8 @@
 
     <ImageView
         android:id="@+id/icon"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
+        android:layout_width="@dimen/icon_size"
+        android:layout_height="@dimen/icon_size"
         android:layout_marginEnd="8dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentStart="true"
@@ -25,7 +26,7 @@
         android:layout_height="wrap_content"
         android:layout_toEndOf="@id/icon"
         android:layout_toStartOf="@+id/recalibrate"
-        android:text="@string/notification_title_short" />
+        tools:text="@string/notification_title_short" />
 
     <TextView
         style="@style/NotificationMessage"
@@ -37,8 +38,8 @@
         android:text="@string/notification_title_tap_to_open" />
 
     <ImageButton
-        android:id="@+id/recalibrate"
         style="@style/Base.Widget.AppCompat.Button.Borderless"
+        android:id="@+id/recalibrate"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
@@ -47,12 +48,12 @@
         android:adjustViewBounds="true"
         android:scaleType="centerInside"
         android:layout_centerInParent="true"
-        android:contentDescription="@string/recalibrate_goiv_notification"
-        android:src="@drawable/ic_recalibrate_24px"/>
+        android:src="@drawable/ic_recalibrate_24px"
+        android:contentDescription="@string/recalibrate_goiv_notification" />
 
     <ImageButton
-        android:id="@+id/pause"
         style="@style/Base.Widget.AppCompat.Button.Borderless"
+        android:id="@+id/pause"
         android:layout_width="48dp"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
@@ -60,7 +61,8 @@
         android:adjustViewBounds="true"
         android:scaleType="centerInside"
         android:layout_centerInParent="true"
-        android:contentDescription="@string/pause_goiv_notification"
-        android:src="@drawable/ic_pause_circle_outline_24px"/>
+        android:layout_marginEnd="-12dp"
+        android:src="@drawable/ic_pause_circle_outline_24px"
+        android:contentDescription="@string/pause_goiv_notification" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_pokefly_started_expanded.xml b/app/src/main/res/layout/notification_pokefly_started_expanded.xml
index 96b0f214c..41a9d3e05 100644
--- a/app/src/main/res/layout/notification_pokefly_started_expanded.xml
+++ b/app/src/main/res/layout/notification_pokefly_started_expanded.xml
@@ -1,65 +1,74 @@
-<RelativeLayout
+<LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
     android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_gravity="center_vertical"
     android:paddingLeft="@dimen/notification_horizontal_padding"
-    android:paddingRight="@dimen/notification_horizontal_padding"
     android:paddingTop="@dimen/notification_vertical_padding"
+    android:paddingRight="@dimen/notification_horizontal_padding"
     android:paddingBottom="@dimen/notification_vertical_padding">
 
     <ImageView
-        android:id="@+id/icon"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
-        android:layout_alignParentStart="true"
-        android:scaleType="centerInside"
-        android:layout_centerInParent="true"
+        android:layout_gravity="center_vertical"
         android:src="@mipmap/ic_launcher" />
 
-    <TextView
-        style="@style/NotificationTitle"
-        android:id="@+id/notification_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/icon"
-        android:text="@string/notification_title" />
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <TextView
-        style="@style/NotificationMessage"
-        android:id="@+id/notification_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toEndOf="@id/icon"
-        android:layout_below="@id/notification_title"
-        android:text="@string/notification_title_tap_to_open" />
+        <TextView
+            style="@style/NotificationTitle"
+            android:id="@+id/notification_title"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            tools:text="@string/notification_title" />
 
-    <Button
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
-        android:id="@+id/recalibrate"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_toStartOf="@+id/pause"
-        android:layout_below="@id/notification_description"
-        android:adjustViewBounds="true"
-        android:scaleType="centerInside"
-        android:text="@string/recalibrate_goiv_notification"
-        android:textColor="@color/colorPrimary"
-        android:drawableEnd="@drawable/ic_recalibrate_24px" />
+        <TextView
+            style="@style/NotificationMessage"
+            android:id="@+id/notification_description"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/notification_title_tap_to_open" />
 
-    <Button
-        style="@style/Base.Widget.AppCompat.Button.Borderless"
-        android:id="@+id/pause"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentEnd="true"
-        android:layout_below="@id/notification_description"
-        android:adjustViewBounds="true"
-        android:scaleType="centerInside"
-        android:text="@string/pause_goiv_notification"
-        android:textColor="@color/colorPrimary"
-        android:drawableEnd="@drawable/ic_pause_circle_outline_24px" />
+        <LinearLayout
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:gravity="end">
+
+            <Button
+                style="@style/Base.Widget.AppCompat.Button.Borderless"
+                android:id="@+id/recalibrate"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="4dp"
+                android:text="@string/recalibrate_goiv_notification"
+                android:textColor="@color/colorPrimary"
+                android:drawableEnd="@drawable/ic_recalibrate_24px"
+                android:drawablePadding="4dp" />
+
+            <Button
+                style="@style/Base.Widget.AppCompat.Button.Borderless"
+                android:id="@+id/pause"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="-12dp"
+                android:text="@string/pause_goiv_notification"
+                android:textColor="@color/colorPrimary"
+                android:drawableEnd="@drawable/ic_pause_circle_outline_24px"
+                android:drawablePadding="4dp" />
+
+        </LinearLayout>
+
+    </LinearLayout>
 
-</RelativeLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v24/dimens.xml b/app/src/main/res/values-v24/dimens.xml
index 9f92ceef8..1a08f4cda 100644
--- a/app/src/main/res/values-v24/dimens.xml
+++ b/app/src/main/res/values-v24/dimens.xml
@@ -2,4 +2,7 @@
     <!-- Notification margins -->
     <dimen name="notification_horizontal_padding">0dp</dimen>
     <dimen name="notification_vertical_padding">0dp</dimen>
+    <!-- Notification size -->
+    <dimen name="notification_height_compact">40dp</dimen>
+    <dimen name="icon_size">40dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index b526fe08c..50c98d831 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,4 +8,9 @@
     <!-- Notification margins -->
     <dimen name="notification_horizontal_padding">8dp</dimen>
     <dimen name="notification_vertical_padding">8dp</dimen>
+    <!-- Notification size -->
+    <dimen name="notification_height_compact">64dp</dimen>
+    <dimen name="icon_size">@dimen/wrap_content</dimen>
+    <!-- wrap_content -->
+    <item name="wrap_content" format="integer" type="dimen">-2</item>
 </resources>

From a77ab4a97d9319cbeef54e45c937d3688f078c14 Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Tue, 17 Oct 2017 14:20:10 +0200
Subject: [PATCH 5/9] rebase & fix checktyle

---
 .../pogoiv/pokeflycomponents/GoIVNotificationManager.java    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
index e23a7b2e0..fa72f48a7 100644
--- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
+++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
@@ -37,7 +37,9 @@ public class GoIVNotificationManager {
 
     private static final String ACTION_RECALIBRATE_SCANAREA = "com.kamron.pogoiv.ACTION_RECALIBRATE_SCANAREA";
 
-    public GoIVNotificationManager(Pokefly pokefly) { GoIVNotificationManager.pokefly = pokefly; }
+    public GoIVNotificationManager(Pokefly pokefly) {
+        GoIVNotificationManager.pokefly = pokefly;
+    }
 
 
     /**
@@ -167,7 +169,6 @@ public void showRunningNotification() {
     private void initNotificationChannel(NotificationManager notificationManager) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationManager.getNotificationChannel
                 (NOTIFICATION_CHANNEL_ID) == null) {
-
             // Create notification channel
             NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID,
                     "GoIV", NotificationManager.IMPORTANCE_DEFAULT);

From 53469f27f7ebae2199fe5e7d5192de597c7ee968 Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Tue, 17 Oct 2017 14:29:29 +0200
Subject: [PATCH 6/9] fix checktyle again

---
 .../pogoiv/pokeflycomponents/GoIVNotificationManager.java     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
index fa72f48a7..e8d6f6eaf 100644
--- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
+++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
@@ -167,8 +167,8 @@ public void showRunningNotification() {
     }
 
     private void initNotificationChannel(NotificationManager notificationManager) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationManager.getNotificationChannel
-                (NOTIFICATION_CHANNEL_ID) == null) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O && notificationManager
+                .getNotificationChannel(NOTIFICATION_CHANNEL_ID) == null) {
             // Create notification channel
             NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID,
                     "GoIV", NotificationManager.IMPORTANCE_DEFAULT);

From 35e2155b48e9b093d9268e94f32efdc35d79c054 Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Tue, 17 Oct 2017 15:24:52 +0200
Subject: [PATCH 7/9] fix kitkat bug and fixed oreo notification without sound
 and others channel options

---
 .../pokeflycomponents/GoIVNotificationManager.java       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
index e8d6f6eaf..2748881e9 100644
--- a/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
+++ b/app/src/main/java/com/kamron/pogoiv/pokeflycomponents/GoIVNotificationManager.java
@@ -84,6 +84,7 @@ public void showPausedNotification() {
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setPriority(NotificationCompat.PRIORITY_MAX)
                 .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                .setWhen(0)
                 .setContent(contentView)
                 .setCustomBigContentView(contentBigView)
                 .setOngoing(false);
@@ -148,9 +149,10 @@ public void showRunningNotification() {
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setPriority(NotificationCompat.PRIORITY_MAX)
                 .setCategory(NotificationCompat.CATEGORY_PROGRESS)
+                .setWhen(0)
                 .setContent(contentView)
                 .setCustomBigContentView(contentBigView)
-                .setOngoing(true);
+                .setOngoing(false);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             notification
@@ -171,7 +173,10 @@ private void initNotificationChannel(NotificationManager notificationManager) {
                 .getNotificationChannel(NOTIFICATION_CHANNEL_ID) == null) {
             // Create notification channel
             NotificationChannel channel = new NotificationChannel(NOTIFICATION_CHANNEL_ID,
-                    "GoIV", NotificationManager.IMPORTANCE_DEFAULT);
+                    "GoIV", NotificationManager.IMPORTANCE_LOW);
+
+            channel.setShowBadge(false);
+            channel.enableLights(false);
 
             notificationManager.createNotificationChannel(channel);
         }

From bcd15fc4a3cf97b303b4ba448142f8d21916d40d Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Tue, 17 Oct 2017 15:37:12 +0200
Subject: [PATCH 8/9] removed unused lines in dimens.xml and v24/dimens

---
 app/src/main/res/values-v24/dimens.xml | 1 -
 app/src/main/res/values/dimens.xml     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/app/src/main/res/values-v24/dimens.xml b/app/src/main/res/values-v24/dimens.xml
index 1a08f4cda..59aa44ea5 100644
--- a/app/src/main/res/values-v24/dimens.xml
+++ b/app/src/main/res/values-v24/dimens.xml
@@ -3,6 +3,5 @@
     <dimen name="notification_horizontal_padding">0dp</dimen>
     <dimen name="notification_vertical_padding">0dp</dimen>
     <!-- Notification size -->
-    <dimen name="notification_height_compact">40dp</dimen>
     <dimen name="icon_size">40dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 50c98d831..4f12695fc 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,7 +9,6 @@
     <dimen name="notification_horizontal_padding">8dp</dimen>
     <dimen name="notification_vertical_padding">8dp</dimen>
     <!-- Notification size -->
-    <dimen name="notification_height_compact">64dp</dimen>
     <dimen name="icon_size">@dimen/wrap_content</dimen>
     <!-- wrap_content -->
     <item name="wrap_content" format="integer" type="dimen">-2</item>

From a4a340097df92c904fefbd835a6fa0cc130b47aa Mon Sep 17 00:00:00 2001
From: MARTINI1 <martini25onepiece@gmail.com>
Date: Tue, 17 Oct 2017 23:11:41 +0200
Subject: [PATCH 9/9] clarify the description in dimens/icon_size

---
 app/src/main/res/values-v24/dimens.xml | 2 +-
 app/src/main/res/values/dimens.xml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/values-v24/dimens.xml b/app/src/main/res/values-v24/dimens.xml
index 59aa44ea5..0e23a9541 100644
--- a/app/src/main/res/values-v24/dimens.xml
+++ b/app/src/main/res/values-v24/dimens.xml
@@ -2,6 +2,6 @@
     <!-- Notification margins -->
     <dimen name="notification_horizontal_padding">0dp</dimen>
     <dimen name="notification_vertical_padding">0dp</dimen>
-    <!-- Notification size -->
+    <!-- Notification icon size -->
     <dimen name="icon_size">40dp</dimen>
 </resources>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 4f12695fc..e77ba45c8 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -8,7 +8,7 @@
     <!-- Notification margins -->
     <dimen name="notification_horizontal_padding">8dp</dimen>
     <dimen name="notification_vertical_padding">8dp</dimen>
-    <!-- Notification size -->
+    <!-- Notification icon size -->
     <dimen name="icon_size">@dimen/wrap_content</dimen>
     <!-- wrap_content -->
     <item name="wrap_content" format="integer" type="dimen">-2</item>