Correct font usage in dropdowns.

tempwork
Floens 11 years ago
parent b8aa6dc3aa
commit 28c81e6662
  1. BIN
      Clover/app/src/main/assets/font/Roboto-MediumItalic.ttf
  2. 13
      Clover/app/src/main/java/org/floens/chan/ui/controller/BrowseController.java
  3. 2
      Clover/app/src/main/java/org/floens/chan/ui/toolbar/ToolbarMenuSubMenu.java
  4. 2
      Clover/app/src/main/java/org/floens/chan/utils/AndroidUtils.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;

@ -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);
}

@ -52,9 +52,11 @@ public class AndroidUtils {
private static HashMap<String, Typeface> 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() {

Loading…
Cancel
Save