FMApp2: Bring in the new icon
* Part of the new iconset made by Asher Simonds
Co-authored-by: Michael W <baddaemon87@gmail.com>
Change-Id: Ice98847a14b477d40b9b3e72e680354b271e367a
diff --git a/fmapp2/AndroidManifest.xml b/fmapp2/AndroidManifest.xml
index d397d3d..3b9f06e 100644
--- a/fmapp2/AndroidManifest.xml
+++ b/fmapp2/AndroidManifest.xml
@@ -57,7 +57,7 @@
<application
android:requestLegacyExternalStorage="true"
- android:icon="@drawable/ic_launcher_fmradio"
+ android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:allowTaskReparenting="true"
android:taskAffinity="com.caf.task.fmradio"
@@ -67,7 +67,7 @@
<uses-library android:name="qcom.fmradio"
android:required="true" />
- <activity android:icon="@drawable/ic_launcher_fmradio"
+ <activity android:icon="@mipmap/ic_launcher"
android:name=".FMRadio"
android:label="@string/app_name"
android:clearTaskOnLaunch="true"
diff --git a/fmapp2/res/drawable-hdpi/ic_launcher_fmradio.png b/fmapp2/res/drawable-hdpi/ic_launcher_fmradio.png
deleted file mode 100644
index 4815bce..0000000
--- a/fmapp2/res/drawable-hdpi/ic_launcher_fmradio.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable-mdpi/ic_launcher_fmradio.png b/fmapp2/res/drawable-mdpi/ic_launcher_fmradio.png
deleted file mode 100644
index 3361ad5..0000000
--- a/fmapp2/res/drawable-mdpi/ic_launcher_fmradio.png
+++ /dev/null
Binary files differ
diff --git a/fmapp2/res/drawable/ic_launcher_background.xml b/fmapp2/res/drawable/ic_launcher_background.xml
new file mode 100644
index 0000000..af51f6f
--- /dev/null
+++ b/fmapp2/res/drawable/ic_launcher_background.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2022 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <path
+ android:pathData="M0,0h108v108h-108z"
+ android:fillColor="#521E35"/>
+ <path
+ android:pathData="M70,36C70,34.895 70.895,34 72,34C73.105,34 74,34.895 74,36V38C76.209,38 78,39.791 78,42V66C78,68.209 76.209,70 74,70H34C31.791,70 30,68.209 30,66V42C30,39.791 31.791,38 34,38H70V36ZM46,66C52.627,66 58,60.627 58,54C58,47.373 52.627,42 46,42C39.373,42 34,47.373 34,54C34,60.627 39.373,66 46,66Z"
+ android:fillColor="#ffffff"
+ android:fillType="evenOdd"/>
+ <path
+ android:pathData="M70.068,62.883C70.356,62.621 70.631,62.346 70.893,62.057C71.111,61.816 71.321,61.565 71.52,61.305C73.128,59.209 74,56.642 74,54C74,51.359 73.128,48.791 71.52,46.695C70.32,45.131 68.76,43.895 66.986,43.085C65.981,42.626 64.874,43.274 64.588,44.341L63.294,49.171C63.151,49.704 63.477,50.243 63.959,50.513C64.428,50.777 64.841,51.133 65.173,51.565C65.709,52.264 65.999,53.12 65.999,54C65.999,54.881 65.709,55.736 65.173,56.435C64.841,56.867 64.428,57.223 63.959,57.487C63.477,57.757 63.151,58.296 63.294,58.829L64.588,63.659C64.874,64.726 65.981,65.374 66.986,64.915C68.112,64.401 69.152,63.715 70.068,62.883Z"
+ android:fillColor="#521E35"/>
+ <path
+ android:pathData="M72.392,60C73.45,58.168 74,56.097 74,54C74,53.97 74,53.939 74,53.909C73.996,53.417 73.962,52.925 73.897,52.434C73.621,50.336 72.797,48.359 71.52,46.695C71.502,46.671 71.483,46.646 71.464,46.622C71.162,46.235 70.836,45.865 70.485,45.515C69.466,44.496 68.279,43.676 66.986,43.085C65.981,42.626 64.874,43.274 64.588,44.341L63.294,49.171C63.151,49.704 63.477,50.243 63.959,50.513C64.427,50.777 64.841,51.133 65.173,51.565C65.709,52.264 65.999,53.12 65.999,54C65.999,54.705 65.813,55.394 65.464,56L72.392,60Z"
+ android:fillColor="#F73487"/>
+ <path
+ android:pathData="M46,64C51.523,64 56,59.523 56,54C56,48.477 51.523,44 46,44C40.477,44 36,48.477 36,54C36,59.523 40.477,64 46,64ZM46,58C48.209,58 50,56.209 50,54C50,51.791 48.209,50 46,50C43.791,50 42,51.791 42,54C42,56.209 43.791,58 46,58Z"
+ android:fillColor="#ffffff"
+ android:fillType="evenOdd"/>
+</vector>
diff --git a/fmapp2/res/drawable/ic_launcher_foreground.xml b/fmapp2/res/drawable/ic_launcher_foreground.xml
new file mode 100644
index 0000000..5469ada
--- /dev/null
+++ b/fmapp2/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2022 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:aapt="http://schemas.android.com/aapt"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <group>
+ <clip-path
+ android:pathData="M0,0h108v108h-108z"/>
+ <path
+ android:pathData="M46,54m-12,0a12,12 0,1 1,24 0a12,12 0,1 1,-24 0"
+ android:fillColor="#F73487"/>
+ <path
+ android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
+ android:fillAlpha="0.6">
+ <aapt:attr name="android:fillColor">
+ <gradient
+ android:gradientRadius="72"
+ android:centerX="28.54"
+ android:centerY="28.54"
+ android:type="radial">
+ <item android:offset="0" android:color="#19FFFFFF"/>
+ <item android:offset="1" android:color="#00FFFFFF"/>
+ </gradient>
+ </aapt:attr>
+ </path>
+ </group>
+</vector>
diff --git a/fmapp2/res/drawable/ic_launcher_monochrome.xml b/fmapp2/res/drawable/ic_launcher_monochrome.xml
new file mode 100644
index 0000000..8ea6a45
--- /dev/null
+++ b/fmapp2/res/drawable/ic_launcher_monochrome.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2022 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="108dp"
+ android:height="108dp"
+ android:viewportWidth="108"
+ android:viewportHeight="108">
+ <path
+ android:pathData="M72,34C70.895,34 70,34.895 70,36V38H34C31.791,38 30,39.791 30,42V66C30,68.209 31.791,70 34,70H74C76.209,70 78,68.209 78,66V42C78,39.791 76.209,38 74,38V36C74,34.895 73.105,34 72,34ZM64.809,64.625C65.095,65.692 66.201,66.339 67.211,65.893C69.197,65.017 70.941,63.653 72.275,61.914C74.018,59.644 74.962,56.862 74.962,54C74.962,51.138 74.018,48.356 72.275,46.086C70.941,44.347 69.197,42.983 67.211,42.107C66.201,41.661 65.095,42.308 64.809,43.375L63.342,48.849C63.199,49.383 63.524,49.921 64.011,50.182C64.549,50.471 65.023,50.872 65.399,51.362C65.98,52.119 66.295,53.046 66.295,54C66.295,54.954 65.98,55.881 65.399,56.638C65.023,57.128 64.549,57.529 64.011,57.818C63.524,58.079 63.199,58.618 63.342,59.151L64.809,64.625ZM46,67C53.18,67 59,61.18 59,54C59,46.82 53.18,41 46,41C38.82,41 33,46.82 33,54C33,61.18 38.82,67 46,67Z"
+ android:fillColor="#ffffffff"
+ android:fillType="evenOdd"/>
+ <group>
+ <clip-path
+ android:pathData="M67.329,62.438C68.309,61.815 69.179,61.021 69.896,60.088C71.236,58.341 71.962,56.201 71.962,54C71.962,51.799 71.236,49.659 69.896,47.912C69.179,46.979 68.309,46.185 67.329,45.562L66.591,48.314C67.031,48.671 67.43,49.081 67.779,49.536C68.762,50.817 69.295,52.386 69.295,54C69.295,55.614 68.762,57.183 67.779,58.464C67.43,58.919 67.031,59.329 66.591,59.686L67.329,62.438Z"
+ android:fillType="evenOdd"/>
+ <path
+ android:pathData="M62,67C59.138,67 56.356,66.056 54.086,64.314C51.816,62.571 50.184,60.129 49.443,57.365C48.702,54.6 48.894,51.669 49.99,49.025C51.085,46.381 53.022,44.173 55.5,42.742C57.978,41.311 60.86,40.738 63.697,41.111C66.534,41.485 69.169,42.784 71.192,44.808C73.216,46.831 74.515,49.466 74.889,52.303C75.262,55.14 74.689,58.022 73.258,60.5L62,54L62,67Z"
+ android:fillColor="#ffffffff"/>
+ </group>
+</vector>
diff --git a/fmapp2/res/mipmap-anydpi/ic_launcher.xml b/fmapp2/res/mipmap-anydpi/ic_launcher.xml
new file mode 100644
index 0000000..b58c81f
--- /dev/null
+++ b/fmapp2/res/mipmap-anydpi/ic_launcher.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ SPDX-FileCopyrightText: 2022 The LineageOS Project
+ SPDX-License-Identifier: Apache-2.0
+-->
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+ <background android:drawable="@drawable/ic_launcher_background"/>
+ <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+ <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+</adaptive-icon>
diff --git a/fmapp2/src/com/caf/fmradio/FMRadio.java b/fmapp2/src/com/caf/fmradio/FMRadio.java
index f96e8e7..91d1503 100644
--- a/fmapp2/src/com/caf/fmradio/FMRadio.java
+++ b/fmapp2/src/com/caf/fmradio/FMRadio.java
@@ -1220,7 +1220,7 @@
if (bSearchActive) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle(titleStr);
- builder.setIcon(R.drawable.ic_launcher_fmradio);
+ builder.setIcon(R.mipmap.ic_launcher);
View view = getLayoutInflater().inflate(R.layout.layout_dialog_progress,null);
builder.setView(view);
TextView tvMessage = (TextView)view.findViewById(R.id.id_tv_message);
