offline: fix wrong excerpt maximum length and headline font size not

being respected
This commit is contained in:
Andrew Dolgov 2013-05-29 20:57:00 +04:00
parent 056cbebfe3
commit 68ea91c567
3 changed files with 22 additions and 4 deletions

View File

@ -26,6 +26,8 @@ public class CommonActivity extends SherlockFragmentActivity {
public final static String FRAG_FEEDS = "feeds"; public final static String FRAG_FEEDS = "feeds";
public final static String FRAG_CATS = "cats"; public final static String FRAG_CATS = "cats";
public static final int EXCERPT_MAX_SIZE = 200;
private SQLiteDatabase m_readableDb; private SQLiteDatabase m_readableDb;
private SQLiteDatabase m_writableDb; private SQLiteDatabase m_writableDb;

View File

@ -693,8 +693,8 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener,
} else { } else {
String excerpt = Jsoup.parse(articleContent).text(); String excerpt = Jsoup.parse(articleContent).text();
if (excerpt.length() > 200) if (excerpt.length() > CommonActivity.EXCERPT_MAX_SIZE)
excerpt = excerpt.substring(0, 200) + "..."; excerpt = excerpt.substring(0, CommonActivity.EXCERPT_MAX_SIZE) + "...";
int fontSize = -1; int fontSize = -1;

View File

@ -5,6 +5,7 @@ import java.text.SimpleDateFormat;
import java.util.Date; import java.util.Date;
import java.util.TimeZone; import java.util.TimeZone;
import org.fox.ttrss.CommonActivity;
import org.fox.ttrss.GlobalState; import org.fox.ttrss.GlobalState;
import org.fox.ttrss.R; import org.fox.ttrss.R;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
@ -546,9 +547,24 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis
if (te != null) { if (te != null) {
String excerpt = Jsoup.parse(article.getString(article.getColumnIndex("content"))).text(); String excerpt = Jsoup.parse(article.getString(article.getColumnIndex("content"))).text();
if (excerpt.length() > 100) if (excerpt.length() > CommonActivity.EXCERPT_MAX_SIZE)
excerpt = excerpt.substring(0, 100) + "..."; excerpt = excerpt.substring(0, CommonActivity.EXCERPT_MAX_SIZE) + "...";
int fontSize = -1;
switch (Integer.parseInt(m_prefs.getString("headlines_font_size", "0"))) {
case 0:
fontSize = 13;
break;
case 1:
fontSize = 16;
break;
case 2:
fontSize = 18;
break;
}
te.setTextSize(TypedValue.COMPLEX_UNIT_SP, fontSize);
te.setText(excerpt); te.setText(excerpt);
} }