diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java index e78dd32ed52..6876a19f379 100644 --- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java +++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUIAbstractTabGroup.java @@ -252,6 +252,10 @@ public void addTab(TabProxy tabProxy) */ protected ColorStateList textColorStateList(TiViewProxy tabProxy, int stateToUse) { + if (getProxy() == null || tabProxy == null) { + return null; + } + int[][] textColorStates = new int[][] { new int[] { -stateToUse }, new int[] { stateToUse } }; int[] textColors = { this.textColorInt, this.textColorInt }; diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java index b390620c312..91d42af1b42 100644 --- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java +++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/tabgroup/TiUITabLayoutTabGroup.java @@ -6,6 +6,7 @@ */ package ti.modules.titanium.ui.widget.tabgroup; +import android.content.res.ColorStateList; import android.content.res.Configuration; import android.graphics.Rect; import android.graphics.drawable.Drawable; @@ -245,8 +246,10 @@ public void updateTabTitleColor(int index) //TIMOB-27830: Update text color after layout for change to take effect. tabLayout.addOnLayoutChangeListener( (v, left, top, right, bottom, oldLeft, oldTop, oldRight, oldBottom) -> { - if (tabProxy != null) { - textView.setTextColor(textColorStateList(tabProxy, android.R.attr.state_selected)); + final ColorStateList colorStateList = + textColorStateList(tabProxy, android.R.attr.state_selected); + if (colorStateList != null) { + textView.setTextColor(colorStateList); } }); }