浏览代码

remove legacy color method

Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
Andy Scherzinger 2 年之前
父节点
当前提交
3c5268201a

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

@@ -153,7 +153,7 @@ class FilesExportWork(
         )
             .setSmallIcon(R.drawable.notification_icon)
             .setLargeIcon(BitmapFactory.decodeResource(appContext.resources, R.drawable.notification_icon))
-            .setColor(themeColorUtils.primaryColor(appContext))
+            .setColor(themeColorUtils.primaryColor(appContext, false))
             .setSubText(user.accountName)
             .setContentText(message)
             .setAutoCancel(true)

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

@@ -220,7 +220,7 @@ class MediaFoldersDetectionWork constructor(
         )
             .setSmallIcon(R.drawable.notification_icon)
             .setLargeIcon(BitmapFactory.decodeResource(context.resources, R.drawable.notification_icon))
-            .setColor(themeColorUtils.primaryColor(context))
+            .setColor(themeColorUtils.primaryColor(context, false))
             .setSubText(user.accountName)
             .setContentTitle(contentTitle)
             .setContentText(subtitle)

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

@@ -101,7 +101,7 @@ class PlayerService : Service() {
         AndroidInjection.inject(this)
         player = Player(applicationContext, clientFactory, playerListener, audioManager)
         notificationBuilder = NotificationCompat.Builder(this)
-        notificationBuilder.color = themeColorUtils.primaryColor(this)
+        notificationBuilder.color = themeColorUtils.primaryColor(this, false)
 
         val stop = Intent(this, PlayerService::class.java)
         stop.action = ACTION_STOP

+ 1 - 1
app/src/main/java/com/owncloud/android/ui/notifications/NotificationUtils.java

@@ -62,7 +62,7 @@ public final class NotificationUtils {
      * @return An instance of the regular {@link NotificationCompat.Builder}.
      */
     public static NotificationCompat.Builder newNotificationBuilder(Context context, ThemeColorUtils themeColorUtils) {
-        return new NotificationCompat.Builder(context).setColor(themeColorUtils.primaryColor(context));
+        return new NotificationCompat.Builder(context).setColor(themeColorUtils.primaryColor(context, false));
     }
 
     @SuppressFBWarnings("DMI")

+ 1 - 5
app/src/main/java/com/owncloud/android/utils/theme/ThemeColorUtils.java

@@ -91,10 +91,6 @@ public class ThemeColorUtils {
         }
     }
 
-    public int primaryColor(Context context) {
-        return primaryColor(context, false);
-    }
-
     public int primaryColor(Context context, boolean replaceEdgeColors) {
         User nullUser = null;
         return primaryColor(nullUser, replaceEdgeColors, context);
@@ -223,7 +219,7 @@ public class ThemeColorUtils {
      */
     @SuppressFBWarnings("CLI_CONSTANT_LIST_INDEX")
     public boolean darkTheme(Context context) {
-        int primaryColor = primaryColor(context);
+        int primaryColor = primaryColor(context, false);
         float[] hsl = colorToHSL(primaryColor);
 
         return hsl[INDEX_LUMINATION] <= 0.55;