Skip to content

Commit a24105b

Browse files
AkshayChaurasia98surinder-tsys
AkshayChaurasia98
authored and
surinder-tsys
committed
implemented notification with customization
NMC-2250: Notification tray icon customized
1 parent 022f9c2 commit a24105b

File tree

17 files changed

+278
-31
lines changed

17 files changed

+278
-31
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,8 @@ class GeneratePdfFromImagesWork(
9898
.setContentText(message)
9999
.setAutoCancel(true)
100100

101-
viewThemeUtils.androidx.themeNotificationCompatBuilder(appContext, notificationBuilder)
101+
// NMC Customization
102+
notificationBuilder.color = appContext.resources.getColor(R.color.primary, null)
102103

103104
notificationManager.notify(notificationId, notificationBuilder.build())
104105

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,8 @@ class FilesExportWork(
135135
.setContentTitle(message)
136136
.setAutoCancel(true)
137137

138-
viewThemeUtils.androidx.themeNotificationCompatBuilder(appContext, notificationBuilder)
138+
// NMC Customization
139+
notificationBuilder.color = appContext.resources.getColor(R.color.primary, null)
139140

140141
val actionIntent = Intent(DownloadManager.ACTION_VIEW_DOWNLOADS).apply {
141142
flags = FLAG_ACTIVITY_NEW_TASK

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,8 @@ class MediaFoldersDetectionWork constructor(
223223
.setAutoCancel(true)
224224
.setContentIntent(pendingIntent)
225225

226-
viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
226+
// NMC Customization
227+
notificationBuilder.color = context.resources.getColor(R.color.primary, null)
227228

228229
val disableDetection = Intent(context, NotificationReceiver::class.java)
229230
disableDetection.putExtra(NOTIFICATION_ID, notificationId)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,8 @@ class NotificationWork constructor(
166166
.setVisibility(NotificationCompat.VISIBILITY_PRIVATE)
167167
.setContentIntent(pendingIntent)
168168

169-
viewThemeUtils.androidx.themeNotificationCompatBuilder(context, notificationBuilder)
169+
// NMC Customization
170+
notificationBuilder.color = context.resources.getColor(R.color.primary, null)
170171

171172
// Remove
172173
if (notification.getActions().isEmpty()) {
@@ -222,9 +223,8 @@ class NotificationWork constructor(
222223
.setAutoCancel(true)
223224
.setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
224225
.setContentIntent(pendingIntent)
225-
.also {
226-
viewThemeUtils.androidx.themeNotificationCompatBuilder(context, it)
227-
}
226+
// NMC Customization
227+
.setColor(context.resources.getColor(R.color.primary, null))
228228
.build()
229229
)
230230

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ open class WorkerNotificationManager(
3939
setVibrate(null)
4040
setOnlyAlertOnce(true)
4141
setSilent(true)
42-
viewThemeUtils.androidx.themeNotificationCompatBuilder(context, this)
42+
// NMC Customization
43+
setColor(context.resources.getColor(R.color.primary, null))
4344
}
4445

4546
fun showNotification() {

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ class PlayerService : Service() {
109109
AndroidInjection.inject(this)
110110
player = Player(applicationContext, clientFactory, playerListener, audioManager)
111111
notificationBuilder = NotificationCompat.Builder(this)
112-
viewThemeUtils.androidx.themeNotificationCompatBuilder(this, notificationBuilder)
112+
// NMC Customization
113+
notificationBuilder.color = resources.getColor(R.color.primary, null)
113114

114115
val stop = Intent(this, PlayerService::class.java).apply {
115116
action = ACTION_STOP

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class AppNotificationManagerImpl @Inject constructor(
3939
private fun builder(channelId: String): NotificationCompat.Builder {
4040
val builder =
4141
NotificationCompat.Builder(context, channelId)
42-
viewThemeUtils.androidx.themeNotificationCompatBuilder(context, builder)
42+
// NMC Customization
43+
builder.color = context.resources.getColor(R.color.primary, null)
4344
return builder
4445
}
4546

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,8 @@ private void notifyForgottenLocalFiles() {
510510
private NotificationCompat.Builder createNotificationBuilder() {
511511
NotificationCompat.Builder notificationBuilder = new NotificationCompat.Builder(getContext());
512512
notificationBuilder.setSmallIcon(R.drawable.notification_icon).setAutoCancel(true);
513-
viewThemeUtils.androidx.themeNotificationCompatBuilder(getContext(), notificationBuilder);
513+
// NMC Customization
514+
notificationBuilder.setColor(getContext().getResources().getColor(R.color.primary, null));
514515
return notificationBuilder;
515516
}
516517

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

Lines changed: 19 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ import android.view.View
1818
import android.view.WindowInsetsController
1919
import androidx.annotation.VisibleForTesting
2020
import androidx.appcompat.app.AppCompatActivity
21+
import androidx.appcompat.widget.Toolbar
22+
import androidx.core.graphics.BlendModeColorFilterCompat
23+
import androidx.core.graphics.BlendModeCompat
2124
import androidx.recyclerview.widget.LinearLayoutManager
2225
import com.google.android.material.snackbar.Snackbar
2326
import com.nextcloud.android.common.ui.util.extensions.applyEdgeToEdgeWithSystemBarPadding
@@ -105,11 +108,19 @@ class NotificationsActivity :
105108
}
106109

107110
private fun setupActionBar() {
108-
setSupportActionBar(findViewById(R.id.toolbar_back_button))
111+
// NMC Customization
112+
val toolbar = findViewById<Toolbar>(R.id.toolbar_back_button)
113+
setSupportActionBar(toolbar)
114+
// custom color for overflow icon required for NMC
115+
toolbar.getOverflowIcon()?.colorFilter =
116+
BlendModeColorFilterCompat.createBlendModeColorFilterCompat(
117+
getResources().getColor(R.color.fontAppbar, null),
118+
BlendModeCompat.SRC_ATOP
119+
)
120+
viewThemeUtils.platform.themeStatusBar(this)
109121
supportActionBar?.apply {
110-
setTitle(R.string.drawer_item_notifications)
111122
setDisplayHomeAsUpEnabled(true)
112-
setHomeAsUpIndicator(R.drawable.ic_arrow_back_foreground)
123+
viewThemeUtils.files.themeActionBar(this@NotificationsActivity, this,R.string.drawer_item_notifications)
113124
}
114125
}
115126

@@ -212,14 +223,17 @@ class NotificationsActivity :
212223
Snackbar.LENGTH_INDEFINITE
213224
)
214225
} else {
215-
val pushValue = arbitraryDataProvider.getValue(accountName, PushUtils.KEY_PUSH)
226+
// NMC Note -> Need to disable this error message for now as we will configure our
227+
// own push notification server later not now
228+
// once we will configure our server we will uncomment the below code.
229+
/* val pushValue = arbitraryDataProvider.getValue(accountName, PushUtils.KEY_PUSH)
216230
if (pushValue.isEmpty()) {
217231
snackbar = Snackbar.make(
218232
binding.emptyList.emptyListView,
219233
R.string.push_notifications_temp_error,
220234
Snackbar.LENGTH_INDEFINITE
221235
)
222-
}
236+
}*/
223237
}
224238
}
225239

‎app/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,11 @@ public void setButtons(NotificationViewHolder holder, Notification notification)
211211
}
212212
});
213213

214-
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(button);
214+
//NMC Customization
215+
button.setBackgroundColor(ResourcesCompat.getColor(resources,
216+
R.color.shared_with_me_color, null));
217+
button.setTextColor(ResourcesCompat.getColor(resources,
218+
R.color.white, null));
215219
holder.binding.buttons.addView(button);
216220
} else {
217221
overflowActions.add(action);
@@ -223,8 +227,12 @@ public void setButtons(NotificationViewHolder holder, Notification notification)
223227
moreButton.setBackgroundColor(ResourcesCompat.getColor(resources,
224228
android.R.color.transparent,
225229
null));
226-
viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(moreButton);
227-
230+
//NMC Customization
231+
moreButton.setBackgroundColor(ResourcesCompat.getColor(resources,
232+
android.R.color.transparent,
233+
null));
234+
moreButton.setTextColor(ResourcesCompat.getColor(resources,
235+
R.color.shared_with_me_color, null));
228236
moreButton.setAllCaps(false);
229237

230238
moreButton.setText(R.string.more);
@@ -266,12 +274,16 @@ public void setButtons(NotificationViewHolder holder, Notification notification)
266274
final MaterialButton button = new MaterialButton(notificationsActivity);
267275

268276
if (action.primary) {
269-
viewThemeUtils.material.colorMaterialButtonPrimaryFilled(button);
277+
button.setBackgroundColor(ResourcesCompat.getColor(resources,
278+
R.color.shared_with_me_color, null));
279+
button.setTextColor(ResourcesCompat.getColor(resources,
280+
R.color.white, null));
270281
} else {
271282
button.setBackgroundColor(ResourcesCompat.getColor(resources,
272283
android.R.color.transparent,
273284
null));
274-
viewThemeUtils.material.colorMaterialButtonPrimaryBorderless(button);
285+
button.setTextColor(ResourcesCompat.getColor(resources,
286+
R.color.shared_with_me_color, null));
275287
}
276288

277289
button.setAllCaps(false);

0 commit comments

Comments
 (0)