From 449ac639e34d4c7a989926b0fd94583512d653f4 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 10 Jun 2015 19:45:32 +0300 Subject: remove typeface cache --- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 13 ---------- .../ttrss/offline/OfflineHeadlinesFragment.java | 13 ---------- .../java/org/fox/ttrss/util/TypefaceCache.java | 29 ---------------------- 3 files changed, 55 deletions(-) delete mode 100644 org.fox.ttrss/src/main/java/org/fox/ttrss/util/TypefaceCache.java diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 3892132b..9c4aa8da 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -816,19 +816,6 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, if (holder.titleView != null) { holder.titleView.setText(Html.fromHtml(article.title)); - - /* if (m_prefs.getBoolean("enable_condensed_fonts", false)) { - Typeface tf = TypefaceCache.get(m_activity, "sans-serif-condensed", article.unread ? Typeface.BOLD : Typeface.NORMAL); - - if (tf != null && !tf.equals(holder.titleView.getTypeface())) { - holder.titleView.setTypeface(tf); - } - - holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 5)); - } else { - holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); - } */ - holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); adjustTitleTextView(article.score, holder.titleView, position); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 8421d007..076b687a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -616,19 +616,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis if (holder.titleView != null) { holder.titleView.setText(Html.fromHtml(article.getString(article.getColumnIndex("title")))); - - /* if (m_prefs.getBoolean("enable_condensed_fonts", false)) { - Typeface tf = TypefaceCache.get(m_activity, "sans-serif-condensed", article.getInt(article.getColumnIndex("unread")) == 1 ? Typeface.BOLD : Typeface.NORMAL); - - if (tf != null && !tf.equals(holder.titleView.getTypeface())) { - holder.titleView.setTypeface(tf); - } - - holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 5)); - } else { - holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); - } */ - holder.titleView.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); int scoreIndex = article.getColumnIndex("score"); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/TypefaceCache.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/TypefaceCache.java deleted file mode 100644 index 752304ca..00000000 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/TypefaceCache.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.fox.ttrss.util; - -import java.util.Hashtable; - -import android.content.Context; -import android.graphics.Typeface; -import android.util.Log; - -public class TypefaceCache { - private static final String TAG = "TypefaceCache"; - private static final Hashtable cache = new Hashtable(); - - public static Typeface get(Context c, String typefaceName, int style) { - synchronized (cache) { - String key = typefaceName + ":" + style; - - if (!cache.containsKey(key)) { - try { - Typeface t = Typeface.create(typefaceName, style); - cache.put(key, t); - } catch (Exception e) { - Log.e(TAG, "Could not get typeface '" + typefaceName + "' because " + e.getMessage()); - return null; - } - } - return cache.get(key); - } - } -} \ No newline at end of file -- cgit v1.2.3