Explorar el Código

Add null check before setting font for menu item (#1036)

Guy Carmeli hace 8 años
padre
commit
9e9cab4150

+ 2
- 1
android/app/src/main/java/com/reactnativenavigation/views/TitleBarButton.java Ver fichero

3
 import android.support.annotation.NonNull;
3
 import android.support.annotation.NonNull;
4
 import android.support.annotation.Nullable;
4
 import android.support.annotation.Nullable;
5
 import android.text.SpannableStringBuilder;
5
 import android.text.SpannableStringBuilder;
6
+import android.text.TextUtils;
6
 import android.view.Menu;
7
 import android.view.Menu;
7
 import android.view.MenuItem;
8
 import android.view.MenuItem;
8
 import android.view.View;
9
 import android.view.View;
41
     }
42
     }
42
 
43
 
43
     private MenuItem createMenuItem(int index) {
44
     private MenuItem createMenuItem(int index) {
44
-        if (!buttonParams.font.hasFont()) {
45
+        if (!buttonParams.font.hasFont() || TextUtils.isEmpty(buttonParams.label)) {
45
             return menu.add(Menu.NONE, Menu.NONE, index, buttonParams.label);
46
             return menu.add(Menu.NONE, Menu.NONE, index, buttonParams.label);
46
         }
47
         }
47
         TypefaceSpan span = new TypefaceSpan(buttonParams.font.get());
48
         TypefaceSpan span = new TypefaceSpan(buttonParams.font.get());