Merge pull request #5116 from ByteHamster/vector-drawable-compat

Use VectorDrawable compat library

13 files changed, 116 insertions, 0 deletions

diff --git a/ui/png-icons/README.md b/ui/png-icons/README.md
new file mode 100644
index 000000000..c05a5348f
--- /dev/null
+++ b/ui/png-icons/README.md
@@ -0,0 +1,3 @@
+# :ui:png-icons
+
+This module provides icon resources. It is necessary to support old Android versions that do not support VectorDrawables. The module generates png versions of all contained icons automatically.  This is only needed for notification icons - for the icons within the app, appcompat handles drawing the vectors.
diff --git a/ui/png-icons/build.gradle b/ui/png-icons/build.gradle
new file mode 100644
index 000000000..cf13d882d
--- /dev/null
+++ b/ui/png-icons/build.gradle
@@ -0,0 +1,52 @@
+apply plugin: "com.android.library"
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+
+    defaultConfig {
+        minSdkVersion rootProject.ext.minSdkVersion
+        targetSdkVersion rootProject.ext.targetSdkVersion
+
+        vectorDrawables.useSupportLibrary false
+        multiDexEnabled false
+
+        testApplicationId "de.danoeh.antennapod.core.tests"
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile("proguard-android.txt")
+        }
+        debug {
+            // debug build has method count over 64k single-dex threshold.
+            // For building debug build to use on Android < 21 (pre-Android 5) devices,
+            // you need to manually change class
+            // de.danoeh.antennapod.PodcastApp to extend MultiDexApplication .
+            // See Issue #2813
+            multiDexEnabled true
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+
+    testOptions {
+        unitTests {
+            includeAndroidResources = true
+        }
+    }
+
+    lintOptions {
+        disable 'GradleDependency'
+        warningsAsErrors true
+        abortOnError true
+    }
+}
+
+dependencies {
+    annotationProcessor "androidx.annotation:annotation:$annotationVersion"
+    implementation "androidx.appcompat:appcompat:$appcompatVersion"
+}
diff --git a/ui/png-icons/src/main/AndroidManifest.xml b/ui/png-icons/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..782f0aa5f
--- /dev/null
+++ b/ui/png-icons/src/main/AndroidManifest.xml
@@ -0,0 +1 @@
+<manifest package="de.danoeh.antennapod.ui.pngicons" />
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_cast_off.xml b/ui/png-icons/src/main/res/drawable/ic_notification_cast_off.xml
new file mode 100644
index 000000000..3e3accd0b
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_cast_off.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="30dp" android:viewportHeight="24.0"
+        android:viewportWidth="24.0" android:width="30dp">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M1.6,1.27L0.25,2.75L1.41,3.8C1.16,4.13 1,4.55 1,5V8H3V5.23L18.2,19H14V21H20.41L22.31,22.72L23.65,21.24M6.5,3L8.7,5H21V16.14L23,17.95V5C23,3.89 22.1,3 21,3M1,10V12A9,9 0 0,1 10,21H12C12,14.92 7.08,10 1,10M1,14V16A5,5 0 0,1 6,21H8A7,7 0 0,0 1,14M1,18V21H4A3,3 0 0,0 1,18Z" />
+</vector>
\ No newline at end of file
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_fast_forward.xml b/ui/png-icons/src/main/res/drawable/ic_notification_fast_forward.xml
new file mode 100644
index 000000000..8ee82f4ed
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_fast_forward.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="30dp" android:viewportHeight="24.0"
+        android:viewportWidth="24.0" android:width="30dp">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M4,18l8.5,-6L4,6v12zM13,6v12l8.5,-6L13,6z"/>
+</vector>
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_fast_rewind.xml b/ui/png-icons/src/main/res/drawable/ic_notification_fast_rewind.xml
new file mode 100644
index 000000000..261ed7e6f
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_fast_rewind.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="30dp" android:viewportHeight="24.0"
+        android:viewportWidth="24.0" android:width="30dp">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M11,18L11,6l-8.5,6 8.5,6zM11.5,12l8.5,6L20,6l-8.5,6z"/>
+</vector>
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_key.xml b/ui/png-icons/src/main/res/drawable/ic_notification_key.xml
new file mode 100644
index 000000000..c8a817eeb
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_key.xml
@@ -0,0 +1,6 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="24dp" android:viewportHeight="24.0"
+        android:viewportWidth="24.0" android:width="24dp">
+    <path android:fillColor="#FFFFFFFF"
+          android:pathData="M12.65,10C11.83,7.67 9.61,6 7,6c-3.31,0 -6,2.69 -6,6s2.69,6 6,6c2.61,0 4.83,-1.67 5.65,-4H17v4h4v-4h2v-4H12.65zM7,14c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z"/>
+</vector>
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_pause.xml b/ui/png-icons/src/main/res/drawable/ic_notification_pause.xml
new file mode 100644
index 000000000..16ebd4eab
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_pause.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="30dp" android:viewportHeight="24.0"
+        android:viewportWidth="24.0" android:width="30dp">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
+</vector>
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_play.xml b/ui/png-icons/src/main/res/drawable/ic_notification_play.xml
new file mode 100644
index 000000000..eb4acd983
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_play.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="30dp" android:viewportHeight="24.0"
+        android:viewportWidth="24.0" android:width="30dp">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_skip.xml b/ui/png-icons/src/main/res/drawable/ic_notification_skip.xml
new file mode 100644
index 000000000..6bf03002a
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_skip.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:height="30dp" android:viewportHeight="24.0"
+        android:viewportWidth="24.0" android:width="30dp">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M6,18l8.5,-6L6,6v12zM16,6v12h2V6h-2z"/>
+</vector>
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_stream.xml b/ui/png-icons/src/main/res/drawable/ic_notification_stream.xml
new file mode 100644
index 000000000..aca761365
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_stream.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m20.5099,12.0219c0,-1.41 -1.143,-2.553 -2.553,-2.553h-1.2765v-0.4255c0,-2.5849 -2.0955,-4.6804 -4.6804,-4.6804 -2.1275,0 -3.9401,1.4382 -4.5017,3.4039H6.8941c-1.8799,0 -3.4039,1.524 -3.4039,3.4039 0,1.8799 1.524,3.4039 3.4039,3.4039h2.553v1.702H6.8941c-2.8199,0 -5.1059,-2.286 -5.1059,-5.1059 0,-2.6381 1.9913,-4.7996 4.5528,-5.0719C7.4047,4.0566 9.5407,2.661 12,2.661c3.0976,0 5.6761,2.2041 6.2633,5.14 2.2041,0.1532 3.9486,1.9743 3.9486,4.2209 0,1.4041 -0.6445,2.3463 -1.5471,3.1885 -0.4185,-0.2876 -0.8313,-0.5368 -1.3724,-0.8908 1.092,-0.8808 1.2175,-1.8722 1.2175,-2.2977z"
+      android:strokeWidth="0.85098612"/>
+  <path
+      android:fillColor="#FFFFFFFF"
+      android:pathData="m12.2085,13.3476v9.4907l7.4569,-4.7453z"
+      android:strokeWidth="0.67790419"/>
+</vector>
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_sync.xml b/ui/png-icons/src/main/res/drawable/ic_notification_sync.xml
new file mode 100644
index 000000000..c42a78d7d
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_sync.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M12,4L12,1L8,5l4,4L12,6c3.31,0 6,2.69 6,6 0,1.01 -0.25,1.97 -0.7,2.8l1.46,1.46C19.54,15.03 20,13.57 20,12c0,-4.42 -3.58,-8 -8,-8zM12,18c-3.31,0 -6,-2.69 -6,-6 0,-1.01 0.25,-1.97 0.7,-2.8L5.24,7.74C4.46,8.97 4,10.43 4,12c0,4.42 3.58,8 8,8v3l4,-4 -4,-4v3z"/>
+</vector>
diff --git a/ui/png-icons/src/main/res/drawable/ic_notification_sync_error.xml b/ui/png-icons/src/main/res/drawable/ic_notification_sync_error.xml
new file mode 100644
index 000000000..b5be1b747
--- /dev/null
+++ b/ui/png-icons/src/main/res/drawable/ic_notification_sync_error.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FFFFFFFF" android:pathData="M3,12c0,2.21 0.91,4.2 2.36,5.64L3,20h6v-6l-2.24,2.24C5.68,15.15 5,13.66 5,12c0,-2.61 1.67,-4.83 4,-5.65L9,4.26C5.55,5.15 3,8.27 3,12zM11,17h2v-2h-2v2zM21,4h-6v6l2.24,-2.24C18.32,8.85 19,10.34 19,12c0,2.61 -1.67,4.83 -4,5.65v2.09c3.45,-0.89 6,-4.01 6,-7.74 0,-2.21 -0.91,-4.2 -2.36,-5.64L21,4zM11,13h2L13,7h-2v6z"/>
+</vector>