diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml index 95d023c54f..09ff4626c9 100644 --- a/android/res/values/colors.xml +++ b/android/res/values/colors.xml @@ -208,4 +208,5 @@ #c6ffffff #A335F4 + #82E510 diff --git a/android/src/com/mapswithme/maps/analytics/PushWooshEventLogger.java b/android/src/com/mapswithme/maps/analytics/PushWooshEventLogger.java index d46a62a255..15103a48d2 100644 --- a/android/src/com/mapswithme/maps/analytics/PushWooshEventLogger.java +++ b/android/src/com/mapswithme/maps/analytics/PushWooshEventLogger.java @@ -6,7 +6,7 @@ import android.support.annotation.NonNull; import android.support.annotation.Nullable; import com.mapswithme.maps.BuildConfig; -import com.mapswithme.maps.R; +import com.mapswithme.util.UiUtils; import com.mapswithme.util.log.Logger; import com.mapswithme.util.log.LoggerFactory; import com.mapswithme.util.statistics.PushwooshHelper; @@ -35,7 +35,7 @@ class PushWooshEventLogger extends DefaultEventLogger return; @ColorInt - int color = getApplication().getResources().getColor(R.color.base_accent); + int color = UiUtils.getNotificationColor(getApplication()); PushwooshNotificationSettings.setNotificationIconBackgroundColor(color); Pushwoosh pushManager = Pushwoosh.getInstance(); pushManager.registerForPushNotifications(); diff --git a/android/src/com/mapswithme/maps/background/Notifier.java b/android/src/com/mapswithme/maps/background/Notifier.java index eb511696c4..15a4c34f4f 100644 --- a/android/src/com/mapswithme/maps/background/Notifier.java +++ b/android/src/com/mapswithme/maps/background/Notifier.java @@ -14,6 +14,7 @@ import android.support.v4.app.NotificationCompat; import com.mapswithme.maps.MwmActivity; import com.mapswithme.maps.R; import com.mapswithme.util.StringUtils; +import com.mapswithme.util.UiUtils; import com.mapswithme.util.statistics.Statistics; import java.lang.annotation.Retention; @@ -152,7 +153,7 @@ public final class Notifier return new NotificationCompat.Builder(mContext, channel) .setAutoCancel(true) .setSmallIcon(R.drawable.pw_notification) - .setColor(mContext.getResources().getColor(R.color.base_accent)) + .setColor(UiUtils.getNotificationColor(mContext)) .setContentTitle(title) .setContentText(content) .setTicker(getTicker(title, content)) diff --git a/android/src/com/mapswithme/util/UiUtils.java b/android/src/com/mapswithme/util/UiUtils.java index c1fe3ad843..192d6954a8 100644 --- a/android/src/com/mapswithme/util/UiUtils.java +++ b/android/src/com/mapswithme/util/UiUtils.java @@ -13,6 +13,7 @@ import android.net.Uri; import android.os.Build; import android.support.annotation.AnyRes; import android.support.annotation.AttrRes; +import android.support.annotation.ColorInt; import android.support.annotation.ColorRes; import android.support.annotation.DimenRes; import android.support.annotation.IdRes; @@ -20,7 +21,6 @@ import android.support.annotation.NonNull; import android.support.annotation.StringRes; import android.support.design.widget.TextInputLayout; import android.support.v4.content.ContextCompat; -import android.support.v7.app.AlertDialog; import android.support.v7.widget.Toolbar; import android.text.TextUtils; import android.view.Gravity; @@ -534,6 +534,12 @@ public final class UiUtils }); } + @ColorInt + public static int getNotificationColor(@NonNull Context context) + { + return context.getResources().getColor(R.color.notification); + } + // utility class private UiUtils() {} }