Merge pull request #800 from grahammendick/issue-799

grahammendick · Aug 22, 2024 · b91673f · b91673f
2 parents 9a88416 + 75ee8ab
commit b91673f
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/NavigationReactNative/src/android/src/main/java/com/navigation/reactnative/ToolbarView.java b/NavigationReactNative/src/android/src/main/java/com/navigation/reactnative/ToolbarView.java
@@ -169,8 +169,10 @@ void setTintColor(Integer tintColor) {
     }
 
     private void setTintColor(Drawable icon) {
-        if (icon != null)
-            icon.setColorFilter(new BlendModeColorFilter(Objects.requireNonNullElseGet(tintColor, () -> getNavigationIconTint() != null ? getNavigationIconTint() : Color.BLACK), BlendMode.SRC_IN));
+        if (icon != null) {
+            int defaultTintColor = getNavigationIconTint() != null ? getNavigationIconTint() : Color.BLACK;
+            icon.setColorFilter(new BlendModeColorFilter(tintColor != null ? tintColor : defaultTintColor, BlendMode.SRC_IN));
+        }
     }
 
     void setNavigationTestID(String navigationTestID) {