From f50661507853227b13f2a1cb45112c7a675f660c Mon Sep 17 00:00:00 2001
From: Nathaniel Wesley Filardo <nwfilardo@gmail.com>
Date: Sat, 17 Nov 2018 01:04:44 +0000
Subject: [PATCH] Notification icon: hammer and sickle, vector

Try to placate newer Androids by changing the icon to match the
guidelines from
https://developer.android.com/guide/practices/ui_guidelines/icon_design_status_bar

Since the shield looked odd, anyway, move to a proper hammer and sickle,
as obtained from Wikimedia and incorporated under public domain.  See
https://commons.wikimedia.org/wiki/File:Hammer_and_sickle.svg .

See https://github.com/cmukgb/ctfws-timer-android/issues/6
---
 mobile/build.gradle                                   |  2 ++
 .../ctfwstimer/MainServiceNotification.java           |  2 +-
 mobile/src/main/res/drawable/ic_hammer_and_sickle.xml | 11 +++++++++++
 3 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 mobile/src/main/res/drawable/ic_hammer_and_sickle.xml

diff --git a/mobile/build.gradle b/mobile/build.gradle
index 602fbc1..1f8bf51 100644
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -9,6 +9,8 @@ android {
         versionCode 10
         versionName "1.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+        vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
diff --git a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainServiceNotification.java b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainServiceNotification.java
index 4b2fd38..073303f 100644
--- a/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainServiceNotification.java
+++ b/mobile/src/main/java/com/acmetensortoys/ctfwstimer/MainServiceNotification.java
@@ -51,7 +51,7 @@ class MainServiceNotification {
 
         userNoteBuilder = new NotificationCompat.Builder(ms, CTFWS_GAME_CHANNEL_ID)
                 .setOnlyAlertOnce(false)
-                .setSmallIcon(R.drawable.shield1)
+                .setSmallIcon(R.drawable.ic_hammer_and_sickle)
                 .setContentIntent(PendingIntent.getActivity(ms, 0, ni, 0));
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
diff --git a/mobile/src/main/res/drawable/ic_hammer_and_sickle.xml b/mobile/src/main/res/drawable/ic_hammer_and_sickle.xml
new file mode 100644
index 0000000..8aded91
--- /dev/null
+++ b/mobile/src/main/res/drawable/ic_hammer_and_sickle.xml
@@ -0,0 +1,11 @@
+<vector android:height="24dp" android:viewportHeight="550"
+    android:viewportWidth="550" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m175.543,98.363 l-16.971,16.971 -45.256,45.254 -56.571,56.57 62.228,62.225 56.571,-56.568 299.828,299.812a32.001,32 0,0 0,45.256 0,32.001 32,0 0,0 0,-45.254l-299.826,-299.814 16.972,-16.971 50.914,-50.91z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="17.78477097"/>
+    <path android:fillAlpha="1" android:fillColor="#ffffff"
+        android:pathData="m273.989,20c0,0 168.008,128 168.008,256C441.997,340 385.994,412 289.99,412c-64.003,0 -104.241,-47.764 -104.241,-47.764l-11.313,11.313a16.001,16 0,0 0,-22.628 0,16.001 16,0 0,0 -2.479,3.223 32.001,32 0,0 0,-31.464 8.092,32.001 32,0 0,0 -9.331,21.545C83.102,422.16 40.969,448.983 22.264,484l0.029,0.029A32.001,32 0,0 0,22.264 516,32.001 32,0 0,0 65.979,527.713c35.026,-18.708 61.855,-60.852 75.605,-86.281a32.001,32 0,0 0,21.536 -9.314,32.001 32,0 0,0 7.932,-13.201c24.516,23.054 71.445,57.084 134.938,57.084 96.005,0 200.009,-72 200.009,-200 0,-160 -232.011,-256 -232.011,-256z"
+        android:strokeAlpha="1" android:strokeColor="#00000000"
+        android:strokeLineCap="round" android:strokeLineJoin="round" android:strokeWidth="0.86488503"/>
+</vector>
-- 
2.50.1