implemented notification with customization

NMC-2250: Notification tray icon customized

Author: AkshayChaurasia98

app/src/main/java/com/nextcloud/client/documentscan/GeneratePdfFromImagesWork.kt

@@ -98,7 +98,8 @@ class GeneratePdfFromImagesWork(
             .setContentText(message)
             .setAutoCancel(true)
 
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(appContext, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = appContext.resources.getColor(R.color.primary, null)
 
         notificationManager.notify(notificationId, notificationBuilder.build())
 

app/src/main/java/com/nextcloud/client/jobs/FilesExportWork.kt

@@ -135,7 +135,8 @@ class FilesExportWork(
             .setContentTitle(message)
             .setAutoCancel(true)
 
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(appContext, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = appContext.resources.getColor(R.color.primary, null)
 
         val actionIntent = Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).apply {
             flags = FLAG_ACTIVITY_NEW_TASK

app/src/main/java/com/nextcloud/client/jobs/MediaFoldersDetectionWork.kt

@@ -224,7 +224,8 @@ class MediaFoldersDetectionWork(
             .setSilent(true)
             .setContentIntent(pendingIntent)
 
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = context.resources.getColor(R.color.primary, null)
 
         val disableDetection = Intent(context, NotificationReceiver::class.java).apply {
             putExtra(NOTIFICATION_ID, notificationId)

app/src/main/java/com/nextcloud/client/jobs/NotificationWork.kt

@@ -166,7 +166,8 @@ class NotificationWork constructor(
             .setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
             .setContentIntent(pendingIntent)
 
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = context.resources.getColor(R.color.primary, null)
 
         // Remove
         if (notification.getActions().isEmpty()) {
@@ -222,9 +223,8 @@ class NotificationWork constructor(
                 .setAutoCancel(true)
                 .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
                 .setContentIntent(pendingIntent)
-                .also {
-                    viewThemeUtils.androidx.themeNotificationCompatBuilder(context, it)
-                }
+                // NMC Customization
+                .setColor(context.resources.getColor(R.color.primary, null))
                 .build()
         )
 

app/src/main/java/com/nextcloud/client/jobs/notification/WorkerNotificationManager.kt

@@ -42,7 +42,8 @@ open class WorkerNotificationManager(
             setVibrate(null)
             setOnlyAlertOnce(true)
             setSilent(true)
-            viewThemeUtils.androidx.themeNotificationCompatBuilder(context, this)
+            // NMC Customization
+            setColor(context.resources.getColor(R.color.primary, null))
         }
 
     fun showNotification() {

app/src/main/java/com/nextcloud/client/logger/ui/LogsEmailSender.kt

@@ -119,6 +119,9 @@ class LogsEmailSender(private val context: Context, private val clock: Clock, pr
             .setContentTitle(message)
             .setAutoCancel(true)
 
+        // NMC Customization
+        notificationBuilder.color = context.resources.getColor(R.color.primary, null)
+
         val actionIntent = Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).apply {
             flags = FLAG_ACTIVITY_NEW_TASK
         }

app/src/main/java/com/nextcloud/client/media/PlayerService.kt

@@ -108,7 +108,8 @@ class PlayerService : Service() {
         AndroidInjection.inject(this)
         player = Player(applicationContext, clientFactory, playerListener, audioManager)
         notificationBuilder = NotificationCompat.Builder(this)
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(this, notificationBuilder)
+        // NMC Customization
+        notificationBuilder.color = resources.getColor(R.color.primary, null)
 
         val stop = Intent(this, PlayerService::class.java).apply {
             action = ACTION_STOP

app/src/main/java/com/nextcloud/client/notifications/AppNotificationManagerImpl.kt

@@ -39,7 +39,8 @@ class AppNotificationManagerImpl @Inject constructor(
     private fun builder(channelId: String): NotificationCompat.Builder {
         val builder =
             NotificationCompat.Builder(context, channelId)
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(context, builder)
+        // NMC Customization
+        builder.color = context.resources.getColor(R.color.primary, null)
         return builder
     }
 

app/src/main/java/com/owncloud/android/syncadapter/FileSyncAdapter.java

@@ -510,7 +510,8 @@ private void notifyForgottenLocalFiles() {
     private NotificationCompat.Builder createNotificationBuilder() {
         NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getContext());
         notificationBuilder.setSmallIcon(R.drawable.notification_icon).setAutoCancel(true);
-        viewThemeUtils.androidx.themeNotificationCompatBuilder(getContext(), notificationBuilder);
+        // NMC Customization
+        notificationBuilder.setColor(getContext().getResources().getColor(R.color.primary, null));
         return notificationBuilder;
     }
 

app/src/main/java/com/owncloud/android/ui/activity/NotificationsActivity.kt

@@ -18,6 +18,9 @@ import android.view.View
 import android.view.WindowInsetsController
 import androidx.annotation.VisibleForTesting
 import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.Toolbar
+import androidx.core.graphics.BlendModeColorFilterCompat
+import androidx.core.graphics.BlendModeCompat
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.google.android.material.snackbar.Snackbar
 import com.nextcloud.android.common.ui.util.extensions.applyEdgeToEdgeWithSystemBarPadding
@@ -105,11 +108,19 @@ class NotificationsActivity :
     }
 
     private fun setupActionBar() {
-        setSupportActionBar(findViewById(R.id.toolbar_back_button))
+        // NMC Customization
+        val toolbar = findViewById<Toolbar>(R.id.toolbar_back_button)
+        setSupportActionBar(toolbar)
+        // custom color for overflow icon required for NMC
+        toolbar.getOverflowIcon()?.colorFilter =
+            BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
+                getResources().getColor(R.color.fontAppbar, null),
+                BlendModeCompat.SRC_ATOP
+            )
+        viewThemeUtils.platform.themeStatusBar(this)
         supportActionBar?.apply {
-            setTitle(R.string.drawer_item_notifications)
             setDisplayHomeAsUpEnabled(true)
-            setHomeAsUpIndicator(R.drawable.ic_arrow_back_foreground)
+            viewThemeUtils.files.themeActionBar(this@NotificationsActivity, this,R.string.drawer_item_notifications)
         }
     }
 
@@ -212,14 +223,17 @@ class NotificationsActivity :
                         Snackbar.LENGTH_INDEFINITE
                     )
                 } else {
-                    val pushValue = arbitraryDataProvider.getValue(accountName, PushUtils.KEY_PUSH)
+                    // NMC Note -> Need to disable this error message for now as we will configure our
+                    // own push notification server later not now
+                    // once we will configure our server we will uncomment the below code.
+                   /* val pushValue = arbitraryDataProvider.getValue(accountName, PushUtils.KEY_PUSH)
                     if (pushValue.isEmpty()) {
                         snackbar = Snackbar.make(
                             binding.emptyList.emptyListView,
                             R.string.push_notifications_temp_error,
                             Snackbar.LENGTH_INDEFINITE
                         )
-                    }
+                    }*/
                 }
             }