diff options
| -rw-r--r-- | res/layout/headlines_row.xml | 7 | ||||
| -rw-r--r-- | src/org/fox/ttrss/FeedsFragment.java | 2 | ||||
| -rw-r--r-- | src/org/fox/ttrss/MainActivity.java | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/res/layout/headlines_row.xml b/res/layout/headlines_row.xml index 668fcd24..e586a7f3 100644 --- a/res/layout/headlines_row.xml +++ b/res/layout/headlines_row.xml @@ -1,13 +1,12 @@ <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
- android:layout_height="?android:attr/listPreferredItemHeight"
android:gravity="center_vertical"
- android:padding="3dip" android:id="@+id/headlines_row" android:orientation="horizontal"> + android:padding="3dip" android:id="@+id/headlines_row" android:orientation="horizontal" android:layout_height="match_parent"> <CheckBox android:paddingLeft="6dip" android:paddingRight="6dip" android:layout_height="wrap_content" android:layout_width="wrap_content" android:id="@+id/selected"></CheckBox> <LinearLayout android:layout_height="wrap_content" android:id="@+id/linearLayout1" android:orientation="vertical" android:layout_width="match_parent"> - <TextView android:id="@+id/title" android:textSize="16sp" android:layout_height="wrap_content" android:text="{Title...}" android:layout_width="match_parent"></TextView> - <TextView android:id="@+id/excerpt" android:textSize="13sp" android:layout_height="wrap_content" android:textColor="#909090" android:text="{Content excerpt...}" android:layout_width="match_parent"></TextView> + <TextView android:id="@+id/title" android:textSize="16sp" android:text="{Title...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView> + <TextView android:id="@+id/excerpt" android:textSize="13sp" android:textColor="#909090" android:text="{Content excerpt...}" android:layout_width="match_parent" android:layout_height="match_parent"></TextView> </LinearLayout>
</LinearLayout>
\ No newline at end of file diff --git a/src/org/fox/ttrss/FeedsFragment.java b/src/org/fox/ttrss/FeedsFragment.java index 1ce60a6e..34c85187 100644 --- a/src/org/fox/ttrss/FeedsFragment.java +++ b/src/org/fox/ttrss/FeedsFragment.java @@ -68,7 +68,7 @@ public class FeedsFragment extends Fragment implements OnItemClickListener { DatabaseHelper helper = new DatabaseHelper(getActivity());
m_db = helper.getReadableDatabase();
- m_cursor = m_db.query("feeds_unread", null, "unread > 0", null, null, null, "unread DESC");
+ m_cursor = m_db.query("feeds_unread", null, "unread > 0", null, null, null, "title");
m_adapter = new FeedsListAdapter(getActivity(), R.layout.feeds_row, m_cursor,
new String[] { "title", "unread" }, new int[] { R.id.title, R.id.unread_counter }, 0);
diff --git a/src/org/fox/ttrss/MainActivity.java b/src/org/fox/ttrss/MainActivity.java index 86502f48..331854fb 100644 --- a/src/org/fox/ttrss/MainActivity.java +++ b/src/org/fox/ttrss/MainActivity.java @@ -260,7 +260,7 @@ public class MainActivity extends Activity { String excerpt = Jsoup.parse(article.content).text(); if (excerpt.length() > 250) { - excerpt = excerpt.substring(250) + "..."; + excerpt = excerpt.substring(0, 250) + "..."; } if (c.getCount() != 0) { |