Fix black icon for small notifications on EMUI (#5350)

* Set notification icon fillColor to Android white

Closes #5340

* Remove '_black' suffix from the glasses icon drawable

(cherry picked from commit 653b7ffcd0fa5213668096059b43766f8ad8ed59)

# Conflicts:
#	app/src/main/res/drawable/ic_tachi.xml
This commit is contained in:
Soitora 2021-06-09 23:16:09 +02:00 committed by Jobobby04
parent 0bdddb365f
commit fc141cb92a
14 changed files with 19 additions and 19 deletions

View File

@ -112,7 +112,7 @@ open class App : Application(), LifecycleObserver, ImageLoaderFactory {
val notification = notification(Notifications.CHANNEL_INCOGNITO_MODE) {
setContentTitle(getString(R.string.pref_incognito_mode))
setContentText(getString(R.string.notification_incognito_text))
setSmallIcon(R.drawable.ic_glasses_black_24dp)
setSmallIcon(R.drawable.ic_glasses_24dp)
setOngoing(true)
val pendingIntent = PendingIntent.getBroadcast(

View File

@ -204,7 +204,7 @@ class LibraryUpdateNotifier(private val context: Context) {
// Mark chapters as read action
addAction(
R.drawable.ic_glasses_black_24dp,
R.drawable.ic_glasses_24dp,
context.getString(R.string.action_mark_as_read),
NotificationReceiver.markAsReadPendingBroadcast(
context,

View File

@ -70,7 +70,7 @@ class MoreController :
key = Keys.incognitoMode
summaryRes = R.string.pref_incognito_mode_summary
titleRes = R.string.pref_incognito_mode
iconRes = R.drawable.ic_glasses_black_24dp
iconRes = R.drawable.ic_glasses_24dp
iconTint = tintColor
defaultValue = false
}

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M18,2L6,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,4c0,-1.1 -0.9,-2 -2,-2zM9,4h2v5l-1,-0.75L9,9L9,4zM18,20L6,20L6,4h1v9l3,-2.25L13,13L13,4h5v16z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M16,9v10H8V9h8m-1.5,-6h-5l-1,1H5v2h14V4h-3.5l-1,-1zM18,7H6v12c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M3,10C2.76,10 2.55,10.09 2.41,10.25C2.27,10.4 2.21,10.62 2.24,10.86L2.74,13.85C2.82,14.5 3.4,15 4,15H7C7.64,15 8.36,14.44 8.5,13.82L9.56,10.63C9.6,10.5 9.57,10.31 9.5,10.19C9.39,10.07 9.22,10 9,10H3M7,17H4C2.38,17 0.96,15.74 0.76,14.14L0.26,11.15C0.15,10.3 0.39,9.5 0.91,8.92C1.43,8.34 2.19,8 3,8H9C9.83,8 10.58,8.35 11.06,8.96C11.17,9.11 11.27,9.27 11.35,9.45C11.78,9.36 12.22,9.36 12.64,9.45C12.72,9.27 12.82,9.11 12.94,8.96C13.41,8.35 14.16,8 15,8H21C21.81,8 22.57,8.34 23.09,8.92C23.6,9.5 23.84,10.3 23.74,11.11L23.23,14.18C23.04,15.74 21.61,17 20,17H17C15.44,17 13.92,15.81 13.54,14.3L12.64,11.59C12.26,11.31 11.73,11.31 11.35,11.59L10.43,14.37C10.07,15.82 8.56,17 7,17M15,10C14.78,10 14.61,10.07 14.5,10.19C14.42,10.31 14.4,10.5 14.45,10.7L15.46,13.75C15.64,14.44 16.36,15 17,15H20C20.59,15 21.18,14.5 21.25,13.89L21.76,10.82C21.79,10.62 21.73,10.4 21.59,10.25C21.45,10.09 21.24,10 21,10H15Z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M8,5v14l11,-7z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z" />
</vector>

View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:fillColor="@android:color/white"
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.92s2.92,-1.31 2.92,-2.92c0,-1.61 -1.31,-2.92 -2.92,-2.92zM18,4c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM6,13c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM18,20.02c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1z"/>
</vector>

View File

@ -4,21 +4,21 @@
android:viewportWidth="256"
android:viewportHeight="256">
<path
android:fillColor="#FFFFFF"
android:fillColor="@android:color/white"
android:pathData="M118.8,28.6c41.3,-0.5 51.7,17.3 66.4,26.8c7.7,3 6.3,5.8 9.4,10.3c0.9,1.3 2,1.8 3.4,2.7c10.9,6.5 -3.9,14.2 -10.1,14.4c2.5,-1.7 4.7,-2.1 6.3,-4.4c-0.1,0 -0.2,0 -0.3,0c0,-0.1 0,-0.2 0,-0.3c-5.2,-1.4 -4.8,3.2 -10.5,2.2c1.3,-0.1 4.5,-2.1 4.4,-4.8c-4.3,-2.6 -11.3,-5.4 -16.8,-5.1c0,0.1 0,0.1 -0.1,0.3c13,8.7 9.2,20.5 16.9,22.9c-4.2,-0.2 -2.1,0.8 0,2.5c-5.2,-1.1 -5.8,-6.9 -8.2,-12c-2.8,-4.6 -5.5,-10.2 -8.6,-10.5c-0.7,3.3 0.7,20.2 5.3,16.7c-3.6,4.4 1.6,2.6 3.9,1.7c-8.6,6.8 -12.6,4.9 -15.3,-4.9c-2.2,-4.8 -5.2,-12.3 -7,-16.7c-1,-2.5 -2.7,-4.8 -4.9,-6.4c-15,-11.2 -26.1,-11.9 -41.9,-9.4c-4,-7.7 -9.9,-14.5 -13.9,-22.2C104.7,30.6 110.8,28.7 118.8,28.6z" />
<path
android:fillColor="#FFFFFF"
android:fillColor="@android:color/white"
android:pathData="M61.1,62.2c29.4,56.7 60.4,38.2 105.3,59.8c39.2,24.3 30,76.3 -10.8,92.4c0,-10.1 0,-20.3 0,-30.4c16.6,-16.2 7.4,-40.2 -13.3,-44.8c-24.7,-5.4 -52.2,-10.6 -68.7,-22.4C55.6,103.2 51.5,80.4 61.1,62.2z" />
<path
android:fillColor="#FFFFFF"
android:fillColor="@android:color/white"
android:pathData="M101.1,189.3c0,9.1 0.7,19.3 -0.3,27.9C67,208 42.5,180.2 56,148.1c0,1.7 0,3.4 0,5.1C59.1,174.8 77.6,186.5 101.1,189.3z" />
<path
android:fillColor="#FFFFFF"
android:fillColor="@android:color/white"
android:pathData="M37.3,12.8l49.8,13.3L128,90.4l17.1,-26c12.4,5.2 13.3,30.6 20,34.6l-8.2,12.4c-37.1,-10.1 -69.1,-11.9 -82.1,-38.8C62.7,53.4 37.4,12.8 37.3,12.8z" />
<path
android:fillColor="#FFFFFF"
android:fillColor="@android:color/white"
android:pathData="M164.8,33.4c5.8,3.4 11.9,7.1 16.7,11.8c2.7,2.6 5.3,4.4 9.1,6.6c1.4,0.8 1.7,0.8 2.8,1.7l25.4,-40.6l-49.1,13.3L164.8,33.4z" />
<path
android:fillColor="#FFFFFF"
android:fillColor="@android:color/white"
android:pathData="M128.3,243.2l22.2,-18.1l0.3,-76.1c0,0 -1.6,-4.1 -30.5,-9.1c-6.1,-1.1 -10.6,-2.6 -10.7,-2.6l-4.4,-1.3l0.6,89.1L128.3,243.2z" />
</vector>