Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 043403ec authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

301-Update_small_notification_icons 

issue: https://gitlab.e.foundation/e/os/backlog/-/issues/301

- Notification shown wrong small icons. This commit replace the icons
  with our icons.
- Refactor code, use `ContextCompat.getColor` to ensure backward support.
- Remove unused `ic_blocking_manager_qksms.png` icon
parent 091cefb4

presentation/src/main/java/com/moez/QKSMS/common/util/NotificationManagerImpl.kt

+4 −3
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ import androidx.core.app.NotificationManagerCompat 
import androidx.core.app.Person

import androidx.core.app.RemoteInput

import androidx.core.app.TaskStackBuilder

import androidx.core.content.ContextCompat

import androidx.core.content.getSystemService

import androidx.core.graphics.drawable.IconCompat

import com.moez.QKSMS.R
@@ -131,7 +132,7 @@ class NotificationManagerImpl @Inject constructor( 


        val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))

                .setCategory(NotificationCompat.CATEGORY_MESSAGE)

                .setColor(context.getColor(R.color.tools_theme))

                .setColor(ContextCompat.getColor(context, R.color.tools_theme))

                .setPriority(NotificationCompat.PRIORITY_MAX)

                .setSmallIcon(R.drawable.ic_notification)

                .setNumber(messages.size)
@@ -342,7 +343,7 @@ class NotificationManagerImpl @Inject constructor( 
        val notification = NotificationCompat.Builder(context, getChannelIdForNotification(threadId))

                .setContentTitle(context.getString(R.string.notification_message_failed_title))

                .setContentText(context.getString(R.string.notification_message_failed_text, conversation.getTitle()))

                .setColor(context.getColor(R.color.tools_theme))

                .setColor(ContextCompat.getColor(context, R.color.tools_theme))

                .setPriority(NotificationManagerCompat.IMPORTANCE_MAX)

                .setSmallIcon(R.drawable.ic_notification_failed)

                .setAutoCancel(true)
@@ -467,7 +468,7 @@ class NotificationManagerImpl @Inject constructor( 
                .setShowWhen(false)

                .setWhen(System.currentTimeMillis()) // Set this anyway in case it's shown

                .setSmallIcon(R.drawable.ic_file_download_black_24dp)

                .setColor(context.getColor(R.color.tools_theme))

                .setColor(ContextCompat.getColor(context, R.color.tools_theme))

                .setCategory(NotificationCompat.CATEGORY_PROGRESS)

                .setPriority(NotificationCompat.PRIORITY_MIN)

                .setProgress(0, 0, true)

presentation/src/main/res/drawable-xxxhdpi/ic_blocking_manager_qksms.png

deleted100644 → 0
−6.36 KiB
Loading image diff...

presentation/src/main/res/drawable-xxxhdpi/ic_notification.png

deleted100755 → 0
−6.78 KiB
Loading image diff...

presentation/src/main/res/drawable-xxxhdpi/ic_notification_failed.png

deleted100755 → 0
−5.32 KiB
Loading image diff...

presentation/src/main/res/drawable/ic_notification.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright (C) 2022  E FOUNDATION

  ~

  ~ This program is free software: you can redistribute it and/or modify

  ~ it under the terms of the GNU General Public License as published by

  ~ the Free Software Foundation, either version 3 of the License, or

  ~ (at your option) any later version.

  ~

  ~ This program is distributed in the hope that it will be useful,

  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of

  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

  ~ GNU General Public License for more details.

  ~

  ~ You should have received a copy of the GNU General Public License

  ~ along with this program.  If not, see <https://www.gnu.org/licenses/>.

  ~

  -->



<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="@android:color/white"

        android:pathData="M18.969,3.167H5.031C4.502,3.167 3.978,3.271 3.489,3.473C3,3.676 2.555,3.973 2.181,4.347C1.807,4.721 1.51,5.165 1.307,5.654C1.104,6.143 1,6.667 1,7.197V13.985C1,14.514 1.104,15.038 1.307,15.527C1.51,16.016 1.807,16.461 2.181,16.835C2.555,17.209 3,17.506 3.489,17.708C3.978,17.91 4.502,18.014 5.031,18.014V20.833L7.848,18.014H18.969C19.498,18.014 20.022,17.91 20.511,17.708C21,17.506 21.445,17.209 21.819,16.835C22.194,16.461 22.49,16.016 22.693,15.527C22.896,15.038 23,14.514 23,13.985V7.197C23,6.667 22.896,6.143 22.693,5.654C22.49,5.165 22.194,4.721 21.819,4.347C21.445,3.973 21,3.676 20.511,3.473C20.022,3.271 19.498,3.167 18.969,3.167Z" />

</vector>