diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2014-01-25 13:17:27 +0400 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2014-01-25 13:17:27 +0400 |
| commit | 86daa8ee53aa638de3643d587660ae9b7804d345 (patch) | |
| tree | 02a4b622b506a90a5e844dd7f1c93970fe2cce23 /src/org/fox/ttrss/offline | |
| parent | 53e9a7d9f345e468bb231c47559ac3e4ba06d28c (diff) | |
adjust other relevant element sizes in headline and article views based
on user setting
Diffstat (limited to 'src/org/fox/ttrss/offline')
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineArticleFragment.java | 11 | ||||
| -rw-r--r-- | src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 13 |
2 files changed, 21 insertions, 3 deletions
diff --git a/src/org/fox/ttrss/offline/OfflineArticleFragment.java b/src/org/fox/ttrss/offline/OfflineArticleFragment.java index de697006..668e9575 100644 --- a/src/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/src/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -131,6 +131,8 @@ public class OfflineArticleFragment extends Fragment { m_cursor.moveToFirst(); if (m_cursor.isFirst()) { + int articleFontSize = Integer.parseInt(m_prefs.getString("article_font_size_sp", "16")); + int articleSmallFontSize = Math.max(10, Math.min(18, articleFontSize - 2)); TextView title = (TextView)view.findViewById(R.id.title); @@ -145,6 +147,7 @@ public class OfflineArticleFragment extends Fragment { else titleStr = m_cursor.getString(m_cursor.getColumnIndex("title")); + title.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, articleFontSize + 3)); title.setText(titleStr); //title.setPaintFlags(title.getPaintFlags() | Paint.UNDERLINE_TEXT_FLAG); title.setOnClickListener(new OnClickListener() { @@ -281,7 +284,7 @@ public class OfflineArticleFragment extends Fragment { cssOverride += "body { text-align : justify; } "; } - ws.setDefaultFontSize(Integer.parseInt(m_prefs.getString("article_font_size_sp", "16"))); + ws.setDefaultFontSize(articleFontSize); content = "<html>" + @@ -323,6 +326,8 @@ public class OfflineArticleFragment extends Fragment { TextView dv = (TextView)view.findViewById(R.id.date); if (dv != null) { + dv.setTextSize(TypedValue.COMPLEX_UNIT_SP, articleSmallFontSize); + Date d = new Date(m_cursor.getInt(m_cursor.getColumnIndex("updated")) * 1000L); DateFormat df = new SimpleDateFormat("MMM dd, HH:mm"); dv.setText(df.format(d)); @@ -333,6 +338,8 @@ public class OfflineArticleFragment extends Fragment { boolean hasAuthor = false; if (author != null) { + author.setTextSize(TypedValue.COMPLEX_UNIT_SP, articleSmallFontSize); + int authorIndex = m_cursor.getColumnIndex("author"); if (authorIndex >= 0) author.setText(m_cursor.getString(authorIndex)); @@ -345,6 +352,8 @@ public class OfflineArticleFragment extends Fragment { TextView tagv = (TextView)view.findViewById(R.id.tags); if (tagv != null) { + tagv.setTextSize(TypedValue.COMPLEX_UNIT_SP, articleSmallFontSize); + int feedTitleIndex = m_cursor.getColumnIndex("feed_title"); if (feedTitleIndex != -1 /* && m_isCat */) { diff --git a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index b4383319..a780c43c 100644 --- a/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/src/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -462,6 +462,9 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis Cursor article = (Cursor)getItem(position); final int articleId = article.getInt(0); + int headlineFontSize = Integer.parseInt(m_prefs.getString("headlines_font_size_sp", "13")); + int headlineSmallFontSize = Math.max(10, Math.min(18, headlineFontSize - 2)); + if (v == null) { int layoutId = R.layout.headlines_row; @@ -490,6 +493,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis TextView tt = (TextView)v.findViewById(R.id.title); if (tt != null) { + tt.setTextSize(TypedValue.COMPLEX_UNIT_SP, Math.min(21, headlineFontSize + 3)); tt.setText(Html.fromHtml(article.getString(article.getColumnIndex("title")))); int scoreIndex = article.getColumnIndex("score"); @@ -508,6 +512,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis feedTitle = feedTitle.substring(0, 20) + "..."; if (feedTitle.length() > 0) { + ft.setTextSize(TypedValue.COMPLEX_UNIT_SP, headlineSmallFontSize); ft.setText(feedTitle); } else { ft.setVisibility(View.GONE); @@ -569,7 +574,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis if (excerpt.length() > CommonActivity.EXCERPT_MAX_SIZE) excerpt = excerpt.substring(0, CommonActivity.EXCERPT_MAX_SIZE) + "..."; - te.setTextSize(TypedValue.COMPLEX_UNIT_SP, Integer.parseInt(m_prefs.getString("headlines_font_size_sp", "13"))); + te.setTextSize(TypedValue.COMPLEX_UNIT_SP, headlineFontSize); te.setText(excerpt); } } @@ -581,7 +586,9 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis if (authorIndex >= 0) { String author = article.getString(authorIndex); - if (author != null && author.length() > 0) + ta.setTextSize(TypedValue.COMPLEX_UNIT_SP, headlineSmallFontSize); + + if (author != null && author.length() > 0) ta.setText(getString(R.string.author_formatted, author)); else ta.setText(""); @@ -597,6 +604,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis TextView dv = (TextView) v.findViewById(R.id.date); if (dv != null) { + dv.setTextSize(TypedValue.COMPLEX_UNIT_SP, headlineSmallFontSize); + Date d = new Date((long)article.getInt(article.getColumnIndex("updated")) * 1000); DateFormat df = new SimpleDateFormat("MMM dd, HH:mm"); df.setTimeZone(TimeZone.getDefault()); |