From 6092161df07a8865df288afc0c8a89676dcd98c5 Mon Sep 17 00:00:00 2001
From: Brandon Presley <brandon@presley.nz>
Date: Thu, 13 Apr 2023 15:09:36 +1200
Subject: [PATCH] Fix icons for notifications

---
 .../kotlin/com/example/fmassive/AlarmService.kt  |  6 +++---
 .../kotlin/com/example/fmassive/MainActivity.kt  | 16 ++++------------
 .../drawable/baseline_hourglass_bottom_24.xml    |  5 +++++
 3 files changed, 12 insertions(+), 15 deletions(-)
 create mode 100644 android/app/src/main/res/drawable/baseline_hourglass_bottom_24.xml

diff --git a/android/app/src/main/kotlin/com/example/fmassive/AlarmService.kt b/android/app/src/main/kotlin/com/example/fmassive/AlarmService.kt
index 0686bd8..a273777 100644
--- a/android/app/src/main/kotlin/com/example/fmassive/AlarmService.kt
+++ b/android/app/src/main/kotlin/com/example/fmassive/AlarmService.kt
@@ -33,10 +33,10 @@ class AlarmService : Service(), OnPreparedListener {
         val pendingStop =
             PendingIntent.getBroadcast(context, 0, stopBroadcast, PendingIntent.FLAG_IMMUTABLE)
         return NotificationCompat.Builder(context, MainActivity.CHANNEL_ID_PENDING)
-            .setSmallIcon(R.drawable.ic_baseline_hourglass_bottom_24).setContentTitle("Resting")
+            .setSmallIcon(R.drawable.baseline_hourglass_bottom_24).setContentTitle("Resting")
             .setContentIntent(pendingContent)
-            .addAction(R.drawable.ic_baseline_stop_24, "Stop", pendingStop)
-            .addAction(R.drawable.ic_baseline_stop_24, "Add 1 min", pendingAdd)
+            .addAction(R.drawable.launch_background, "Stop", pendingStop)
+            .addAction(R.drawable.launch_background, "Add 1 min", pendingAdd)
             .setDeleteIntent(pendingStop)
     }
 
diff --git a/android/app/src/main/kotlin/com/example/fmassive/MainActivity.kt b/android/app/src/main/kotlin/com/example/fmassive/MainActivity.kt
index 4f0e697..f87bced 100644
--- a/android/app/src/main/kotlin/com/example/fmassive/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/example/fmassive/MainActivity.kt
@@ -18,8 +18,8 @@ import io.flutter.embedding.engine.FlutterEngine
 import io.flutter.plugin.common.MethodChannel
 import kotlin.math.floor
 
+@RequiresApi(Build.VERSION_CODES.O)
 class MainActivity : FlutterActivity() {
-    @RequiresApi(Build.VERSION_CODES.O)
     override fun configureFlutterEngine(flutterEngine: FlutterEngine) {
         super.configureFlutterEngine(flutterEngine)
         MethodChannel(flutterEngine.dartExecutor.binaryMessenger, FLUTTER_CHANNEL).setMethodCallHandler {
@@ -38,7 +38,6 @@ class MainActivity : FlutterActivity() {
     private var running = false
 
     private val stopReceiver = object : BroadcastReceiver() {
-        @RequiresApi(Build.VERSION_CODES.O)
         override fun onReceive(context: Context?, intent: Intent?) {
             Log.d("MainActivity", "Received stop broadcast intent")
             stop()
@@ -46,7 +45,6 @@ class MainActivity : FlutterActivity() {
     }
 
     private val addReceiver = object : BroadcastReceiver() {
-        @RequiresApi(Build.VERSION_CODES.O)
         override fun onReceive(context: Context?, intent: Intent?) {
             add()
         }
@@ -55,7 +53,6 @@ class MainActivity : FlutterActivity() {
     init {
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
     fun add() {
         Log.d("MainActivity", "Add 1 min to alarm.")
         countdownTimer?.cancel()
@@ -69,7 +66,6 @@ class MainActivity : FlutterActivity() {
         context.stopService(intent)
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
     fun stop() {
         Log.d("MainActivity", "Stop alarm.")
         countdownTimer?.cancel()
@@ -81,7 +77,6 @@ class MainActivity : FlutterActivity() {
         manager.cancel(NOTIFICATION_ID_PENDING)
     }
 
-    @RequiresApi(api = Build.VERSION_CODES.O)
     fun timer(milliseconds: Int) {
         context.registerReceiver(stopReceiver, IntentFilter(STOP_BROADCAST))
         context.registerReceiver(addReceiver, IntentFilter(ADD_BROADCAST))
@@ -96,7 +91,6 @@ class MainActivity : FlutterActivity() {
         running = true
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     private fun getTimer(
         endMs: Int,
     ): CountDownTimer {
@@ -125,7 +119,6 @@ class MainActivity : FlutterActivity() {
     }
 
     @SuppressLint("UnspecifiedImmutableFlag")
-    @RequiresApi(Build.VERSION_CODES.M)
     private fun getBuilder(): NotificationCompat.Builder {
         val contentIntent = Intent(context, MainActivity::class.java)
         val pendingContent =
@@ -140,14 +133,13 @@ class MainActivity : FlutterActivity() {
         val pendingStop =
             PendingIntent.getBroadcast(context, 0, stopBroadcast, PendingIntent.FLAG_IMMUTABLE)
         return NotificationCompat.Builder(context, CHANNEL_ID_PENDING)
-            .setSmallIcon(R.drawable.ic_baseline_hourglass_bottom_24).setContentTitle("Resting")
+            .setSmallIcon(R.drawable.baseline_hourglass_bottom_24).setContentTitle("Resting")
             .setContentIntent(pendingContent)
-            .addAction(R.drawable.ic_baseline_stop_24, "Stop", pendingStop)
-            .addAction(R.drawable.ic_baseline_stop_24, "Add 1 min", pendingAdd)
+            .addAction(R.drawable.baseline_hourglass_bottom_24, "Stop", pendingStop)
+            .addAction(R.drawable.baseline_hourglass_bottom_24, "Add 1 min", pendingAdd)
             .setDeleteIntent(pendingStop)
     }
 
-    @RequiresApi(Build.VERSION_CODES.O)
     private fun getManager(): NotificationManager {
         val notificationManager = context.getSystemService(
             NotificationManager::class.java
diff --git a/android/app/src/main/res/drawable/baseline_hourglass_bottom_24.xml b/android/app/src/main/res/drawable/baseline_hourglass_bottom_24.xml
new file mode 100644
index 0000000..e2dc75e
--- /dev/null
+++ b/android/app/src/main/res/drawable/baseline_hourglass_bottom_24.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M18,22l-0.01,-6L14,12l3.99,-4.01L18,2H6v6l4,4l-4,3.99V22H18zM8,7.5V4h8v3.5l-4,4L8,7.5z"/>
+</vector>