From 2f428e843eeae1040fd3b71fc5e83ebc3ae8005e Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 23 May 2013 15:15:23 +0400 Subject: [PATCH] update articlefragment style --- res/layout-sw600dp/article_fragment.xml | 103 ---------------- res/layout/article_fragment.xml | 151 +++++++++++------------ res/values/strings.xml | 1 + src/org/fox/ttrss/ArticleFragment.java | 2 +- src/org/fox/ttrss/HeadlinesFragment.java | 2 +- 5 files changed, 77 insertions(+), 182 deletions(-) delete mode 100644 res/layout-sw600dp/article_fragment.xml diff --git a/res/layout-sw600dp/article_fragment.xml b/res/layout-sw600dp/article_fragment.xml deleted file mode 100644 index 3b48bed1..00000000 --- a/res/layout-sw600dp/article_fragment.xml +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/res/layout/article_fragment.xml b/res/layout/article_fragment.xml index 3ef1926a..73698d3f 100644 --- a/res/layout/article_fragment.xml +++ b/res/layout/article_fragment.xml @@ -1,4 +1,4 @@ - + android:layout_weight="1"> + + - + + + + + + + android:background="?ttrssHorizontalDivider" + android:paddingTop="2dip" /> + + + android:layout_weight="0.5" + android:ellipsize="end" + android:singleLine="true" + android:text="Example Feed" + android:textColor="?headlineSecondaryTextColor" + android:textSize="12sp" /> - - - - - - - - - - - - - - - + android:layout_weight="0.5" + android:gravity="right" + android:text="Jan 01, 12:00" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?headlineSecondaryTextColor" + android:textSize="12sp" /> - + + + + - \ No newline at end of file + \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 05df6e0c..a886c390 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -197,4 +197,5 @@ Headlines will be marked read when scrolling past them Mark %1$d article(s) as read? Confirm marking articles as read + by %1$s diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java index bd802106..4a3877d5 100644 --- a/src/org/fox/ttrss/ArticleFragment.java +++ b/src/org/fox/ttrss/ArticleFragment.java @@ -334,7 +334,7 @@ public class ArticleFragment extends Fragment implements GestureDetector.OnDoubl if (author != null) { if (m_article.author != null && m_article.author.length() > 0) { - author.setText(m_article.author); + author.setText(getString(R.string.author_formatted, m_article.author)); } else { author.setVisibility(View.GONE); } diff --git a/src/org/fox/ttrss/HeadlinesFragment.java b/src/org/fox/ttrss/HeadlinesFragment.java index c8a791b0..b73121a7 100644 --- a/src/org/fox/ttrss/HeadlinesFragment.java +++ b/src/org/fox/ttrss/HeadlinesFragment.java @@ -680,7 +680,7 @@ public class HeadlinesFragment extends Fragment implements OnItemClickListener, TextView author = (TextView)v.findViewById(R.id.author); if (author != null) { - author.setText(articleAuthor); + author.setText(getString(R.string.author_formatted, articleAuthor)); } /* ImageView separator = (ImageView)v.findViewById(R.id.headlines_separator);