diff --git a/Clover/app/src/main/assets/font/Roboto-MediumItalic.ttf b/Clover/app/src/main/assets/font/Roboto-MediumItalic.ttf new file mode 100644 index 00000000..b8282055 Binary files /dev/null and b/Clover/app/src/main/assets/font/Roboto-MediumItalic.ttf differ diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java index 2e937ce7..edf1a3b3 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java @@ -17,8 +17,8 @@ */ package org.floens.chan.ui.controller; +import android.annotation.SuppressLint; import android.content.Context; -import android.graphics.Typeface; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -199,23 +199,20 @@ public class BrowseController extends Controller implements ToolbarMenuItem.Tool } @Override - public View getDropDownView(int position, View convertView, ViewGroup parent) { + public View getView(int position, View convertView, ViewGroup parent) { + // No recycling, can't use itemtypes + @SuppressLint("ViewHolder") TextView textView = (TextView) LayoutInflater.from(context).inflate(R.layout.toolbar_menu_item, parent, false); textView.setText(getItem(position)); if (position < items.size()) { textView.setTypeface(AndroidUtils.ROBOTO_MEDIUM); } else { - textView.setTypeface(AndroidUtils.ROBOTO_MEDIUM, Typeface.ITALIC); + textView.setTypeface(AndroidUtils.ROBOTO_MEDIUM_ITALIC); } return textView; } - @Override - public View getView(int position, View convertView, ViewGroup parent) { - return getDropDownView(position, convertView, parent); - } - @Override public int getCount() { return items.size() + 1; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuSubMenu.java b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuSubMenu.java index 674f7123..a59c8c49 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuSubMenu.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuSubMenu.java @@ -176,7 +176,7 @@ public class ToolbarMenuSubMenu { } @Override - public View getDropDownView(int position, View convertView, ViewGroup parent) { + public View getView(int position, View convertView, ViewGroup parent) { if (convertView == null) { convertView = LayoutInflater.from(getContext()).inflate(R.layout.toolbar_menu_item, parent, false); } diff --git a/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java b/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java index 03bbb707..58e0bbdc 100644 --- a/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java +++ b/Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.java @@ -52,9 +52,11 @@ public class AndroidUtils { private static HashMap typefaceCache = new HashMap<>(); public static Typeface ROBOTO_MEDIUM; + public static Typeface ROBOTO_MEDIUM_ITALIC; public static void init() { ROBOTO_MEDIUM = getTypeface("Roboto-Medium.ttf"); + ROBOTO_MEDIUM_ITALIC = getTypeface("Roboto-MediumItalic.ttf"); } public static Resources getRes() {