From 2f428e843eeae1040fd3b71fc5e83ebc3ae8005e Mon Sep 17 00:00:00 2001
From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
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 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/article_fragment"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:background="?articleBackground"
-    android:orientation="vertical"
-    android:padding="10sp" >
-
-    <org.fox.ttrss.TitleWebView
-        android:id="@+id/content"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_weight="1" >
-
-        <LinearLayout
-            android:id="@+id/article_header"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="0"
-            android:orientation="vertical"
-            android:paddingBottom="4sp" >
-
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textColor="?linkColor"
-                android:textSize="21sp" />
-
-            <LinearLayout
-                android:id="@+id/comments_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/comments"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:paddingBottom="2sp"
-                    android:paddingTop="2sp"
-                    android:text="24 comments"
-                    android:textColor="?linkColor"
-                    android:textSize="13sp" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" >
-
-                <TextView
-                    android:id="@+id/tags"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:ellipsize="end"
-                    android:textStyle="italic" 
-                    android:singleLine="true"
-                    android:text="{TAGS}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp" />
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.2"
-                    android:gravity="right"
-                    android:text="{DATE}"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp"
-                    android:textStyle="italic" />
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5sp"
-                android:layout_marginTop="5sp"
-                android:layout_weight="0"
-                android:background="?ttrssHorizontalDivider"
-                android:paddingTop="2dip" />
-        </LinearLayout>
-    </org.fox.ttrss.TitleWebView>
-
-</LinearLayout>
\ 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 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/article_fragment"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
@@ -10,90 +10,87 @@
         android:id="@+id/content"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_weight="1" >
+        android:layout_weight="1">
+        
+            <LinearLayout
+        android:id="@+id/article_header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0"
+        android:orientation="vertical"
+        android:paddingBottom="2dp" >
 
-        <LinearLayout
-            android:id="@+id/article_header"
+        <TextView
+            android:id="@+id/title"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:paddingBottom="4dp"
+            android:text="My simple headline"
+            android:textColor="?linkColor"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/author"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:gravity="right"
+            android:singleLine="true"
+            android:text="by Author"
+            android:textColor="?headlineSecondaryTextColor"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/comments"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="24 comments"
+            android:textColor="?linkColor"
+            android:textSize="12sp" />
+
+        <ImageView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
             android:layout_weight="0"
-            android:orientation="vertical" >
+            android:background="?ttrssHorizontalDivider"
+            android:paddingTop="2dip" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingBottom="4dp"
+            android:layout_weight="1" >
 
             <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
+                android:id="@+id/tags"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="There are many variations of passages of Lorem Ipsum available"
-                android:textColor="?linkColor"
-                android:textSize="16sp" />
+                android:layout_weight="0.5"
+                android:ellipsize="end"
+                android:singleLine="true"
+                android:text="Example Feed"
+                android:textColor="?headlineSecondaryTextColor"
+                android:textSize="12sp" />
 
-            <LinearLayout
-                android:id="@+id/comments_and_author"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="horizontal" >
-
-                <TextView
-                    android:id="@+id/comments"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:text="24 comments"
-                    android:textColor="?linkColor"
-                    android:textSize="13sp" />
-
-                <TextView
-                    android:id="@+id/author"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:ellipsize="end"
-                    android:gravity="right"
-                    android:singleLine="true"
-                    android:text="{Author}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp"
-                    android:textStyle="italic" />
-            </LinearLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
+            <TextView
+                android:id="@+id/date"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_weight="1" >
-
-                <TextView
-                    android:id="@+id/tags"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.7"
-                    android:ellipsize="end"
-                    android:singleLine="true"
-                    android:text="{TAGS}"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp" />
-
-                <TextView
-                    android:id="@+id/date"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="0.2"
-                    android:gravity="right"
-                    android:text="{DATE}"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:textColor="?headlineExcerptTextColor"
-                    android:textSize="13sp"
-                    android:textStyle="italic" />
-            </LinearLayout>
-
-            <ImageView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="5sp"
-                android:layout_weight="0"
-                android:background="?ttrssHorizontalDivider"
-                android:paddingTop="2dip" />
+                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" />
         </LinearLayout>
-    </org.fox.ttrss.TitleWebView>
+    </LinearLayout>
+        
+        
+        </org.fox.ttrss.TitleWebView>
 
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ 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 @@
     <string name="pref_headlines_mark_read_scroll_long">Headlines will be marked read when scrolling past them</string>
     <string name="mark_num_headlines_as_read">Mark %1$d article(s) as read?</string>
     <string name="prefs_confirm_headlines_catchup">Confirm marking articles as read</string>
+    <string name="author_formatted">by %1$s</string>
 </resources>
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);