From 46f6e729a14dd5dd3e00c4805d1cba47b7ea1a58 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Thu, 4 Aug 2022 14:35:37 +0200 Subject: [PATCH] Theme info messages primary color Signed-off-by: Andy Scherzinger --- .../nextcloud/talk/controllers/SettingsController.kt | 12 +++++++++--- .../com/nextcloud/talk/jobs/NotificationWorker.java | 1 + 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt index f031b283e..c5d0f1a99 100644 --- a/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt +++ b/app/src/main/java/com/nextcloud/talk/controllers/SettingsController.kt @@ -562,7 +562,9 @@ class SettingsController : NewBaseController(R.layout.controller_settings) { if (ApplicationWideMessageHolder.getInstance().messageType != null) { when (ApplicationWideMessageHolder.getInstance().messageType) { ApplicationWideMessageHolder.MessageType.ACCOUNT_UPDATED_NOT_ADDED -> { - binding.messageText.setTextColor(resources!!.getColor(R.color.colorPrimary)) + binding.messageText.setTextColor( + viewThemeUtils.getScheme(binding.messageText.context).primary + ) binding.messageText.text = resources!!.getString(R.string.nc_settings_account_updated) binding.messageView.visibility = View.VISIBLE } @@ -571,13 +573,17 @@ class SettingsController : NewBaseController(R.layout.controller_settings) { binding.messageText.setTextColor(resources!!.getColor(R.color.nc_darkRed)) binding.messageText.text = resources!!.getString(R.string.nc_settings_wrong_account) binding.messageView.visibility = View.VISIBLE - binding.messageText.setTextColor(resources!!.getColor(R.color.colorPrimary)) + binding.messageText.setTextColor( + viewThemeUtils.getScheme(binding.messageText.context).primary + ) binding.messageText.text = resources!!.getString(R.string.nc_Server_account_imported) binding.messageView.visibility = View.VISIBLE } ApplicationWideMessageHolder.MessageType.ACCOUNT_WAS_IMPORTED -> { - binding.messageText.setTextColor(resources!!.getColor(R.color.colorPrimary)) + binding.messageText.setTextColor( + viewThemeUtils.getScheme(binding.messageText.context).primary + ) binding.messageText.text = resources!!.getString(R.string.nc_Server_account_imported) binding.messageView.visibility = View.VISIBLE } diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java index 24c1a5b31..7bcaef1e6 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.java @@ -346,6 +346,7 @@ public class NotificationWorker extends Worker { if (Build.VERSION.SDK_INT >= 23) { // This method should exist since API 21, but some phones don't have it // So as a safeguard, we don't use it until 23 + notificationBuilder.setColor(context.getResources().getColor(R.color.colorPrimary)); }