Browse Source

Replace raster icons

arkon 5 years ago
parent
commit
ce4d75f62a
59 changed files with 42 additions and 18 deletions
  1. 4 4
      app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt
  2. 2 2
      app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt
  3. 4 4
      app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt
  4. 3 3
      app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt
  5. BIN
      app/src/main/res/drawable-hdpi/ic_av_pause_grey_24dp_img.png
  6. BIN
      app/src/main/res/drawable-hdpi/ic_av_play_arrow_grey_img.png
  7. BIN
      app/src/main/res/drawable-hdpi/ic_book_white_24dp.png
  8. BIN
      app/src/main/res/drawable-hdpi/ic_clear_grey_24dp_img.png
  9. BIN
      app/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png
  10. BIN
      app/src/main/res/drawable-hdpi/ic_insert_photo_white_24dp.png
  11. BIN
      app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png
  12. BIN
      app/src/main/res/drawable-hdpi/ic_refresh_white_24dp_img.png
  13. BIN
      app/src/main/res/drawable-hdpi/ic_share_grey_24dp.png
  14. BIN
      app/src/main/res/drawable-hdpi/ic_system_update_grey_24dp_img.png
  15. BIN
      app/src/main/res/drawable-mdpi/ic_av_pause_grey_24dp_img.png
  16. BIN
      app/src/main/res/drawable-mdpi/ic_av_play_arrow_grey_img.png
  17. BIN
      app/src/main/res/drawable-mdpi/ic_book_white_24dp.png
  18. BIN
      app/src/main/res/drawable-mdpi/ic_clear_grey_24dp_img.png
  19. BIN
      app/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png
  20. BIN
      app/src/main/res/drawable-mdpi/ic_insert_photo_white_24dp.png
  21. BIN
      app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png
  22. BIN
      app/src/main/res/drawable-mdpi/ic_refresh_white_24dp_img.png
  23. BIN
      app/src/main/res/drawable-mdpi/ic_share_grey_24dp.png
  24. BIN
      app/src/main/res/drawable-mdpi/ic_system_update_grey_24dp_img.png
  25. BIN
      app/src/main/res/drawable-xhdpi/ic_av_pause_grey_24dp_img.png
  26. BIN
      app/src/main/res/drawable-xhdpi/ic_av_play_arrow_grey_img.png
  27. BIN
      app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png
  28. BIN
      app/src/main/res/drawable-xhdpi/ic_clear_grey_24dp_img.png
  29. BIN
      app/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png
  30. BIN
      app/src/main/res/drawable-xhdpi/ic_insert_photo_white_24dp.png
  31. BIN
      app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png
  32. BIN
      app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp_img.png
  33. BIN
      app/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png
  34. BIN
      app/src/main/res/drawable-xhdpi/ic_system_update_grey_24dp_img.png
  35. BIN
      app/src/main/res/drawable-xxhdpi/ic_av_pause_grey_24dp_img.png
  36. BIN
      app/src/main/res/drawable-xxhdpi/ic_av_play_arrow_grey_img.png
  37. BIN
      app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png
  38. BIN
      app/src/main/res/drawable-xxhdpi/ic_clear_grey_24dp_img.png
  39. BIN
      app/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png
  40. BIN
      app/src/main/res/drawable-xxhdpi/ic_insert_photo_white_24dp.png
  41. BIN
      app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png
  42. BIN
      app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp_img.png
  43. BIN
      app/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png
  44. BIN
      app/src/main/res/drawable-xxhdpi/ic_system_update_grey_24dp_img.png
  45. BIN
      app/src/main/res/drawable-xxxhdpi/ic_av_pause_grey_24dp_img.png
  46. BIN
      app/src/main/res/drawable-xxxhdpi/ic_av_play_arrow_grey_img.png
  47. BIN
      app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png
  48. BIN
      app/src/main/res/drawable-xxxhdpi/ic_clear_grey_24dp_img.png
  49. BIN
      app/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png
  50. BIN
      app/src/main/res/drawable-xxxhdpi/ic_insert_photo_white_24dp.png
  51. BIN
      app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png
  52. BIN
      app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp_img.png
  53. BIN
      app/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png
  54. BIN
      app/src/main/res/drawable-xxxhdpi/ic_system_update_grey_24dp_img.png
  55. 9 0
      app/src/main/res/drawable/ic_book_white_24dp.xml
  56. BIN
      app/src/main/res/drawable/ic_insert_photo_white_24dp.png
  57. 9 0
      app/src/main/res/drawable/ic_share_black_24dp.xml
  58. 5 0
      app/src/main/res/drawable/ic_system_update_alt_white_24dp.xml
  59. 6 5
      app/src/main/res/layout/reader_page_sheet.xml

+ 4 - 4
app/src/main/java/eu/kanade/tachiyomi/data/download/DownloadNotifier.kt

@@ -100,7 +100,7 @@ internal class DownloadNotifier(private val context: Context) {
                 setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
                 isDownloading = true
                 // Pause action
-                addAction(R.drawable.ic_av_pause_grey_24dp_img,
+                addAction(R.drawable.ic_pause_white_24dp,
                         context.getString(R.string.action_pause),
                         NotificationReceiver.pauseDownloadsPendingBroadcast(context))
             }
@@ -124,18 +124,18 @@ internal class DownloadNotifier(private val context: Context) {
         with(notification) {
             setContentTitle(context.getString(R.string.chapter_paused))
             setContentText(context.getString(R.string.download_notifier_download_paused))
-            setSmallIcon(R.drawable.ic_av_pause_grey_24dp_img)
+            setSmallIcon(R.drawable.ic_pause_white_24dp)
             setAutoCancel(false)
             setProgress(0, 0, false)
             clearActions()
             // Open download manager when clicked
             setContentIntent(NotificationHandler.openDownloadManagerPendingActivity(context))
             // Resume action
-            addAction(R.drawable.ic_av_play_arrow_grey_img,
+            addAction(R.drawable.ic_play_arrow_white_24dp,
                     context.getString(R.string.action_resume),
                     NotificationReceiver.resumeDownloadsPendingBroadcast(context))
             //Clear action
-            addAction(R.drawable.ic_clear_grey_24dp_img,
+            addAction(R.drawable.ic_close_white_24dp,
                     context.getString(R.string.action_clear),
                     NotificationReceiver.clearDownloadsPendingBroadcast(context))
         }

+ 2 - 2
app/src/main/java/eu/kanade/tachiyomi/data/library/LibraryUpdateService.kt

@@ -84,11 +84,11 @@ class LibraryUpdateService(
      */
     private val progressNotification by lazy { NotificationCompat.Builder(this, Notifications.CHANNEL_LIBRARY)
             .setContentTitle(getString(R.string.app_name))
-            .setSmallIcon(R.drawable.ic_refresh_white_24dp_img)
+            .setSmallIcon(R.drawable.ic_refresh_white_24dp)
             .setLargeIcon(notificationBitmap)
             .setOngoing(true)
             .setOnlyAlertOnce(true)
-            .addAction(R.drawable.ic_clear_grey_24dp_img, getString(android.R.string.cancel), cancelIntent)
+            .addAction(R.drawable.ic_close_white_24dp, getString(android.R.string.cancel), cancelIntent)
     }
 
     /**

+ 4 - 4
app/src/main/java/eu/kanade/tachiyomi/data/updater/UpdaterNotifier.kt

@@ -73,11 +73,11 @@ internal class UpdaterNotifier(private val context: Context) {
             setProgress(0, 0, false)
             // Install action
             setContentIntent(NotificationHandler.installApkPendingActivity(context, uri))
-            addAction(R.drawable.ic_system_update_grey_24dp_img,
+            addAction(R.drawable.ic_system_update_alt_white_24dp,
                     context.getString(R.string.action_install),
                     NotificationHandler.installApkPendingActivity(context, uri))
             // Cancel action
-            addAction(R.drawable.ic_clear_grey_24dp_img,
+            addAction(R.drawable.ic_close_white_24dp,
                     context.getString(R.string.action_cancel),
                     NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER))
         }
@@ -96,11 +96,11 @@ internal class UpdaterNotifier(private val context: Context) {
             setOnlyAlertOnce(false)
             setProgress(0, 0, false)
             // Retry action
-            addAction(R.drawable.ic_refresh_grey_24dp_img,
+            addAction(R.drawable.ic_refresh_white_24dp,
                     context.getString(R.string.action_retry),
                     UpdaterService.downloadApkPendingService(context, url))
             // Cancel action
-            addAction(R.drawable.ic_clear_grey_24dp_img,
+            addAction(R.drawable.ic_close_white_24dp,
                     context.getString(R.string.action_cancel),
                     NotificationReceiver.dismissNotificationPendingBroadcast(context, Notifications.ID_UPDATER))
         }

+ 3 - 3
app/src/main/java/eu/kanade/tachiyomi/ui/reader/SaveImageNotifier.kt

@@ -53,7 +53,7 @@ class SaveImageNotifier(private val context: Context) {
     private fun showCompleteNotification(file: File, image: Bitmap) {
         with(notificationBuilder) {
             setContentTitle(context.getString(R.string.picture_saved))
-            setSmallIcon(R.drawable.ic_insert_photo_white_24dp)
+            setSmallIcon(R.drawable.ic_image_black_24dp)
             setStyle(NotificationCompat.BigPictureStyle().bigPicture(image))
             setLargeIcon(image)
             setAutoCancel(true)
@@ -64,11 +64,11 @@ class SaveImageNotifier(private val context: Context) {
 
             setContentIntent(NotificationHandler.openImagePendingActivity(context, file))
             // Share action
-            addAction(R.drawable.ic_share_grey_24dp,
+            addAction(R.drawable.ic_share_white_24dp,
                     context.getString(R.string.action_share),
                     NotificationReceiver.shareImagePendingBroadcast(context, file.absolutePath, notificationId))
             // Delete action
-            addAction(R.drawable.ic_delete_grey_24dp,
+            addAction(R.drawable.ic_delete_white_24dp,
                     context.getString(R.string.action_delete),
                     NotificationReceiver.deleteImagePendingBroadcast(context, file.absolutePath, notificationId))
 

BIN
app/src/main/res/drawable-hdpi/ic_av_pause_grey_24dp_img.png


BIN
app/src/main/res/drawable-hdpi/ic_av_play_arrow_grey_img.png


BIN
app/src/main/res/drawable-hdpi/ic_book_white_24dp.png


BIN
app/src/main/res/drawable-hdpi/ic_clear_grey_24dp_img.png


BIN
app/src/main/res/drawable-hdpi/ic_delete_grey_24dp.png


BIN
app/src/main/res/drawable-hdpi/ic_insert_photo_white_24dp.png


BIN
app/src/main/res/drawable-hdpi/ic_refresh_grey_24dp_img.png


BIN
app/src/main/res/drawable-hdpi/ic_refresh_white_24dp_img.png


BIN
app/src/main/res/drawable-hdpi/ic_share_grey_24dp.png


BIN
app/src/main/res/drawable-hdpi/ic_system_update_grey_24dp_img.png


BIN
app/src/main/res/drawable-mdpi/ic_av_pause_grey_24dp_img.png


BIN
app/src/main/res/drawable-mdpi/ic_av_play_arrow_grey_img.png


BIN
app/src/main/res/drawable-mdpi/ic_book_white_24dp.png


BIN
app/src/main/res/drawable-mdpi/ic_clear_grey_24dp_img.png


BIN
app/src/main/res/drawable-mdpi/ic_delete_grey_24dp.png


BIN
app/src/main/res/drawable-mdpi/ic_insert_photo_white_24dp.png


BIN
app/src/main/res/drawable-mdpi/ic_refresh_grey_24dp_img.png


BIN
app/src/main/res/drawable-mdpi/ic_refresh_white_24dp_img.png


BIN
app/src/main/res/drawable-mdpi/ic_share_grey_24dp.png


BIN
app/src/main/res/drawable-mdpi/ic_system_update_grey_24dp_img.png


BIN
app/src/main/res/drawable-xhdpi/ic_av_pause_grey_24dp_img.png


BIN
app/src/main/res/drawable-xhdpi/ic_av_play_arrow_grey_img.png


BIN
app/src/main/res/drawable-xhdpi/ic_book_white_24dp.png


BIN
app/src/main/res/drawable-xhdpi/ic_clear_grey_24dp_img.png


BIN
app/src/main/res/drawable-xhdpi/ic_delete_grey_24dp.png


BIN
app/src/main/res/drawable-xhdpi/ic_insert_photo_white_24dp.png


BIN
app/src/main/res/drawable-xhdpi/ic_refresh_grey_24dp_img.png


BIN
app/src/main/res/drawable-xhdpi/ic_refresh_white_24dp_img.png


BIN
app/src/main/res/drawable-xhdpi/ic_share_grey_24dp.png


BIN
app/src/main/res/drawable-xhdpi/ic_system_update_grey_24dp_img.png


BIN
app/src/main/res/drawable-xxhdpi/ic_av_pause_grey_24dp_img.png


BIN
app/src/main/res/drawable-xxhdpi/ic_av_play_arrow_grey_img.png


BIN
app/src/main/res/drawable-xxhdpi/ic_book_white_24dp.png


BIN
app/src/main/res/drawable-xxhdpi/ic_clear_grey_24dp_img.png


BIN
app/src/main/res/drawable-xxhdpi/ic_delete_grey_24dp.png


BIN
app/src/main/res/drawable-xxhdpi/ic_insert_photo_white_24dp.png


BIN
app/src/main/res/drawable-xxhdpi/ic_refresh_grey_24dp_img.png


BIN
app/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp_img.png


BIN
app/src/main/res/drawable-xxhdpi/ic_share_grey_24dp.png


BIN
app/src/main/res/drawable-xxhdpi/ic_system_update_grey_24dp_img.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_av_pause_grey_24dp_img.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_av_play_arrow_grey_img.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_book_white_24dp.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_clear_grey_24dp_img.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_delete_grey_24dp.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_insert_photo_white_24dp.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_refresh_grey_24dp_img.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_refresh_white_24dp_img.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_share_grey_24dp.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_system_update_grey_24dp_img.png


+ 9 - 0
app/src/main/res/drawable/ic_book_white_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FFFFFFFF"
+        android:pathData="M18,2H6c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zM6,4h5v8l-2.5,-1.5L6,12V4z"/>
+</vector>

BIN
app/src/main/res/drawable/ic_insert_photo_white_24dp.png


+ 9 - 0
app/src/main/res/drawable/ic_share_black_24dp.xml

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportHeight="24.0"
+    android:viewportWidth="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
+</vector>

+ 5 - 0
app/src/main/res/drawable/ic_system_update_alt_white_24dp.xml

@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FFFFFF"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M12,16.5l4,-4h-3v-9h-2v9L8,12.5l4,4zM21,3.5h-6v1.99h6v14.03L3,19.52L3,5.49h6L9,3.5L3,3.5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2v-14c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>

+ 6 - 5
app/src/main/res/layout/reader_page_sheet.xml

@@ -21,8 +21,8 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_image_black_24dp"
-            android:tint="@color/md_white_1000_54"/>
+            android:tint="@color/md_white_1000_54"
+            app:srcCompat="@drawable/ic_image_black_24dp" />
 
         <TextView
             android:layout_width="match_parent"
@@ -46,7 +46,8 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_share_grey_24dp"/>
+            android:tint="@color/md_white_1000_54"
+            app:srcCompat="@drawable/ic_share_black_24dp" />
 
         <TextView
             android:layout_width="match_parent"
@@ -70,8 +71,8 @@
         <ImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
-            app:srcCompat="@drawable/ic_file_download_black_24dp"
-            android:tint="@color/md_white_1000_54"/>
+            android:tint="@color/md_white_1000_54"
+            app:srcCompat="@drawable/ic_file_download_black_24dp" />
 
         <TextView
             android:layout_width="match_parent"